Skip to content

Commit 78f7c95

Browse files
authored
fix: virtual input for secrets manager service plan (#716)
1 parent 7c13085 commit 78f7c95

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

ibm_catalog.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,22 @@
701701
"hidden": true
702702
},
703703
{
704-
"key": "secrets_manager_service_plan"
704+
"key": "secrets_manager_service_plan",
705+
"required": true,
706+
"virtual": true,
707+
"type": "string",
708+
"options": [
709+
{
710+
"displayname": "Standard",
711+
"value": "standard"
712+
},
713+
{
714+
"displayname": "Trial",
715+
"value": "trial"
716+
}
717+
],
718+
"default_value": "__NOT_SET__",
719+
"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)."
705720
},
706721
{
707722
"key": "skip_ocp_secrets_manager_iam_auth_policy"

solutions/fully-configurable/variables.tf

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -551,21 +551,6 @@ variable "secrets_manager_endpoint_type" {
551551
}
552552
}
553553

554-
# tflint-ignore: all
555-
variable "secrets_manager_service_plan" {
556-
type = string
557-
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)."
558-
default = "standard"
559-
validation {
560-
condition = contains(["standard", "trial"], var.secrets_manager_service_plan)
561-
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."
562-
}
563-
validation {
564-
condition = var.existing_secrets_manager_instance_crn == null && var.enable_secrets_manager_integration ? var.secrets_manager_service_plan != null : true
565-
error_message = "A value for 'service_plan' is required if not providing a value for 'existing_secrets_manager_instance_crn'"
566-
}
567-
}
568-
569554
variable "skip_ocp_secrets_manager_iam_auth_policy" {
570555
type = bool
571556
description = "To skip creating auth policy that allows OCP cluster 'Manager' role access in the existing Secrets Manager instance for managing ingress certificates."

0 commit comments

Comments
 (0)