From c09fdcc5a0df0963225965815cd52e76335402cb Mon Sep 17 00:00:00 2001
From: Matt Jarvis <matt.jarvis2@nhs.net>
Date: Fri, 9 Jan 2026 16:32:54 +0000
Subject: [PATCH 1/3] VED-1005: Add required metrics block to replication
 config.

---
 infrastructure/instance/s3_config.tf | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/infrastructure/instance/s3_config.tf b/infrastructure/instance/s3_config.tf
index aaa610671..f249b4e0c 100644
--- a/infrastructure/instance/s3_config.tf
+++ b/infrastructure/instance/s3_config.tf
@@ -159,6 +159,13 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
           minutes = 15
         }
       }
+
+      metrics {
+        status = "Enabled"
+        event_threshold {
+          minutes = 15
+        }
+      }
     }
   }
 
@@ -181,6 +188,13 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
           minutes = 15
         }
       }
+
+      metrics {
+        status = "Enabled"
+        event_threshold {
+          minutes = 15
+        }
+      }
     }
   }
 }

From aa4f076e4840be660b50613fd01864ac255cb856 Mon Sep 17 00:00:00 2001
From: Matt Jarvis <matt.jarvis2@nhs.net>
Date: Fri, 9 Jan 2026 16:50:01 +0000
Subject: [PATCH 2/3] VED-1005: Add required delete marker config.

---
 infrastructure/instance/s3_config.tf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/infrastructure/instance/s3_config.tf b/infrastructure/instance/s3_config.tf
index f249b4e0c..52b131386 100644
--- a/infrastructure/instance/s3_config.tf
+++ b/infrastructure/instance/s3_config.tf
@@ -145,8 +145,10 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
     priority = strcontains(var.sub_environment, "blue") ? 0 : 1
     status   = "Enabled"
 
-    filter {
-      prefix = ""
+    filter {}
+
+    delete_marker_replication {
+      status = "Disabled"
     }
 
     destination {
@@ -174,8 +176,10 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
     priority = strcontains(var.sub_environment, "blue") ? 1 : 0
     status   = "Disabled"
 
-    filter {
-      prefix = ""
+    filter {}
+
+    delete_marker_replication {
+      status = "Disabled"
     }
 
     destination {

From d4bb60f96070475ef6b9a15185f3cfc7aa9b6a7d Mon Sep 17 00:00:00 2001
From: Matt Jarvis <matt.jarvis2@nhs.net>
Date: Fri, 9 Jan 2026 17:01:11 +0000
Subject: [PATCH 3/3] VED-1005: Avoid changing the storage class when
 replicating.

---
 infrastructure/instance/s3_config.tf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/infrastructure/instance/s3_config.tf b/infrastructure/instance/s3_config.tf
index 52b131386..27b6d79e5 100644
--- a/infrastructure/instance/s3_config.tf
+++ b/infrastructure/instance/s3_config.tf
@@ -152,8 +152,7 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
     }
 
     destination {
-      bucket        = aws_s3_bucket.batch_data_source_bucket.arn
-      storage_class = "STANDARD"
+      bucket = aws_s3_bucket.batch_data_source_bucket.arn
 
       replication_time {
         status = "Enabled"
@@ -183,8 +182,7 @@ resource "aws_s3_bucket_replication_configuration" "replication" {
     }
 
     destination {
-      bucket        = strcontains(aws_s3_bucket.batch_data_source_bucket.arn, "blue") ? replace(aws_s3_bucket.batch_data_source_bucket.arn, "blue", "green") : replace(aws_s3_bucket.batch_data_source_bucket.arn, "green", "blue")
-      storage_class = "STANDARD"
+      bucket = strcontains(aws_s3_bucket.batch_data_source_bucket.arn, "blue") ? replace(aws_s3_bucket.batch_data_source_bucket.arn, "blue", "green") : replace(aws_s3_bucket.batch_data_source_bucket.arn, "green", "blue")
 
       replication_time {
         status = "Enabled"