Merge pull request #19 from DNXLabs/hotfix/adjust-bucket-policy-and-c…

…apacity-provider adjust bucket policy and capacity provier for AWS provider compatibility
DNXLabs · Oct 4, 2023 · 41a931c · 41a931c
2 parents 0d56e12 + eb8cc08
commit 41a931c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/ecs.tf b/ecs.tf
@@ -3,12 +3,11 @@ resource "aws_ecs_cluster" "ecs" {
   depends_on = [aws_autoscaling_group.ecs, aws_ecs_capacity_provider.ecs_capacity_provider]
   name       = var.name
 
-  capacity_providers = ["${var.name}-capacity-provider"]
-
   lifecycle {
     ignore_changes = [
       tags
     ]
   }
 
-}
+}
+
diff --git a/s3.tf b/s3.tf
@@ -3,13 +3,23 @@ resource "aws_s3_bucket" "vpn" {
 }
 
 resource "aws_s3_bucket_acl" "vpn" {
+  depends_on = [aws_s3_bucket_ownership_controls.vpn]
+
   bucket = aws_s3_bucket.vpn.id
   acl = "private"
 }
 
+resource "aws_s3_bucket_ownership_controls" "vpn" {
+  bucket = aws_s3_bucket.vpn.id
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
+
 resource "aws_s3_bucket_policy" "vpn" {
+  count = var.s3_bucket_policy != "" ? 1 : 0
   bucket = aws_s3_bucket.vpn.id
-  policy        = var.s3_bucket_policy != "" ? var.s3_bucket_policy : null
+  policy        = var.s3_bucket_policy
 }
 
 resource "aws_s3_bucket_public_access_block" "vpn" {