support newer_noncurrent_versions (#71)

elastic-infra · May 30, 2023 · 9fd6f11 · 9fd6f11
1 parent cc60357
commit 9fd6f11
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/aws/private-s3-bucket/README.md b/aws/private-s3-bucket/README.md
diff --git a/aws/private-s3-bucket/bucket_options.tf b/aws/private-s3-bucket/bucket_options.tf
@@ -117,14 +117,16 @@ resource "aws_s3_bucket_lifecycle_configuration" "b" {
     dynamic "noncurrent_version_transition" {
       for_each = var.lifecycle_rule[0].noncurrent_version_transition
       content {
-        noncurrent_days = noncurrent_version_transition.value.days
-        storage_class   = noncurrent_version_transition.value.storage_class
+        noncurrent_days           = noncurrent_version_transition.value.days
+        newer_noncurrent_versions = noncurrent_version_transition.value.versions
+        storage_class             = noncurrent_version_transition.value.storage_class
       }
     }
     dynamic "noncurrent_version_expiration" {
       for_each = var.lifecycle_rule[0].noncurrent_version_expiration
       content {
-        noncurrent_days = noncurrent_version_expiration.value.days
+        noncurrent_days           = noncurrent_version_expiration.value.days
+        newer_noncurrent_versions = noncurrent_version_expiration.value.versions
       }
     }
   }

diff --git a/aws/private-s3-bucket/constraints.tf b/aws/private-s3-bucket/constraints.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.14"
+  required_version = ">= 1.3.0"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/aws/private-s3-bucket/main.tf b/aws/private-s3-bucket/main.tf
@@ -97,13 +97,15 @@
 *     ]
 *     noncurrent_version_transition = [
 *       {
-*         days = 120
+*         days          = 120
+*         versions      = 3
 *         storage_class = "GLACIER"
 *       }
 *     ]
 *     noncurrent_version_expiration = [
 *       {
-*         days = 150
+*         days     = 150
+*         versions = 3
 *       }
 *     ]
 *   }

diff --git a/aws/private-s3-bucket/variables.tf b/aws/private-s3-bucket/variables.tf
@@ -60,23 +60,25 @@ variable "lifecycle_rule" {
     abort_incomplete_multipart_upload_days = number
     tags                                   = map(string)
     transition = list(object({
-      date          = string
-      days          = number
+      date          = optional(string)
+      days          = optional(number)
       storage_class = string
     }))
     # Note for expiration, noncurrent_version_transition, noncurrent_version_expiration
     # define as list for simplicity, though expected only a single object
     expiration = list(object({
-      date                         = string
-      days                         = number
-      expired_object_delete_marker = bool
+      date                         = optional(string)
+      days                         = optional(number)
+      expired_object_delete_marker = optional(bool, false)
     }))
     noncurrent_version_transition = list(object({
       days          = number
+      versions      = optional(number)
       storage_class = string
     }))
     noncurrent_version_expiration = list(object({
-      days = number
+      days     = number
+      versions = optional(number)
     }))
   }))
   description = "S3 lifecycle rule"