Skip to content

fix: bug with validation #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 8, 2025
Merged

fix: bug with validation #383

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebbd3bd
fix: bug with validation
Jan 7, 2025
77e8270
fix: bug with validation
Jan 7, 2025
4543f1c
fix: submdoule
Jan 7, 2025
b59ffb4
Merge branch 'fix-validation' of github.com:terraform-ibm-modules/ter…
Jan 7, 2025
7713e65
fix: submdoule
Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-dev-assets
Open in desktop
Submodule common-dev-assets updated 6 files
+15 −0 common-go-assets/common-permanent-resources.yaml
+1 −1 examples/Dockerfile
+4 −4 module-assets/.pre-commit-config.yaml
+4 −4 module-assets/ci/install-deps.sh
+1 −1 scripts/update-source/requirements.txt
+2 −2 stack-assets/.pre-commit-config.yaml
9 changes: 0 additions & 9 deletions modules/fscloud/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,6 @@ variable "backup_encryption_key_crn" {
type = string
description = "The CRN of a Key Protect or Hyper Protect Crypto Services encryption key that you want to use for encrypting the disk that holds deployment backups. Applies only if `use_ibm_owned_encryption_key` is false and `use_same_kms_key_for_backups` is false. If no value is passed, and `use_same_kms_key_for_backups` is true, the value of `kms_key_crn` is used. Alternatively set `use_default_backup_encryption_key` to true to use the IBM Cloud Databases default encryption. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
default = null

validation {
condition = anytrue([
var.backup_encryption_key_crn == null,
can(regex(".*kms.*", var.kms_key_crn)),
can(regex(".*hs-crypto.*", var.kms_key_crn)),
])
error_message = "Value must be the KMS key CRN from a Key Protect or Hyper Protect Crypto Services instance in one of the supported backup regions."
}
}

variable "use_default_backup_encryption_key" {
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ variable "backup_encryption_key_crn" {
validation {
condition = anytrue([
var.backup_encryption_key_crn == null,
can(regex(".*kms.*", var.kms_key_crn)),
can(regex(".*hs-crypto.*", var.kms_key_crn)),
can(regex(".*kms.*", var.backup_encryption_key_crn)),
can(regex(".*hs-crypto.*", var.backup_encryption_key_crn)),
])
error_message = "Value must be the KMS key CRN from a Key Protect or Hyper Protect Crypto Services instance in one of the supported backup regions."
}
Expand Down