Skip to content

Commit 649ae4b

Browse files
iamar7Md Anam Raihan
andauthored
feat: Add Project UI regex validation for the DA (#111)
* feat: added regex validation to DA inputs * add cloud monitoring regex * update description and grammer --------- Co-authored-by: Md Anam Raihan <[email protected]>
1 parent be49532 commit 649ae4b

File tree

2 files changed

+49
-7
lines changed

2 files changed

+49
-7
lines changed

ibm_catalog.json

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@
108108
},
109109
{
110110
"key": "prefix",
111-
"required": true
111+
"required": true,
112+
"value_constraints": [
113+
{
114+
"type": "regex",
115+
"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.",
116+
"value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
117+
}
118+
]
112119
},
113120
{
114121
"key": "existing_resource_group_name",
@@ -160,7 +167,14 @@
160167
]
161168
},
162169
{
163-
"key": "existing_cloud_logs_instance_crn"
170+
"key": "existing_cloud_logs_instance_crn",
171+
"value_constraints": [
172+
{
173+
"type": "regex",
174+
"description": "The value provided for 'existing_cloud_logs_instance_crn' is not valid.",
175+
"value": "^__NULL__$|^crn:(.*:){3}logs:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
176+
}
177+
]
164178
},
165179
{
166180
"key": "enable_activity_tracker_event_routing_to_cloud_logs"
@@ -172,7 +186,14 @@
172186
"key": "activity_tracker_cloud_logs_route_name"
173187
},
174188
{
175-
"key": "existing_cos_instance_crn"
189+
"key": "existing_cos_instance_crn",
190+
"value_constraints": [
191+
{
192+
"type": "regex",
193+
"description": "The value provided for 'existing_cos_instance_crn' is not valid.",
194+
"value": "^__NULL__$|^crn:(.*:){3}cloud-object-storage:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
195+
}
196+
]
176197
},
177198
{
178199
"key": "ibmcloud_cos_api_key"
@@ -260,13 +281,34 @@
260281
"key": "kms_encryption_enabled_buckets"
261282
},
262283
{
263-
"key": "existing_cos_kms_key_crn"
284+
"key": "existing_cos_kms_key_crn",
285+
"value_constraints": [
286+
{
287+
"type": "regex",
288+
"description": "The value provided for 'existing_cos_kms_key_crn' is not valid.",
289+
"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}$"
290+
}
291+
]
264292
},
265293
{
266-
"key": "existing_monitoring_crn"
294+
"key": "existing_monitoring_crn",
295+
"value_constraints": [
296+
{
297+
"type": "regex",
298+
"description": "The value provided for 'existing_monitoring_crn' is not valid.",
299+
"value": "^__NULL__$|^crn:(.*:){3}sysdig-monitor:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
300+
}
301+
]
267302
},
268303
{
269-
"key": "existing_kms_instance_crn"
304+
"key": "existing_kms_instance_crn",
305+
"value_constraints": [
306+
{
307+
"type": "regex",
308+
"description": "The value provided for 'existing_kms_instance_crn' is not valid.",
309+
"value": "^__NULL__$|^crn:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
310+
}
311+
]
270312
},
271313
{
272314
"key": "cos_key_name"

solutions/fully-configurable/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variable "region" {
3131
variable "prefix" {
3232
type = string
3333
nullable = true
34-
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)."
34+
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)."
3535

3636
validation {
3737
# - null and empty string is allowed

0 commit comments

Comments
 (0)