update catalog validation values

whoffler · whoffler · commit 094e3fc1d501 · 2025-05-12T09:02:29.000+01:00
diff --git a/solutions/fully-configurable/catalogValidationValues.json.template b/solutions/fully-configurable/catalogValidationValues.json.template
@@ -4,5 +4,7 @@
   "elasticsearch_tags": $TAGS,
   "elasticsearch_name": $PREFIX,
   "existing_resource_group_name": "geretain-test-permanent",
+  "kms_encryption_enabled": true,
+  "use_ibm_owned_encryption_key": false,
   "existing_kms_instance_crn": $HPCS_US_SOUTH_CRN
 }
diff --git a/solutions/security-enforced/variables.tf b/solutions/security-enforced/variables.tf
@@ -221,11 +221,6 @@ variable "existing_kms_instance_crn" {
     )
     error_message = "To enable KMS encryption one of 'existing_kms_instance_crn', 'existing_kms_key_crn' or 'existing_backup_kms_key_crn' must be set."
   }
-
-  validation {
-    condition     = var.existing_kms_instance_crn == null ? var.existing_kms_key_crn != null : true
-    error_message = "When using an existing elasticsearch instance 'existing_kms_instance_crn' should not be set"
-  }
 }
 
 variable "existing_kms_key_crn" {

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@`
`4`	`4`	`"elasticsearch_tags": $TAGS,`
`5`	`5`	`"elasticsearch_name": $PREFIX,`
`6`	`6`	`"existing_resource_group_name": "geretain-test-permanent",`
	`7`	`+ "kms_encryption_enabled": true,`
	`8`	`+ "use_ibm_owned_encryption_key": false,`
`7`	`9`	`"existing_kms_instance_crn": $HPCS_US_SOUTH_CRN`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,11 +221,6 @@ variable "existing_kms_instance_crn" {`
`221`	`221`	`)`
`222`	`222`	`error_message = "To enable KMS encryption one of 'existing_kms_instance_crn', 'existing_kms_key_crn' or 'existing_backup_kms_key_crn' must be set."`
`223`	`223`	`}`
`224`		`-`
`225`		`- validation {`
`226`		`- condition = var.existing_kms_instance_crn == null ? var.existing_kms_key_crn != null : true`
`227`		`- error_message = "When using an existing elasticsearch instance 'existing_kms_instance_crn' should not be set"`
`228`		`- }`
`229`	`224`	`}`
`230`	`225`
`231`	`226`	`variable "existing_kms_key_crn" {`