diff --git a/locals.tf b/locals.tf new file mode 100644 index 0000000..b7a5353 --- /dev/null +++ b/locals.tf @@ -0,0 +1,7 @@ +locals { + region = var.region + + s3_bucket_names = formatlist("v-s3-%v", var.s3_bucket_names) + key_name = format("k-kms-%v", local.app_name) +} + diff --git a/main.tf b/main.tf index 97b6562..1bfd1f6 100644 --- a/main.tf +++ b/main.tf @@ -104,7 +104,7 @@ resource "null_resource" "s3_create_wait" { } } -riesource "aws_s3_bucket_object" "this_objects" { +resource "aws_s3_bucket_object" "this_objects" { bucket = aws_s3_bucket.this.id count = length(var.bucket_folders) key = format("%s/", element(var.bucket_folders, count.index)) @@ -114,10 +114,9 @@ riesource "aws_s3_bucket_object" "this_objects" { } #------------------------------------------------------------------------- -# EFS KMS KEY +# EFS KMS KEY AND ALIAS #------------------------------------------------------------------------- resource "aws_kms_key" "key" { - count = local.kms_key_arn_exists ? 0 : 1 description = "KMS CMK for title26_s3 ${local.name}" enable_key_rotation = true @@ -129,7 +128,6 @@ resource "aws_kms_key" "key" { } resource "aws_kms_alias" "key" { - count = local.kms_key_arn_exists ? 0 : 1 name = "alias/${local.kms_key_name}" - target_key_id = (aws_kms_key.key.*)[0].key_id + target_key_id = aws_kms_key.key.key_id }