Merge pull request #906 from NHSDigital/feature/jale13-nrl-1468-update-reporting-s3-lifecycle

NRL 1468 update reporting s3 lifecycle

Author: jackleary

terraform/account-wide-infrastructure/modules/glue/locals.tf

@@ -1,18 +1,7 @@
 locals {
   s3 = {
-    transition_storage = {
-      infrequent_access = {
-        storage_class = "STANDARD_IA"
-        days          = 150
-      }
-      glacier = {
-        storage_class = "GLACIER"
-        days          = 200
-      }
-    }
-
     expiration = {
-      days = 1095
+      days = 1
     }
   }
 }

terraform/account-wide-infrastructure/modules/glue/s3.tf

@@ -59,14 +59,6 @@ resource "aws_s3_bucket_lifecycle_configuration" "source-data-bucket-lifecycle"
     id     = "bucket-versioning-rule"
     status = "Enabled"
 
-    transition {
-      days          = local.s3.transition_storage.infrequent_access.days
-      storage_class = local.s3.transition_storage.infrequent_access.storage_class
-    }
-    transition {
-      days          = local.s3.transition_storage.glacier.days
-      storage_class = local.s3.transition_storage.glacier.storage_class
-    }
     expiration {
       days = local.s3.expiration.days
     }

terraform/infrastructure/modules/firehose/kinesis.tf

@@ -63,8 +63,10 @@ resource "aws_kinesis_firehose_delivery_stream" "reporting_stream" {
   destination = "extended_s3"
 
   extended_s3_configuration {
-    role_arn   = aws_iam_role.firehose.arn
-    bucket_arn = var.reporting_bucket_arn
+    role_arn           = aws_iam_role.firehose.arn
+    bucket_arn         = var.reporting_bucket_arn
+    buffering_size     = 64
+    buffering_interval = 600
 
     processing_configuration {
       enabled = "true"