diff --git a/ibm_catalog.json b/ibm_catalog.json index 3861d0ab..5fbb538f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -701,7 +701,22 @@ "hidden": true }, { - "key": "secrets_manager_service_plan" + "key": "secrets_manager_service_plan", + "required": true, + "virtual": true, + "type": "string", + "options": [ + { + "displayname": "Standard", + "value": "standard" + }, + { + "displayname": "Trial", + "value": "trial" + } + ], + "default_value": "__NOT_SET__", + "description": "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)." }, { "key": "skip_ocp_secrets_manager_iam_auth_policy" diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 894c874b..edde3860 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -551,21 +551,6 @@ variable "secrets_manager_endpoint_type" { } } -# tflint-ignore: all -variable "secrets_manager_service_plan" { - type = string - description = "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)." - default = "standard" - validation { - condition = contains(["standard", "trial"], var.secrets_manager_service_plan) - error_message = "Only 'standard' and 'trial' are allowed values for 'service_plan'. Applies only if not providing a value for the 'existing_secrets_manager_instance_crn' input." - } - validation { - condition = var.existing_secrets_manager_instance_crn == null && var.enable_secrets_manager_integration ? var.secrets_manager_service_plan != null : true - error_message = "A value for 'service_plan' is required if not providing a value for 'existing_secrets_manager_instance_crn'" - } -} - variable "skip_ocp_secrets_manager_iam_auth_policy" { type = bool description = "To skip creating auth policy that allows OCP cluster 'Manager' role access in the existing Secrets Manager instance for managing ingress certificates."