From b071150c5a57315f633ead1b38166736ee9c63d5 Mon Sep 17 00:00:00 2001 From: Annie Hawes Date: Wed, 21 Feb 2024 16:22:25 +0000 Subject: [PATCH] Terraform fmt --- s3/main.tf | 36 ++++++++++++++++++------------------ s3/variables.tf | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/s3/main.tf b/s3/main.tf index 6880447..8618609 100644 --- a/s3/main.tf +++ b/s3/main.tf @@ -116,25 +116,25 @@ resource "aws_s3_bucket" "bucket" { } resource "aws_s3_bucket_policy" "bucket" { - count = var.apply_resource == true ? 1 : 0 - bucket = aws_s3_bucket.bucket.*.id[0] - policy = local.environment == "mgmt" && contains(["log-data", "lambda_update"], var.bucket_policy) ? templatefile("./tdr-terraform-modules/s3/templates/${var.bucket_policy}.json.tpl", - { - bucket_name = aws_s3_bucket.bucket.*.id[0], - account_id = data.aws_caller_identity.current.account_id, - external_account_1 = data.aws_ssm_parameter.intg_account_number.*.value[0], - external_account_2 = data.aws_ssm_parameter.staging_account_number.*.value[0], - external_account_3 = data.aws_ssm_parameter.prod_account_number.*.value[0] - }) : templatefile("./tdr-terraform-modules/s3/templates/${var.bucket_policy}.json.tpl", - { - bucket_name = aws_s3_bucket.bucket.*.id[0], - aws_elb_account = data.aws_ssm_parameter.aws_elb_account_number.value, - cloudfront_oai = var.cloudfront_oai, - account_id = data.aws_caller_identity.current.account_id, - environment = local.environment, title_environment = title(local.environment), - read_access_roles = var.read_access_role_arns, + count = var.apply_resource == true ? 1 : 0 + bucket = aws_s3_bucket.bucket.*.id[0] + policy = local.environment == "mgmt" && contains(["log-data", "lambda_update"], var.bucket_policy) ? templatefile("./tdr-terraform-modules/s3/templates/${var.bucket_policy}.json.tpl", + { + bucket_name = aws_s3_bucket.bucket.*.id[0], + account_id = data.aws_caller_identity.current.account_id, + external_account_1 = data.aws_ssm_parameter.intg_account_number.*.value[0], + external_account_2 = data.aws_ssm_parameter.staging_account_number.*.value[0], + external_account_3 = data.aws_ssm_parameter.prod_account_number.*.value[0] + }) : templatefile("./tdr-terraform-modules/s3/templates/${var.bucket_policy}.json.tpl", + { + bucket_name = aws_s3_bucket.bucket.*.id[0], + aws_elb_account = data.aws_ssm_parameter.aws_elb_account_number.value, + cloudfront_oai = var.cloudfront_oai, + account_id = data.aws_caller_identity.current.account_id, + environment = local.environment, title_environment = title(local.environment), + read_access_roles = var.read_access_role_arns, cloudfront_distribution_arns = jsonencode(var.cloudfront_distribution_arns) - }) + }) depends_on = [aws_s3_bucket_public_access_block.bucket] } diff --git a/s3/variables.tf b/s3/variables.tf index 2fc038b..27a46b8 100644 --- a/s3/variables.tf +++ b/s3/variables.tf @@ -137,5 +137,5 @@ variable "lambda_arn" { variable "cloudfront_distribution_arns" { description = "ARNs of Cloudfront distributions interacting with the bucket" - default = [] + default = [] } \ No newline at end of file