From 39ef6ef4183dfb3091420c9e53d74e73a230a5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Mon, 25 Nov 2024 10:50:36 +0000 Subject: [PATCH 1/3] fix: mark `existing_kms_instance_crn` as required instead of `existing_kms_key_crn` in the DA --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 5fc00791..63a3bab9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -264,10 +264,10 @@ }, { "key": "existing_kms_key_crn", - "required": true }, { - "key": "existing_kms_instance_crn" + "key": "existing_kms_instance_crn", + "required": true }, { "key": "elasticsearch_key_ring_name" From c9cb375b8d5c9df7fc20ef3de95bdbd7975d1864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Mon, 25 Nov 2024 10:53:52 +0000 Subject: [PATCH 2/3] Update variables.tf --- solutions/standard/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf index b378fcbb..d4a73147 100644 --- a/solutions/standard/variables.tf +++ b/solutions/standard/variables.tf @@ -208,7 +208,7 @@ variable "auto_scaling" { variable "existing_kms_key_crn" { type = string - description = "The CRN of a Hyper Protect Crypto Services or Key Protect root key to use for disk encryption. If not specified, a root key is created in the KMS instance." + description = "The CRN of a Hyper Protect Crypto Services or Key Protect root key to use for disk encryption. If not specified, a root key is created in the KMS instance specified in the `existing_kms_instance_crn` input." default = null } @@ -230,7 +230,7 @@ variable "kms_endpoint_type" { variable "existing_kms_instance_crn" { type = string - description = "The CRN of a Hyper Protect Crypto Services or Key Protect instance in the same account as the Databases for Elasticsearch instance. This value is used to create an authorization policy if `skip_iam_authorization_policy` is false. If not specified, a root key is created." + description = "The CRN of a Hyper Protect Crypto Services or Key Protect instance. Required to create a new root key if no value is passed with the `existing_kms_key_crn` input. Also required to create an authorization policy if `skip_iam_authorization_policy` is false." default = null } From 2586ab052526e0686c1a69ba7528e236d48191d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Mon, 25 Nov 2024 11:06:10 +0000 Subject: [PATCH 3/3] Update ibm_catalog.json --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 63a3bab9..96a12ad3 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -263,7 +263,7 @@ ] }, { - "key": "existing_kms_key_crn", + "key": "existing_kms_key_crn" }, { "key": "existing_kms_instance_crn",