Merge pull request #20 from creynolds15/ACLs

DSD-2975: remove legacy ACLs

Author: creynolds15

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Tamr S3 Module Repo
 
+## v1.3.3 - August 9th 2022
+* Fixes a bug with legacy ACLs for S3 buckets
+
 ## v1.3.2 - August 9th 2022
 * Fixes a bug where two resources were controlling server side encryption
 

VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

examples/iam-policy-submodule/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 1.0.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.36, !=4.0.0, !=4.1.0, !=4.2.0, !=4.3.0, !=4.4.0, !=4.5.0, !=4.6.0, !=4.7.0, !=4.8.0"
+    }
+  }
+}

examples/minimal/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 1.0.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.36, !=4.0.0, !=4.1.0, !=4.2.0, !=4.3.0, !=4.4.0, !=4.5.0, !=4.6.0, !=4.7.0, !=4.8.0"
+    }
+  }
+}

modules/bucket-iam-policy/versions.tf

@@ -1,9 +1,13 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0.0"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
       version = ">= 3.36, !=4.0.0, !=4.1.0, !=4.2.0, !=4.3.0, !=4.4.0, !=4.5.0, !=4.6.0, !=4.7.0, !=4.8.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.3.2"
+    }
   }
 }

modules/encrypted-bucket/main.tf

@@ -14,6 +14,7 @@ resource "aws_s3_bucket" "new_bucket" {
   }
 }
 
+#tfsec:ignore:aws-s3-encryption-customer-key
 resource "aws_s3_bucket_server_side_encryption_configuration" "encryption_for_new_bucket" {
   bucket = aws_s3_bucket.new_bucket.id
   rule {
@@ -35,12 +36,6 @@ resource "aws_s3_bucket_policy" "sse_bucket_policy" {
   )
 }
 
-# Sets S3 bucket ACL
-resource "aws_s3_bucket_acl" "acl_for_new_bucket" {
-  bucket = aws_s3_bucket.new_bucket.id
-  acl    = "private"
-}
-
 # Enabling S3 bucket public access block
 resource "aws_s3_bucket_public_access_block" "for_new_bucket" {
   bucket = aws_s3_bucket.new_bucket.id

modules/encrypted-bucket/versions.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0.0"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

versions.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0.0"
   required_providers {
     aws = {
       source  = "hashicorp/aws"