diff --git a/ibm_catalog.json b/ibm_catalog.json index 8b057bb..d3a328d 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -108,7 +108,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": "existing_resource_group_name", @@ -160,7 +167,14 @@ ] }, { - "key": "existing_cloud_logs_instance_crn" + "key": "existing_cloud_logs_instance_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_cloud_logs_instance_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}logs:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$" + } + ] }, { "key": "enable_activity_tracker_event_routing_to_cloud_logs" @@ -172,7 +186,14 @@ "key": "activity_tracker_cloud_logs_route_name" }, { - "key": "existing_cos_instance_crn" + "key": "existing_cos_instance_crn", + "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": "ibmcloud_cos_api_key" @@ -260,13 +281,34 @@ "key": "kms_encryption_enabled_buckets" }, { - "key": "existing_cos_kms_key_crn" + "key": "existing_cos_kms_key_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_cos_kms_key_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:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + } + ] }, { - "key": "existing_monitoring_crn" + "key": "existing_monitoring_crn", + "value_constraints": [ + { + "type": "regex", + "description": "The value provided for 'existing_monitoring_crn' is not valid.", + "value": "^__NULL__$|^crn:(.*:){3}sysdig-monitor:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$" + } + ] }, { - "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": "cos_key_name" diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index bb7bc5b..63e7451 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -31,7 +31,7 @@ variable "region" { 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: at-0312. [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