From f8ac124fc50ae56cb9ebee1f0dbe7dfa1b49a337 Mon Sep 17 00:00:00 2001 From: badra001 Date: Tue, 17 Jan 2023 15:27:06 -0500 Subject: [PATCH] fix --- common/kms.tf | 1 - common/prefixes.tf | 1 + common/resources.tf | 1 - kms_key/locals.tf | 3 --- 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 kms_key/locals.tf diff --git a/common/kms.tf b/common/kms.tf index 7cd1201..fd8f3ce 100644 --- a/common/kms.tf +++ b/common/kms.tf @@ -4,7 +4,6 @@ # } # locals { - __prefixes = merge(local._prefixes, var.override_prefixes) kms_key_arn = var.kms_key_arn == null ? try(aws_kms_key.key[0].arn, "") : var.kms_key_arn kms_key_name = format("%s%s", local.__prefixes["kms"], local.name) diff --git a/common/prefixes.tf b/common/prefixes.tf index fafcbde..52b6b7d 100644 --- a/common/prefixes.tf +++ b/common/prefixes.tf @@ -9,4 +9,5 @@ locals { "security-group" = "" # "security-group" = "sg-" } + __prefixes = merge(local._prefixes, var.override_prefixes) } diff --git a/common/resources.tf b/common/resources.tf index aa57f75..95a0277 100644 --- a/common/resources.tf +++ b/common/resources.tf @@ -1,6 +1,5 @@ locals { region_short = join("", [for c in split("-", local.region) : substr(c, 0, 1)]) - __prefixes = merge(local._prefixes, var.override_prefixes) base_name = var.bucket_name b_name = replace(var.bucket_name, local.__prefixes["s3"], "") b_account = var.name_include_account ? format("-%v", local.account_id) : "" diff --git a/kms_key/locals.tf b/kms_key/locals.tf deleted file mode 100644 index 2f3607f..0000000 --- a/kms_key/locals.tf +++ /dev/null @@ -1,3 +0,0 @@ -locals { - __prefixes = merge(local._prefixes, var.override_prefixes) -}