From 3a8e3784e132dee18554144e9d706ea1c9c730a3 Mon Sep 17 00:00:00 2001 From: serkan Date: Tue, 8 Mar 2022 11:45:15 -0500 Subject: [PATCH] updated s3 resource to reflect aws provider upgrade to v4.0 https://registry.terraform.io/providers/hashicorp/aws/latest/docs/guides/version-4-upgrade\#acl-argument --- .../Terraform_DEPLOY_AHA/Terraform_DEPLOY_AHA.tf | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/terraform/Terraform_DEPLOY_AHA/Terraform_DEPLOY_AHA.tf b/terraform/Terraform_DEPLOY_AHA/Terraform_DEPLOY_AHA.tf index 5250c0f..40bfef8 100644 --- a/terraform/Terraform_DEPLOY_AHA/Terraform_DEPLOY_AHA.tf +++ b/terraform/Terraform_DEPLOY_AHA/Terraform_DEPLOY_AHA.tf @@ -198,22 +198,31 @@ resource "random_string" "resource_code" { resource "aws_s3_bucket" "AHA-S3Bucket-PrimaryRegion" { count = "${var.ExcludeAccountIDs != "" ? 1 : 0}" bucket = "aha-bucket-${var.aha_primary_region}-${random_string.resource_code.result}" - acl = "private" tags = { Name = "aha-bucket" } } +resource "aws_s3_bucket_acl" "AHA-S3Bucket-PrimaryRegion" { + count = "${var.ExcludeAccountIDs != "" ? 1 : 0}" + bucket = aws_s3_bucket.AHA-S3Bucket-PrimaryRegion[count.index].id + acl = "private" +} resource "aws_s3_bucket" "AHA-S3Bucket-SecondaryRegion" { count = "${var.aha_secondary_region != "" && var.ExcludeAccountIDs != "" ? 1 : 0}" provider = aws.secondary_region bucket = "aha-bucket-${var.aha_secondary_region}-${random_string.resource_code.result}" - acl = "private" tags = { Name = "aha-bucket" } } +resource "aws_s3_bucket_acl" "AHA-S3Bucket-SecondaryRegion" { + count = "${var.aha_secondary_region != "" && var.ExcludeAccountIDs != "" ? 1 : 0}" + bucket = aws_s3_bucket.AHA-S3Bucket-SecondaryRegion[count.index].id + acl = "private" +} + resource "aws_s3_bucket_object" "AHA-S3Object-PrimaryRegion" { count = "${var.ExcludeAccountIDs != "" ? 1 : 0}" key = var.ExcludeAccountIDs @@ -782,4 +791,3 @@ resource "aws_lambda_permission" "AHA-LambdaSchedulePermission-SecondaryRegion" function_name = aws_lambda_function.AHA-LambdaFunction-SecondaryRegion[0].arn source_arn = aws_cloudwatch_event_rule.AHA-LambdaSchedule-SecondaryRegion[0].arn } -