Skip to content

Commit

Permalink
3.3.7: add override_prefixes for advanced usage
Browse files Browse the repository at this point in the history
  • Loading branch information
badra001 committed Jan 13, 2023
1 parent 34f2bb5 commit 9ef098b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,7 @@ This works with the Terraform AWS provider 4.x, released 2022-02.
- add versioning field
- standard
- allow use of versioning field

* 3.3.7 -- 2023-01-13
- common
- add variable override_prefixes (advanced usage only)
2 changes: 1 addition & 1 deletion common/kms.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
locals {
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)
kms_key_name = format("%s%s", local.__prefixes["kms"], local.name)

kms_admin_root = [format("arn:%v:iam::%v:root", local.partition, local.account_id)]
kms_admin_roles = compact(concat(local.kms_admin_root, var.kms_admin_roles))
Expand Down
9 changes: 5 additions & 4 deletions common/resources.tf
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
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_name = replace(var.bucket_name, local.__prefixes["s3"], "")
b_account = var.name_include_account ? format("-%v", local.account_id) : ""
b_region = var.name_include_region ? format("-%v", local.region) : ""
b_region_short = format("-%v", local.region_short)
c_name = format("%v%v%v", local.b_name, local.b_account, local.b_region)
b_bucket_name = format("%v%v", local._prefixes["s3"], local.c_name)
b_bucket_name = format("%v%v", local.__prefixes["s3"], local.c_name)
too_long = length(local.b_bucket_name) > 63 && var.name_include_region && var.name_include_region_compact ? true : false
name = local.too_long || var.name_enforce_region_compact ? format("%v%v%v", local.b_name, local.b_account, local.b_region_short) : local.c_name
bucket_name = format("%v%v", local._prefixes["s3"], local.name)
bucket_name = format("%v%v", local.__prefixes["s3"], local.name)
bucket_policy_document = length(var.bucket_policy_document) > 0 ? var.bucket_policy_document : data.aws_iam_policy_document.empty.json
bucket_owner = var.bucket_owner == "" || var.bucket_owner == null ? "BucketOwnerPreferred" : var.bucket_owner

# kms_key_arn = aws_kms_key.key.arn
# kms_key_name = format("%s%s", local._prefixes["kms"], local.name)
# kms_key_name = format("%s%s", local.__prefixes["kms"], local.name)

# kms_admin_root = [format("arn:%v:iam::%v:root", local.partition, local.account_id)]
# kms_admin_roles = compact(concat(local.kms_admin_root, var.kms_admin_roles))
Expand Down
2 changes: 1 addition & 1 deletion common/version.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
locals {
_module_version = "3.3.6"
_module_version = "3.3.7"
}

0 comments on commit 9ef098b

Please sign in to comment.