diff --git a/README.md b/README.md index f94467d8..4d26c550 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Optionally, the module supports advanced security group management for the worke - Ensure that you have an up-to-date version of the [IBM Cloud VPC Infrastructure service CLI](https://cloud.ibm.com/docs/vpc?topic=vpc-vpc-reference). Only required if providing additional security groups with the `var.additional_lb_security_group_ids`. - Ensure that you have an up-to-date version of the [jq](https://jqlang.github.io/jq) - Ensure that you have an up-to-date version of the [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl) + ## Overview diff --git a/ibm_catalog.json b/ibm_catalog.json index 7ec02a82..88f0c09a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -246,6 +246,7 @@ }, { "key": "prefix", + "default_value": "dev", "random_string": { "length": 4 }, diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index a6f55261..44f4e13d 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -253,19 +253,22 @@ resource "terraform_data" "delete_secrets" { count = var.enable_secrets_manager_integration && var.secrets_manager_secret_group_id == null ? 1 : 0 input = { secret_id = module.secret_group[0].secret_group_id - api_key = var.ibmcloud_api_key provider_visibility = var.provider_visibility secrets_manager_instance_id = module.existing_secrets_manager_instance_parser[0].service_instance secrets_manager_region = module.existing_secrets_manager_instance_parser[0].region secrets_manager_endpoint = var.secrets_manager_endpoint_type } + # api key in triggers_replace to avoid it to be printed out in clear text in terraform_data output + triggers_replace = { + api_key = var.ibmcloud_api_key + } provisioner "local-exec" { when = destroy command = "${path.module}/scripts/delete_secrets.sh ${self.input.secret_id} ${self.input.provider_visibility} ${self.input.secrets_manager_instance_id} ${self.input.secrets_manager_region} ${self.input.secrets_manager_endpoint}" interpreter = ["/bin/bash", "-c"] environment = { - API_KEY = self.input.api_key + API_KEY = self.triggers_replace.api_key } } }