Merge pull request #78 from Flaconi/OPS-5217-extend-lifecycle-settings

Ops 5217 extend lifecycle settings
Flaconi · Mar 2, 2023 · 544652e · 544652e
2 parents ceb2062 + a45172b
commit 544652e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1742,16 +1742,7 @@ Default: `"Enabled"`
 
 Description: S3 Lifecycle rules
 
-Type:
-
-```hcl
-list(object({
-    id              = string
-    status          = string
-    prefix          = string
-    expiration_days = number
-  }))
-```
+Type: `any`
 
 Default: `[]`
 

diff --git a/examples/s3/main.tf b/examples/s3/main.tf
@@ -15,13 +15,28 @@ module "ms_sample_s3" {
       id              = "all-cleanup"
       status          = "Enabled"
       prefix          = ""
-      expiration_days = 90
+      expiration = {
+        days = 90
+      }
     },
     {
       id              = "tmp"
       status          = "Enabled"
       prefix          = "tmp/"
-      expiration_days = 1
+      expiration = {
+        days = 1
+      }
+    },
+    {
+      id              = "MoveAllToGlacierAfterTwoWeeks"
+      status          = "Enabled"
+      prefix          = ""
+      transition = [
+        {
+          days          = 28
+          storage_class = "GLACIER"
+        }
+      ]
     }
   ]
 

diff --git a/s3.tf b/s3.tf
@@ -64,8 +64,23 @@ resource "aws_s3_bucket_lifecycle_configuration" "this" {
       filter {
         prefix = rule.value.prefix
       }
-      expiration {
-        days = rule.value.expiration_days
+
+      dynamic "expiration" {
+        for_each = length(keys(lookup(rule.value, "expiration", {}))) == 0 ? [] : [lookup(rule.value, "expiration", {})]
+
+        content {
+          date                         = lookup(expiration.value, "date", null)
+          days                         = lookup(expiration.value, "days", null)
+          expired_object_delete_marker = lookup(expiration.value, "expired_object_delete_marker", null)
+        }
+      }
+      dynamic "transition" {
+        for_each = lookup(rule.value, "transition", [])
+        content {
+          date          = lookup(transition.value, "date", null)
+          days          = lookup(transition.value, "days", null)
+          storage_class = transition.value.storage_class
+        }
       }
     }
   }

diff --git a/variables.tf b/variables.tf
@@ -1137,12 +1137,7 @@ variable "s3_versioning_enabled" {
 variable "s3_lifecycle_rules" {
   description = "S3 Lifecycle rules"
   default     = []
-  type = list(object({
-    id              = string
-    status          = string
-    prefix          = string
-    expiration_days = number
-  }))
+  type        = any
 }
 
 # -------------------------------------------------------------------------------------------------