Updates Shared AMIs module to be AWS 4.x compatible

base/shared_ami_key/main.tf

@@ -45,17 +45,24 @@ module "shared_ami_key" {
 
 resource "aws_s3_bucket" "xdr-shared-amis" {
   bucket = var.ami_bucket_name
-  acl  = "private"
+
   tags = merge(var.standard_tags, var.tags)
+}
 
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        kms_master_key_id = module.shared_ami_key.key_arn
-        sse_algorithm     = "aws:kms"
+resource "aws_s3_bucket_acl" "s3_acl_xdr-shared-amis" {
+  bucket = aws_s3_bucket.xdr-shared-amis.id
+  acl    = "private"
+}
+
+resource "aws_s3_bucket_server_side_encryption_configuration" "s3_sse_xdr-shared-amis" {
+  bucket = aws_s3_bucket.xdr-shared-amis.id
+  
+  rule {
+    apply_server_side_encryption_by_default {
+      kms_master_key_id = module.shared_ami_key.key_arn
+      sse_algorithm     = "aws:kms"
       }
     }
-  }
 }
 
 resource "aws_iam_role" "vmimport" {
@@ -127,3 +134,20 @@ resource "aws_iam_role_policy" "vmimport" {
 }
 EOF
 }
+
+//AWS Provider outdated arguments <4.4.0
+/*resource "aws_s3_bucket" "xdr-shared-amis" {
+  bucket = var.ami_bucket_name
+  acl  = "private"
+  tags = merge(var.standard_tags, var.tags)
+
+  server_side_encryption_configuration {
+    rule {
+      apply_server_side_encryption_by_default {
+        kms_master_key_id = module.shared_ami_key.key_arn
+        sse_algorithm     = "aws:kms"
+      }
+    }
+  }
+}
+*/