Skip to content

feat: Add UI regex validation #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+170 −16
Draft

feat: Add UI regex validation #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e8ff01
feat: Add Ui regex validation
Oct 24, 2025
545c9d3
Merge branch 'main' into regex-validation
arya-girish-k Oct 29, 2025
4ab9993
Merge branch 'main' into regex-validation
arya-girish-k Nov 13, 2025
74f5fec
fix: update CRN pattern
Nov 13, 2025
9dc4054
Merge branch 'main' into regex-validation
arya-girish-k Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 112 additions & 14 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,14 @@
"key": "admin_pass"
},
{
"key": "existing_secrets_manager_instance_crn"
"key": "existing_secrets_manager_instance_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_secrets_manager_instance_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}{3}secrets-manager:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "existing_secrets_manager_endpoint_type",
Expand Down Expand Up @@ -378,10 +385,24 @@
"key": "kms_encryption_enabled"
},
{
"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:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "existing_kms_key_crn"
"key": "existing_kms_key_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_kms_key_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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": "kms_endpoint_type",
Expand All @@ -404,10 +425,24 @@
"key": "key_name"
},
{
"key": "backup_crn"
"key": "backup_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'backup_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:backup:[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
}
]
},
{
"key": "existing_backup_kms_key_crn"
"key": "existing_backup_kms_key_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_backup_kms_key_crn' is not valid.",
"value": "^__NULL__$|^^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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": "use_default_backup_encryption_key"
Expand All @@ -416,10 +451,24 @@
"key": "skip_postgresql_kms_auth_policy"
},
{
"key": "existing_postgresql_instance_crn"
"key": "existing_postgresql_instance_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_postgresql_instance_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "remote_leader_crn"
"key": "remote_leader_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'remote_leader_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
}
],
"terraform_version": "1.12.2",
Expand Down Expand Up @@ -673,7 +722,14 @@
"key": "admin_pass"
},
{
"key": "existing_secrets_manager_instance_crn"
"key": "existing_secrets_manager_instance_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_secrets_manager_instance_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}{3}secrets-manager:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "skip_postgresql_secrets_manager_auth_policy"
Expand Down Expand Up @@ -701,10 +757,24 @@
},
{
"key": "existing_kms_instance_crn",
"required": true
"required": true,
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_kms_instance_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "existing_kms_key_crn"
"key": "existing_kms_key_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_kms_key_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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": "key_ring_name"
Expand All @@ -713,19 +783,47 @@
"key": "key_name"
},
{
"key": "backup_crn"
"key": "backup_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'backup_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:backup:[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
}
]
},
{
"key": "existing_backup_kms_key_crn"
"key": "existing_backup_kms_key_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_backup_kms_key_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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": "skip_postgresql_kms_auth_policy"
},
{
"key": "existing_postgresql_instance_crn"
"key": "existing_postgresql_instance_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'existing_postgresql_instance_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "remote_leader_crn"
"key": "remote_leader_crn",
"value_constraints": [
{
"type": "regex",
"description": "The value provided for 'remote_leader_crn' is not valid.",
"value": "^__NULL__$|^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
}
],
"terraform_version": "1.12.2",
Expand Down
34 changes: 33 additions & 1 deletion solutions/fully-configurable/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,28 @@ variable "existing_kms_instance_crn" {
type = string
description = "The CRN of a Key Protect or Hyper Protect Crypto Services instance. Required to create a new encryption key and key ring which will be used to encrypt both deployment data and backups. To use an existing key, pass values for `existing_kms_key_crn` and/or `existing_backup_kms_key_crn`. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
default = null

validation {
condition = anytrue([
var.existing_kms_instance_crn == null,
can(regex("^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$", var.existing_kms_instance_crn))
])
error_message = "The value provided for 'existing_kms_instance_crn' is not valid."
}
}

variable "existing_kms_key_crn" {
type = string
description = "The CRN of a Key Protect or Hyper Protect Crypto Services encryption key to encrypt your data. By default this key is used for both deployment data and backups, but this behaviour can be altered using the optional `existing_backup_kms_key_crn` input. If no value is passed a new key will be created in the instance specified in the `existing_kms_instance_crn` input. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
default = null

validation {
condition = anytrue([
var.existing_kms_key_crn == null,
can(regex("^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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}$", var.existing_kms_key_crn))
])
error_message = "The value provided for 'existing_kms_key_crn’ is not valid."
}
}

variable "kms_endpoint_type" {
Expand Down Expand Up @@ -297,6 +313,14 @@ variable "existing_backup_kms_key_crn" {
type = string
description = "The CRN of a Key Protect or Hyper Protect Crypto Services encryption key that you want to use for encrypting the disk that holds deployment backups. If no value is passed, the value of `existing_kms_key_crn` is used. If no value is passed for `existing_kms_key_crn`, a new key will be created in the instance specified in the `existing_kms_instance_crn` input. Alternatively set `use_default_backup_encryption_key` to true to use the IBM Cloud Databases default encryption. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
default = null

validation {
condition = anytrue([
var.existing_backup_kms_key_crn == null,
can(regex("^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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}$", var.existing_backup_kms_key_crn))
])
error_message = "The value provided for 'existing_backup_kms_key_crn' is not valid."
}
}

variable "use_default_backup_encryption_key" {
Expand All @@ -313,7 +337,7 @@ variable "backup_crn" {
validation {
condition = anytrue([
var.backup_crn == null,
can(regex("^crn:.*:backup:", var.backup_crn))
can(regex("^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:backup:[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$", var.backup_crn))
])
error_message = "backup_crn must be null OR starts with 'crn:' and contains ':backup:'"
}
Expand Down Expand Up @@ -390,6 +414,14 @@ variable "existing_secrets_manager_instance_crn" {
type = string
default = null
description = "The CRN of existing secrets manager to use to create service credential secrets for Databases for PostgreSQL instance."

validation {
condition = anytrue([
var.existing_secrets_manager_instance_crn == null,
can(regex("^crn:v\\d:(.*:){2}secrets-manager:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$", var.existing_secrets_manager_instance_crn))
])
error_message = "The value provided for 'existing_secrets_manager_instance_crn' is not valid."
}
}

variable "existing_secrets_manager_endpoint_type" {
Expand Down
26 changes: 25 additions & 1 deletion solutions/security-enforced/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,14 @@ variable "existing_kms_instance_crn" {
type = string
description = "The CRN of a Key Protect or Hyper Protect Crypto Services instance. Required to create a new encryption key and key ring which will be used to encrypt both deployment data and backups. To use an existing key, pass values for `existing_kms_key_crn` and/or `existing_backup_kms_key_crn`. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
default = null

validation {
condition = anytrue([
var.existing_kms_instance_crn == null,
can(regex("^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$", var.existing_kms_instance_crn))
])
error_message = "The value provided for 'existing_kms_instance_crn' is not valid."
}
}

variable "existing_kms_key_crn" {
Expand All @@ -220,6 +228,14 @@ variable "existing_kms_key_crn" {
)
error_message = "Either existing_kms_key_crn or existing_kms_instance_crn must be set, but not both."
}

validation {
condition = anytrue([
var.existing_kms_key_crn == null,
can(regex("^crn:v\\d:(.*:){2}(kms|hs-crypto):(.*:)([aos]\\/[\\w_\\-]+):[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}$", var.existing_kms_key_crn))
])
error_message = "The value provided for 'existing_kms_key_crn’ is not valid."
}
}

variable "skip_postgresql_kms_auth_policy" {
Expand Down Expand Up @@ -261,7 +277,7 @@ variable "backup_crn" {
validation {
condition = anytrue([
var.backup_crn == null,
can(regex("^crn:.*:backup:", var.backup_crn))
can(regex("^crn:v\\d:(.*:){2}databases-for-postgresql:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:backup:[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$", var.backup_crn))
])
error_message = "backup_crn must be null OR starts with 'crn:' and contains ':backup:'"
}
Expand Down Expand Up @@ -327,6 +343,14 @@ variable "existing_secrets_manager_instance_crn" {
type = string
default = null
description = "The CRN of existing secrets manager to use to create service credential secrets for Databases for PostgreSQL instance."

validation {
condition = anytrue([
var.existing_secrets_manager_instance_crn == null,
can(regex("^crn:v\\d:(.*:){2}secrets-manager:(.*:)([aos]\\/[\\w_\\-]+):[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$", var.existing_secrets_manager_instance_crn))
])
error_message = "The value provided for 'existing_secrets_manager_instance_crn' is not valid."
}
}

variable "service_credential_secrets" {
Expand Down