Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 32 additions & 4 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,14 @@
"hidden": true
},
{
"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:(.*:){3}secrets-manager:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "service_credential_secrets",
Expand Down Expand Up @@ -687,10 +694,24 @@
"key": "ibmcloud_kms_api_key"
},
{
"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:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}:key:[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": "kms_key_name"
Expand Down Expand Up @@ -733,7 +754,14 @@
"hidden": true
},
{
"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:(.*:){3}secrets-manager:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
}
]
},
{
"key": "service_credential_secrets",
Expand Down
3 changes: 2 additions & 1 deletion solutions/quickstart/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ variable "region" {

variable "prefix" {
type = string
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)."
nullable = true
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 {
condition = (var.prefix == null || var.prefix == "" ? true :
Expand Down
3 changes: 2 additions & 1 deletion solutions/security-enforced/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ variable "region" {

variable "prefix" {
type = string
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)."
nullable = true
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 {
condition = (var.prefix == null || var.prefix == "" ? true :
Expand Down