remove s3 files after 7 days

Author: peterdudfield

terraform/india/development/main.tf

@@ -75,7 +75,7 @@ module "s3-nwp-bucket" {
   region              = var.region
   domain              = local.domain
   service_name        = "nwp"
-  lifecycled_prefixes = ["ecmwf/data", "ecmwf/raw"]
+  lifecycled_prefixes = ["ecmwf", "gfs", "metoffice"]
 }
 
 # 2.1
@@ -85,7 +85,7 @@ module "s3-satellite-bucket" {
   region              = var.region
   domain              = local.domain
   service_name        = "satellite"
-  lifecycled_prefixes = ["data"]
+  lifecycled_prefixes = ["data", "raw"]
 }
 
 # 2.2

terraform/india/production/main.tf

@@ -74,7 +74,7 @@ module "s3-nwp-bucket" {
   region              = var.region
   domain              = local.domain
   service_name        = "nwp"
-  lifecycled_prefixes = ["ecmwf/data", "ecmwf/raw", "gfs/data", "gfs/raw"]
+  lifecycled_prefixes = ["ecmwf", "gfs", "metoffice"]
 }
 
 # 2.1
@@ -84,7 +84,7 @@ module "s3-satellite-bucket" {
   region              = var.region
   domain              = local.domain
   service_name        = "satellite"
-  lifecycled_prefixes = ["data"]
+  lifecycled_prefixes = ["data", "raw"]
 }
 
 # 2.2

terraform/modules/storage/s3-trio/s3.tf

@@ -40,7 +40,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "nwp-bucket-lifecycle" {
   bucket = aws_s3_bucket.s3-nwp-bucket.id
 
   rule {
-    id      = "remove_old_files"
+    id      = "remove_old_ecmwf"
     filter {
       prefix = "ecmwf/data/"
     }
@@ -51,37 +51,16 @@ resource "aws_s3_bucket_lifecycle_configuration" "nwp-bucket-lifecycle" {
   }
 
   rule {
-    id      = "remove_old_raw_files"
+    id      = "remove_old_metoffice"
     filter {
-      prefix = "ecmwf/raw/"
+      prefix = "metoffice/"
     }
     expiration {
       days = 7
     }
     status = "Enabled"
   }
 
-  rule {
-    id      = "remove_old_files_national"
-    filter {
-      prefix = "data-metoffice/"
-    }
-    expiration {
-      days = 7
-    }
-    status = "Enabled"
-  }
-
-  rule {
-    id      = "remove_old_raw_files_national"
-    filter {
-      prefix = "raw-metoffice/"
-    }
-    expiration {
-      days = 7
-    }
-    status = "Enabled"
-  }
 }