From 1ba6ca95654cddb57a55062db3d4356aeecb7cff Mon Sep 17 00:00:00 2001
From: Ben Limmer <ben@benlimmer.com>
Date: Sat, 14 May 2022 19:24:48 -0600
Subject: [PATCH] fix: s3 bucket deprecated arguments

---
 modules/cloudfront/distribution.tf |  9 ++++++---
 modules/codebuild/main.tf          | 15 +++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/cloudfront/distribution.tf b/modules/cloudfront/distribution.tf
index 9e79890..132564a 100644
--- a/modules/cloudfront/distribution.tf
+++ b/modules/cloudfront/distribution.tf
@@ -4,13 +4,16 @@
 resource "aws_s3_bucket" "wordpress_bucket" {
   bucket        = "${var.site_prefix}.${var.site_domain}"
   force_destroy = true
-  server_side_encryption_configuration {
-    rule {
+}
+
+resource "aws_s3_bucket_server_side_encryption_configuration" "wordpress_bucket" {
+  bucket = aws_s3_bucket.wordpress_bucket.bucket
+
+  rule {
       apply_server_side_encryption_by_default {
         sse_algorithm = "AES256"
       }
     }
-  }
 }
 
 resource "aws_s3_bucket_public_access_block" "wordpress_bucket" {
diff --git a/modules/codebuild/main.tf b/modules/codebuild/main.tf
index 70fbe2e..37969d0 100644
--- a/modules/codebuild/main.tf
+++ b/modules/codebuild/main.tf
@@ -5,15 +5,22 @@ data "aws_region" "current" {}
 #tfsec:ignore:AWS002 #tfsec:ignore:AWS077
 resource "aws_s3_bucket" "code_source" {
   bucket        = var.codebuild_bucket
-  acl           = "private"
   force_destroy = true
-  server_side_encryption_configuration {
-    rule {
+}
+
+resource "aws_s3_bucket_acl" "code_source" {
+  bucket = aws_s3_bucket.code_source.id
+  acl    = "private"
+}
+
+resource "aws_s3_bucket_server_side_encryption_configuration" "code_source" {
+  bucket = aws_s3_bucket.code_source.bucket
+
+  rule {
       apply_server_side_encryption_by_default {
         sse_algorithm = "AES256"
       }
     }
-  }
 }
 
 resource "aws_s3_bucket_public_access_block" "code_source" {