From 2bdbfb4080438c74ca4dea5b274fea7aa3877d34 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Thu, 14 Aug 2025 13:46:04 +0530 Subject: [PATCH 01/10] Testing --- ibm_catalog.json | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 74bf74db..5e47511f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -190,7 +190,14 @@ }, { "key": "prefix", - "required": true + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters", + "value": "^$|^__NULL__$|^[a-z](?!.*--)[a-z0-9-]{0,14}[a-z0-9]$" + } + ] }, { "key": "cluster_name", @@ -655,10 +662,24 @@ "key": "kms_encryption_enabled_cluster" }, { - "key": "existing_kms_instance_crn" + "key": "existing_kms_instance_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_kms_instance_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$" + } + ] }, { - "key": "existing_cluster_kms_key_crn" + "key": "existing_cluster_kms_key_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_cluster_kms_key_crn' in not valid.", + "value": "^__NULL__$|^crn:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:key:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + } + ] }, { "key": "kms_endpoint_type", @@ -684,7 +705,14 @@ "key": "kms_encryption_enabled_boot_volume" }, { - "key": "existing_boot_volume_kms_key_crn" + "key": "existing_boot_volume_kms_key_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_boot_volume_kms_key_crn' in not valid.", + "value": "^__NULL__$|^crn:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:key:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + } + ] }, { "key": "boot_volume_kms_key_name" From 51d5b7824841c317f7ae9699196f55de6dc1a04a Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Mon, 18 Aug 2025 13:48:40 +0530 Subject: [PATCH 02/10] Updated quickstart --- ibm_catalog.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 5e47511f..8b3a1b09 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1118,7 +1118,14 @@ }, { "key": "prefix", - "required": true + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters", + "value": "^$|^__NULL__$|^[a-z](?!.*--)[a-z0-9-]{0,14}[a-z0-9]$" + } + ] }, { "key": "region", From 477b8270b635ff0c66471451509258cd48520144 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Thu, 28 Aug 2025 18:26:14 +0530 Subject: [PATCH 03/10] Testing --- ibm_catalog.json | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index a1f781a3..bfcfb454 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -481,7 +481,14 @@ }, { "key": "existing_vpc_crn", - "required": true + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_vpc_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:vpc:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + } + ] }, { "key": "region", @@ -501,7 +508,14 @@ }, { "key": "existing_cos_instance_crn", - "required": true + "required": true, + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_cos_instance_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}cloud-object-storage:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$" + } + ] }, { "key": "disable_public_endpoint", @@ -565,6 +579,13 @@ }, { "key": "access_tags", + "value_constraints": [ + { + "type": "regex", + "description": "Tags must match the regular expression \"[\\w\\-_\\.]+:[\\w\\-_\\.]+\", see https://cloud.ibm.com/docs/account?topic=account-tag&interface=ui#limits for more details.", + "value": "^(?=.{1,128}$)[\\w\\-_.]+:[\\w\\-_.]+$" + } + ], "custom_config": { "type": "array", "grouping": "deployment", @@ -779,7 +800,14 @@ "key": "enable_secrets_manager_integration" }, { - "key": "existing_secrets_manager_instance_crn" + "key": "existing_secrets_manager_instance_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_secrets_manager_instance_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}secrets-manager:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$" + } + ] }, { "key": "secrets_manager_secret_group_id" From d2ca476fc770d7eaae7d744cac9948eddc448787 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Fri, 29 Aug 2025 10:03:32 +0530 Subject: [PATCH 04/10] testing --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index bfcfb454..408bc6ae 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,7 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:vpc:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[^:]*:vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } ] }, From ba3b7943f477ea247a41df3546b399aff2ab09f9 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Fri, 29 Aug 2025 10:14:46 +0530 Subject: [PATCH 05/10] testing --- ibm_catalog.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 408bc6ae..7785773b 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,8 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[^:]*:vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[^:]*:vpc:r[0-9]{3}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + } ] }, From 5be97ce0be3ee26e1d42948586d528c1ecc11274 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Fri, 29 Aug 2025 10:25:23 +0530 Subject: [PATCH 06/10] testing --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 7785773b..cf06f69c 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,7 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[^:]*:vpc:r[0-9]{3}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:vpc:r[0-9]{3}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } ] From 1ef932fc1e4fc3e0c1bb16d356dfe7c243a1784a Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Sun, 31 Aug 2025 20:03:41 +0530 Subject: [PATCH 07/10] Update catalog --- ibm_catalog.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index cf06f69c..4ef7e89a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,7 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:vpc:r[0-9]{3}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{32}::vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } ] @@ -811,7 +811,15 @@ ] }, { - "key": "secrets_manager_secret_group_id" + "key": "secrets_manager_secret_group_id", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'secrets_manager_secret_group_id' is not valid.", + "value": "^__NULL__$|[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12}" + + } + ] }, { "key": "secrets_manager_endpoint_type", From a609a4d4a31bc11e593103c73aed3a33125be286 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Sun, 31 Aug 2025 20:35:49 +0530 Subject: [PATCH 08/10] Update catalog --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 4ef7e89a..bffadfef 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,7 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}[0-9a-fA-F]{32}::vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}:vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } ] From 20da4abd3f8d37500066cf5d658aade027616d59 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Mon, 1 Sep 2025 00:37:44 +0530 Subject: [PATCH 09/10] update catalog --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index bffadfef..cb8461fc 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -486,7 +486,7 @@ { "type": "regex", "description": "The value provided for 'existing_vpc_crn' is not valid.", - "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}:vpc:[0-9a-f]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + "value": "^__NULL__$|^crn:(.*:){3}is:(.*:){2}:vpc:[0-9a-z]{4}-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } ] From 5fe349c4448f9e48b7d804ec75fd45ced4208a6c Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Mon, 1 Sep 2025 00:52:37 +0530 Subject: [PATCH 10/10] update catalog --- ibm_catalog.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index cb8461fc..fba47722 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -580,13 +580,6 @@ }, { "key": "access_tags", - "value_constraints": [ - { - "type": "regex", - "description": "Tags must match the regular expression \"[\\w\\-_\\.]+:[\\w\\-_\\.]+\", see https://cloud.ibm.com/docs/account?topic=account-tag&interface=ui#limits for more details.", - "value": "^(?=.{1,128}$)[\\w\\-_.]+:[\\w\\-_.]+$" - } - ], "custom_config": { "type": "array", "grouping": "deployment",