Update TF templates following AWS provider update

Signed-off-by: Jim Enright <[email protected]>

Author: jimright

roles/infrastructure/template/aws/infra_aws_storage.tf.j2

@@ -3,7 +3,6 @@
 {% for __aws_storage_location_item in ( infra__aws_storage_locations | map(attribute='bucket') | list | unique ) %}
 resource "aws_s3_bucket" "{{ __aws_storage_location_item }}" {
   bucket        = "{{ __aws_storage_location_item }}"
-  acl           = "private"
 
 {% if infra__teardown_deletes_data %}
   force_destroy = true
@@ -17,14 +16,20 @@ resource "aws_s3_bucket" "{{ __aws_storage_location_item }}" {
 
   tags          = merge(var.env_tags,{Name = "{{ __aws_storage_location_item }}"})
 }
+
+# Separate bucket acl resource definition
+resource "aws_s3_bucket_acl" "{{ __aws_storage_location_item }}" {
+  bucket = aws_s3_bucket.{{ __aws_storage_location_item }}.id
+  acl    = "private"
+}
 {% endfor %}
 
 # ------- AWS Buckets directory structures -------
 {% for __aws_storage_object_item in infra__aws_storage_locations %}
 {# Terraform resources cannot have '/' so replace with '_' #}
 {% set __aws_storage_object_resource = __aws_storage_object_item.path |replace("/", "_") %}
 
-resource "aws_s3_bucket_object" "{{ __aws_storage_object_resource }}" {
+resource "aws_s3_object" "{{ __aws_storage_object_resource }}" {
     bucket        = aws_s3_bucket.{{ __aws_storage_object_item.bucket }}.id
     key           = "{{ __aws_storage_object_item.path }}/"
     # Below may not be required once we have the '/'

roles/infrastructure/template/aws/provider.tf.j2

@@ -1,6 +1,14 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
+}
+
 provider "aws" {
-  # access_key = var.access_key
-  # secret_key = var.secret_key
+
   profile     = var.aws_profile
   region      = var.region
-}
+}

roles/platform/template/aws/provider.tf.j2

@@ -1,6 +1,14 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
+}
+
 provider "aws" {
-  # access_key = var.access_key
-  # secret_key = var.secret_key
+
   profile     = var.aws_profile
   region      = var.region
-}
+}