Skip to content

Commit

Permalink
Terraform fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
annielh committed Feb 21, 2024
1 parent 6a47878 commit b071150
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
36 changes: 18 additions & 18 deletions s3/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}

Expand Down
2 changes: 1 addition & 1 deletion s3/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,5 @@ variable "lambda_arn" {

variable "cloudfront_distribution_arns" {
description = "ARNs of Cloudfront distributions interacting with the bucket"
default = []
default = []
}

0 comments on commit b071150

Please sign in to comment.