add back the s3 features removed as they do not appear to work

CHANGELOG.md

@@ -101,3 +101,7 @@ This works with the Terraform AWS provider 4.x, released 2022-02.
 * 3.0.2 -- 2022-03-25
   - common/resource.tf
     - do not create aws_s3_bucket_acl if bucket_owner is set to enforced
+
+* 3.0.3 -- 2022-03-25
+  - common/resource.tf
+    - add back in acl, service_side_encryption, logging, versiong as they do not appear to work in govcloud

common/resources.tf

@@ -49,28 +49,32 @@ locals {
 #---
 resource "aws_s3_bucket" "this" {
   bucket = local.bucket_name
-  ##  acl           = "private"
+  # remove (acl) when separate resources work
+  acl           = "private"
   force_destroy = var.force_destroy
 
-  ##   server_side_encryption_configuration {
-  ##     rule {
-  ##       apply_server_side_encryption_by_default {
-  ##         #        kms_master_key_id = aws_kms_key.key.arn
-  ##         kms_master_key_id = local.kms_key_arn
-  ##         sse_algorithm     = "aws:kms"
-  ##       }
-  ##       bucket_key_enabled = var.bucket_key_enabled
-  ##     }
-  ##   }
+  # remove (server_side_encryption_configuration) when separate resources work
+  server_side_encryption_configuration {
+    rule {
+      apply_server_side_encryption_by_default {
+        #        kms_master_key_id = aws_kms_key.key.arn
+        kms_master_key_id = local.kms_key_arn
+        sse_algorithm     = "aws:kms"
+      }
+      bucket_key_enabled = var.bucket_key_enabled
+    }
+  }
 
-  ##   versioning {
-  ##     enabled = local.versioning
-  ##   }
+  # remove (versioning) when separate resources work
+  versioning {
+    enabled = local.versioning
+  }
 
-  ##   logging {
-  ##     target_bucket = var.access_log_bucket
-  ##     target_prefix = format("%s/%s/", var.access_log_bucket_prefix, local.bucket_name)
-  ##   }
+  # remove (logging) when separate resources work
+  logging {
+    target_bucket = var.access_log_bucket
+    target_prefix = format("%s/%s/", var.access_log_bucket_prefix, local.bucket_name)
+  }
 
   lifecycle {
     prevent_destroy = false

common/version.tf

@@ -1,3 +1,3 @@
 locals {
-  _module_version = "3.0.2"
+  _module_version = "3.0.3"
 }