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
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore misconfigurations
AVD-AZU-0012
16 changes: 10 additions & 6 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ resource "time_sleep" "wait_for_redis_authorization_policy" {
count = local.create_secrets_manager_auth_policy
depends_on = [ibm_iam_authorization_policy.secrets_manager_key_manager]
create_duration = "30s"
triggers = {
secrets_manager_region = local.existing_secrets_manager_instance_region
secrets_manager_guid = local.existing_secrets_manager_instance_guid
}
}

locals {
Expand Down Expand Up @@ -393,12 +397,12 @@ locals {
}

module "secrets_manager_service_credentials" {
count = length(local.service_credential_secrets) > 0 ? 1 : 0
depends_on = [time_sleep.wait_for_redis_authorization_policy]
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
version = "2.10.1"
existing_sm_instance_guid = local.existing_secrets_manager_instance_guid
existing_sm_instance_region = local.existing_secrets_manager_instance_region
count = length(local.service_credential_secrets) > 0 ? 1 : 0
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
version = "2.10.1"
# converted into implicit dependency and removed explicit depends_on time_sleep.wait_for_redis_authorization_policy for this module because of issue https://github.com/terraform-ibm-modules/terraform-ibm-icd-redis/issues/608
existing_sm_instance_guid = local.create_secrets_manager_auth_policy > 0 ? time_sleep.wait_for_redis_authorization_policy[0].triggers["secrets_manager_guid"] : local.existing_secrets_manager_instance_guid
existing_sm_instance_region = local.create_secrets_manager_auth_policy > 0 ? time_sleep.wait_for_redis_authorization_policy[0].triggers["secrets_manager_region"] : local.existing_secrets_manager_instance_region
endpoint_type = var.existing_secrets_manager_endpoint_type
secrets = local.secrets
}