From 9972f1b9e9e21848acf4181e8bf07282ea82d886 Mon Sep 17 00:00:00 2001 From: Aditya-ranjan-16 Date: Tue, 4 Nov 2025 13:57:31 +0530 Subject: [PATCH 1/2] feat: Add UI regex validation --- ibm_catalog.json | 22 ++++++++++++++++++++-- solutions/fully-configurable/variables.tf | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index b64a221..e6fa7a9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -109,7 +109,18 @@ }, { "key": "prefix", - "required": true + "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, + "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": "existing_cluster_id", @@ -254,7 +265,14 @@ "key": "install_odf_cluster_addon" }, { - "key": "odf_version" + "key": "odf_version", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'odf_version' is not valid.", + "value": "^[0-9]+\\.[0-9]+\\.[0-9]+$" + } + ] }, { "key": "odf_config" diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 52ea42d..bed73b0 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -22,7 +22,7 @@ variable "provider_visibility" { variable "prefix" { type = string nullable = true - description = "The prefix to be added to all resources created by this solution. To skip using a prefix, set this value to null or an empty string. The prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It should not exceed 16 characters, must not end with a hyphen('-'), and can not contain consecutive hyphens ('--'). Example: prod-wx-cp4d. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)." + description = "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). To skip using a prefix, set this value to null or an empty string. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)." validation { # - null and empty string is allowed From 44eb0310d46dd61215f19ff2cf628c0e838e3ef9 Mon Sep 17 00:00:00 2001 From: Aditya-ranjan-16 Date: Mon, 24 Nov 2025 10:39:46 +0530 Subject: [PATCH 2/2] bump cda --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 6a351e6..cefc143 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 6a351e62a04ea8bf074d4933c86cd28671154d3b +Subproject commit cefc143fe9db966925c422ed7c67d7554288e8ff