update acl private handling on s3 buckets with new acl resources

AlexsLemonade · Nov 22, 2024 · da0ae95 · da0ae95
1 parent 449a9fd
commit da0ae95
Showing 1 changed file with 23 additions and 30 deletions.
diff --git a/infrastructure/s3.tf b/infrastructure/s3.tf
@@ -1,7 +1,5 @@
 resource "aws_s3_bucket" "scpca_portal_bucket" {
   bucket = "scpca-portal-${var.user}-${var.stage}"
-  # TODO: remove this when upgrading aws_provider version
-  acl = "private"
   force_destroy = var.stage == "prod" ? false : true
 
   tags = merge(
@@ -13,21 +11,19 @@ resource "aws_s3_bucket" "scpca_portal_bucket" {
   )
 }
 
-# TODO: enable after upgrade
-# resource "aws_s3_bucket_ownership_controls" "scpca_portal_bucket" {
-#  bucket = aws_s3_bucket.scpca_portal_bucket.id
-#  rule {
-#    object_ownership = "BucketOwnerPreferred"
-#  }
-#}
+resource "aws_s3_bucket_ownership_controls" "scpca_portal_bucket" {
+  bucket = aws_s3_bucket.scpca_portal_bucket.id
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
 
-# TODO: enable after upgrade
-# resource "aws_s3_bucket_acl" "scpca_portal_bucket" {
-#  depends_on = [aws_s3_bucket_ownership_controls.scpca_portal_bucket]
-#
-#  bucket = aws_s3_bucket.scpca_portal_bucket.id
-#  acl = "private"
-#}
+resource "aws_s3_bucket_acl" "scpca_portal_bucket" {
+  depends_on = [aws_s3_bucket_ownership_controls.scpca_portal_bucket]
+
+  bucket = aws_s3_bucket.scpca_portal_bucket.id
+  acl = "private"
+}
 
 resource "aws_s3_bucket_public_access_block" "scpca_portal_bucket" {
   bucket = aws_s3_bucket.scpca_portal_bucket.id
@@ -38,8 +34,6 @@ resource "aws_s3_bucket_public_access_block" "scpca_portal_bucket" {
 
 resource "aws_s3_bucket" "scpca_portal_cert_bucket" {
   bucket = "scpca-portal-cert-${var.user}-${var.stage}"
-  # TODO: remove this when upgrading aws_provider version
-  acl = "private"
   force_destroy = var.stage == "prod" ? false : true
 
   # TODO: remove lifecycle rule when we upgrade aws_provider version
@@ -63,19 +57,18 @@ resource "aws_s3_bucket" "scpca_portal_cert_bucket" {
   )
 }
 
-# TODO: enable after upgrade
-# resource "aws_s3_bucket_ownership_controls" "scpca_portal_cert_bucket" {
-#   bucket = aws_s3_bucket.scpca_portal_cert_bucket.id
-#   rule {
-#    object_ownership = "BucketOwnerPreferred"
-#  }
-#}
+resource "aws_s3_bucket_ownership_controls" "scpca_portal_cert_bucket" {
+   bucket = aws_s3_bucket.scpca_portal_cert_bucket.id
+   rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
 
-# resource "aws_s3_bucket_acl" "scpca_portal_cert_bucket" {
-#  depends_on = [aws_s3_bucket_ownership_controls.scpca_portal_cert_bucket]
-#  bucket = aws_s3_bucket.scpca_portal_cert_bucket.id
-#  acl = "private"
-#}
+resource "aws_s3_bucket_acl" "scpca_portal_cert_bucket" {
+  depends_on = [aws_s3_bucket_ownership_controls.scpca_portal_cert_bucket]
+  bucket = aws_s3_bucket.scpca_portal_cert_bucket.id
+  acl = "private"
+}
 
 # resource "aws_s3_bucket_lifecycle_configuration" "scpca_portal_cert_bucket" {
 #  bucket = aws_s3_bucket.scpca_portal_cert_bucket.id