From 552cc8c561c7fac8e4f93b2b61b6b3ce9dfcc30a Mon Sep 17 00:00:00 2001 From: Aditya-ranjan-16 Date: Mon, 3 Nov 2025 13:14:29 +0530 Subject: [PATCH 1/3] feat: Add UI regex validation --- ibm_catalog.json | 13 ++++++++++++- solutions/fully-configurable/variables.tf | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index ae71822..c376a41 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -158,7 +158,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": "enable_platform_metrics", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 0359dd4..7129032 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -34,7 +34,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-0205-pp. [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 7317b74df2e95f8037b1ff3c8271c623813d7d8b Mon Sep 17 00:00:00 2001 From: Aditya-ranjan-16 Date: Mon, 17 Nov 2025 17:36:50 +0530 Subject: [PATCH 2/3] fix --- ibm_catalog.json | 4 +--- solutions/fully-configurable/variables.tf | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 5c82bac..3841374 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -204,9 +204,7 @@ "config_constraints": { "identifier": "rg_name" } - }, - "default_value": "Default", - "description": "The name of an existing resource group to provision the resources." + } }, { "key": "existing_vpc_id" diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 7129032..ac85529 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -10,8 +10,8 @@ variable "ibmcloud_api_key" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used." - default = null + description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." + default = "Default" } variable "region" { From 1a3b6bc0202dade0ad6e2bedaa59ce1a28e39ba9 Mon Sep 17 00:00:00 2001 From: Aditya-ranjan-16 Date: Mon, 24 Nov 2025 10:25:10 +0530 Subject: [PATCH 3/3] bump cda --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 6e83549..cefc143 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 6e83549924fb8d8ae4933ba269baee0926a6f623 +Subproject commit cefc143fe9db966925c422ed7c67d7554288e8ff