From c6793e36791afeacedf7a2b906c240541ccf160e Mon Sep 17 00:00:00 2001
From: jakemulley <jakemulley@users.noreply.github.com>
Date: Tue, 31 Oct 2023 15:26:15 +0000
Subject: [PATCH 1/2] Bump version used in template and by CLI to latest
 release

---
 examples/s3.tf | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/examples/s3.tf b/examples/s3.tf
index 17fc2d0..e2b760f 100644
--- a/examples/s3.tf
+++ b/examples/s3.tf
@@ -5,14 +5,14 @@
  *
  */
 module "s3_bucket" {
+  source = "github.com/ministryofjustice/cloud-platform-terraform-s3-bucket?ref=6.0.0"
 
-  source                 = "github.com/ministryofjustice/cloud-platform-terraform-s3-bucket?ref=4.8.2"
   team_name              = var.team_name
-  business-unit          = var.business_unit
+  business_unit          = var.business_unit
   application            = var.application
-  is-production          = var.is_production
-  environment-name       = var.environment
-  infrastructure-support = var.infrastructure_support
+  is_production          = var.is_production
+  environment_name       = var.environment
+  infrastructure_support = var.infrastructure_support
   namespace              = var.namespace
 
   /*
@@ -143,36 +143,6 @@ module "s3_bucket" {
 }
 EOF
 
-*/
-
-  /*
- * Override the default policy for the generated machine user of this bucket.
- *
-
-user_policy = <<EOF
-{
-"Version": "2012-10-17",
-"Statement": [
-  {
-    "Sid": "",
-    "Effect": "Allow",
-    "Action": [
-      "s3:GetBucketLocation"
-    ],
-    "Resource": "$${bucket_arn}"
-  },
-  {
-    "Sid": "",
-    "Effect": "Allow",
-    "Action": [
-      "s3:GetObject"
-    ],
-    "Resource": "$${bucket_arn}/*"
-  }
-]
-}
-EOF
-
 */
 }
 

From 0dd720abb12979e2be95b5a383b5b30d0a413b8b Mon Sep 17 00:00:00 2001
From: Jake Mulley <jakemulley@users.noreply.github.com>
Date: Tue, 31 Oct 2023 15:36:00 +0000
Subject: [PATCH 2/2] Update s3.tf

---
 examples/s3.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/s3.tf b/examples/s3.tf
index e2b760f..e84f678 100644
--- a/examples/s3.tf
+++ b/examples/s3.tf
@@ -5,7 +5,7 @@
  *
  */
 module "s3_bucket" {
-  source = "github.com/ministryofjustice/cloud-platform-terraform-s3-bucket?ref=6.0.0"
+  source = "github.com/ministryofjustice/cloud-platform-terraform-s3-bucket?ref=5.1.0"
 
   team_name              = var.team_name
   business_unit          = var.business_unit