feat: Add UI regex validation

ibm_catalog.json

@@ -60,6 +60,7 @@
         {
           "label": "Fully configurable",
           "name": "fully-configurable",
+          "short_description": "Ideal for users who want flexibility with a reliable starting point.",
           "install_type": "fullstack",
           "working_directory": "solutions/fully-configurable",
           "iam_permissions": [
@@ -665,7 +666,7 @@
                 {
                   "type": "regex",
                   "description": "The value provided for 'repos_git_token_secret_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}::$"
+                  "value": "^__NULL__$|^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:secrets-manager:[\\w\\-_]*\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*)\\:secret:[\\w\\-_]*"
                 }
               ]
             },
@@ -676,7 +677,7 @@
                 {
                   "type": "regex",
                   "description": "The value provided for 'subscription_id_secret_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}::$"
+                  "value": "^__NULL__$|^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:secrets-manager:[\\w\\-_]*\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*)\\:secret:[\\w\\-_]*"
                 }
               ]
             },
@@ -724,7 +725,7 @@
                 {
                   "type": "regex",
                   "description": "The value provided for 'existing_mq_capacity_crn' is not valid.",
-                  "value": "^__NULL__$|^crn:(.*:){3}(mqcloud):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
+                  "value": "^__NULL__$|^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:mqcloud:[\\w\\-_]*:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}"
                 }
               ]
             },
@@ -749,7 +750,7 @@
                 {
                   "type": "regex",
                   "description": "The value provided for 'db2_s2s_policy_target_crn' is not valid.",
-                  "value": "^__NULL__$|^crn:(.*:){3}(dashdb-for-transactions):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
+                  "value": "^__NULL__$|^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:dashdb-for-transactions:[\\w\\-_]*:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}"
                 }
               ]
             }

solutions/fully-configurable/variables.tf

@@ -34,8 +34,7 @@ variable "resource_tags" {
 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-es. [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
     # - Must not contain consecutive hyphens (--): length(regexall("--", var.prefix)) == 0
@@ -112,7 +111,7 @@ variable "repos_git_token_secret_crn" {
   description = "The CRN of the existing secret storing on Secrets Manager the GitHub token to read from the application and configuration repositories."
   default     = null
   validation {
-    condition     = var.repos_git_token_secret_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){4}\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}$", var.repos_git_token_secret_crn)) : true
+    condition     = var.repos_git_token_secret_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:secrets-manager:[\\w\\-_]*\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*)\\:secret:[\\w\\-_]*", var.repos_git_token_secret_crn)) : true
     error_message = "The value for var.repos_git_token_secret_crn is not a valid CRN."
   }
 }
@@ -143,7 +142,7 @@ variable "subscription_id_secret_crn" {
     error_message = "Input parameters subscription_id_secret_crn and subscription_id cannot be both null."
   }
   validation {
-    condition     = var.subscription_id_secret_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){4}\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}$", var.subscription_id_secret_crn)) : true
+    condition     = var.subscription_id_secret_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:secrets-manager:[\\w\\-_]*\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*)\\:secret:[\\w\\-_]*", var.subscription_id_secret_crn)) : true
     error_message = "The value for var.subscription_id_secret_crn is not a valid CRN."
   }
 }
@@ -175,7 +174,7 @@ variable "mq_capacity_s2s_policy_target_crn" {
   description = "MQ resource capacity instance CRN to restrict the target for the Service to Service policy to MQ service instance. If mq_s2s_policy_enable is true but this is null the S2S policy is created at account scope on Enterprise Application Service instance account owner. Default to null."
   default     = null
   validation {
-    condition     = var.mq_capacity_s2s_policy_target_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){4}\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}$", var.mq_capacity_s2s_policy_target_crn)) : true
+    condition     = var.mq_capacity_s2s_policy_target_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:mqcloud:[\\w\\-_]*:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}", var.mq_capacity_s2s_policy_target_crn)) : true
     error_message = "The value for var.mq_capacity_s2s_policy_target_crn is not a valid CRN."
   }
 }
@@ -207,7 +206,7 @@ variable "db2_s2s_policy_target_crn" {
   description = "DB2 resource capacity instance CRN to restrict the target for the Service to Service policy to DB2 service instance. If db2_s2s_policy_enable is true but this is null the S2S policy is created at account scope on Enterprise Application Service instance account owner. Default to null."
   default     = null
   validation {
-    condition     = var.db2_s2s_policy_target_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){4}\\:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}$", var.db2_s2s_policy_target_crn)) : true
+    condition     = var.db2_s2s_policy_target_crn != null ? can(regex("^crn\\:v\\d(\\:[\\w\\-_]*){2}\\:dashdb-for-transactions:[\\w\\-_]*:([aos]\\/[\\w_\\-]+)?(\\:[\\w_\\-]*){3}", var.db2_s2s_policy_target_crn)) : true
     error_message = "The value for var.db2_s2s_policy_target_crn is not a valid CRN."
   }
 }