From b6dbf6aaf8d0ed8da85aff5b302fb2641b71aa41 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward@in4it.io>
Date: Thu, 24 Feb 2022 09:07:29 -0500
Subject: [PATCH] new aws provider fixes for s3, template_file

---
 codepipeline-demo/s3.tf   |  2 --
 demo-10/cloudinit.tf      | 22 +++++++---------------
 demo-14/s3.tf             |  1 -
 docker-demo-3/s3.tf       |  1 -
 jenkins-packer-demo/s3.tf |  1 -
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/codepipeline-demo/s3.tf b/codepipeline-demo/s3.tf
index 47f435a..3b5bfc6 100644
--- a/codepipeline-demo/s3.tf
+++ b/codepipeline-demo/s3.tf
@@ -3,12 +3,10 @@
 #
 resource "aws_s3_bucket" "codebuild-cache" {
   bucket = "demo-codebuild-cache-${random_string.random.result}"
-  acl    = "private"
 }
 
 resource "aws_s3_bucket" "demo-artifacts" {
   bucket = "demo-artifacts-${random_string.random.result}"
-  acl    = "private"
 
   lifecycle_rule {
     id      = "clean-up"
diff --git a/demo-10/cloudinit.tf b/demo-10/cloudinit.tf
index 4c0b056..83fcfe2 100644
--- a/demo-10/cloudinit.tf
+++ b/demo-10/cloudinit.tf
@@ -1,16 +1,4 @@
-data "template_file" "init-script" {
-  template = file("scripts/init.cfg")
-  vars = {
-    REGION = var.AWS_REGION
-  }
-}
-
-data "template_file" "shell-script" {
-  template = file("scripts/volumes.sh")
-  vars = {
-    DEVICE = var.INSTANCE_DEVICE_NAME
-  }
-}
+# note: previous templatefile datasources have been replaced by the template_file() function
 
 data "template_cloudinit_config" "cloudinit-example" {
   gzip          = false
@@ -19,12 +7,16 @@ data "template_cloudinit_config" "cloudinit-example" {
   part {
     filename     = "init.cfg"
     content_type = "text/cloud-config"
-    content      = data.template_file.init-script.rendered
+    content      = template_file("scripts/init.cfg", {
+      REGION = var.AWS_REGION
+    })
   }
 
   part {
     content_type = "text/x-shellscript"
-    content      = data.template_file.shell-script.rendered
+    content      = template_file("scripts/volumes.sh", {
+      DEVICE = var.INSTANCE_DEVICE_NAME
+    })
   }
 }
 
diff --git a/demo-14/s3.tf b/demo-14/s3.tf
index be32d4f..fec26f8 100644
--- a/demo-14/s3.tf
+++ b/demo-14/s3.tf
@@ -1,6 +1,5 @@
 resource "aws_s3_bucket" "b" {
   bucket = "mybucket-c29df1"
-  acl    = "private"
 
   tags = {
     Name = "mybucket-c29df1"
diff --git a/docker-demo-3/s3.tf b/docker-demo-3/s3.tf
index 9055dde..f65e0a3 100644
--- a/docker-demo-3/s3.tf
+++ b/docker-demo-3/s3.tf
@@ -1,6 +1,5 @@
 resource "aws_s3_bucket" "terraform-state" {
   bucket = "terraform-state-a2b6219"
-  acl    = "private"
 
   tags = {
     Name = "Terraform state"
diff --git a/jenkins-packer-demo/s3.tf b/jenkins-packer-demo/s3.tf
index ad57a5c..da29fd8 100644
--- a/jenkins-packer-demo/s3.tf
+++ b/jenkins-packer-demo/s3.tf
@@ -1,6 +1,5 @@
 resource "aws_s3_bucket" "terraform-state" {
   bucket = "terraform-state-${random_string.random.result}"
-  acl    = "private"
 
   tags = {
     Name = "Terraform state"