OPS-5217 Use optional from TF-1.3 (#79)

* OPS-5217 Use `optional` from TF-1.3 * OPS-5217 Fix version in CI * OPS-5217 Remove default value for `expiration`
Flaconi · Mar 3, 2023 · 7e88234 · 7e88234
1 parent 544652e
commit 7e88234
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ TF_MODULES  = $(sort $(dir $(wildcard $(CURRENT_DIR)modules/*/)))
 # -------------------------------------------------------------------------------------------------
 # Container versions
 # -------------------------------------------------------------------------------------------------
-TF_VERSION      = 1.0.11
+TF_VERSION      = 1.3.9
 TFDOCS_VERSION  = 0.16.0-0.31
 FL_VERSION      = 0.4
 JL_VERSION      = 1.6.0-0.5

diff --git a/README.md b/README.md
@@ -13,6 +13,8 @@ This Terraform module can create typical resources needed for most microservices
 * [IAM](examples/iam/)
 * [RDS](examples/rds/)
 * [Redis](examples/redis/)
+* [S3](examples/s3/)
+* [SQS](examples/sqs/)
 
 ## Usage
 
@@ -260,7 +262,7 @@ The following resources _CAN_ be created:
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
@@ -1742,7 +1744,25 @@ Default: `"Enabled"`
 
 Description: S3 Lifecycle rules
 
-Type: `any`
+Type:
+
+```hcl
+list(object({
+    id     = string
+    status = optional(string, "Enabled")
+    prefix = string
+    expiration = optional(list(object({
+      days                         = optional(number)
+      date                         = optional(string)
+      expired_object_delete_marker = optional(bool, true)
+    })), [])
+    transition = optional(list(object({
+      days          = optional(number)
+      date          = optional(string)
+      storage_class = string
+    })), [])
+  }))
+```
 
 Default: `[]`
 

diff --git a/examples/dynamodb/README.md b/examples/dynamodb/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

diff --git a/examples/dynamodb/versions.tf b/examples/dynamodb/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/examples/iam/README.md b/examples/iam/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

diff --git a/examples/iam/versions.tf b/examples/iam/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/examples/rds/README.md b/examples/rds/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

diff --git a/examples/rds/versions.tf b/examples/rds/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/examples/redis/README.md b/examples/redis/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

diff --git a/examples/redis/versions.tf b/examples/redis/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/examples/s3/README.md b/examples/s3/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

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

diff --git a/examples/s3/versions.tf b/examples/s3/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/examples/sqs/README.md b/examples/sqs/README.md
@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.10 |
 
 ## Providers

diff --git a/examples/sqs/versions.tf b/examples/sqs/versions.tf
@@ -6,5 +6,5 @@ terraform {
       version = "~> 4.10"
     }
   }
-  required_version = "~> 1.0"
+  required_version = "~> 1.3"
 }
diff --git a/locals.tf b/locals.tf
@@ -11,8 +11,6 @@ locals {
     flatten(data.aws_security_groups.for_rds[*].ids),
   )
 
-  length_s3_lifecycle_rules = length(var.s3_lifecycle_rules)
-
   dynamodb_iam_enabled = var.dynamodb_enabled || var.dynamodb2_enabled || var.dynamodb3_enabled || var.dynamodb4_enabled
   dynamodb_tables_arns = concat(
     var.dynamodb_enabled && var.iam_role_enabled ? ["arn:aws:dynamodb:*:*:table/${module.dynamodb.table_id}"] : [],

diff --git a/s3.tf b/s3.tf
@@ -52,33 +52,34 @@ resource "aws_s3_bucket_versioning" "this" {
 resource "aws_s3_bucket_lifecycle_configuration" "this" {
   depends_on = [aws_s3_bucket_versioning.this]
 
-  count  = var.s3_enabled && local.length_s3_lifecycle_rules > 0 ? 1 : 0
+  count  = var.s3_enabled && length(var.s3_lifecycle_rules) > 0 ? 1 : 0
   bucket = aws_s3_bucket.this[count.index].id
 
   dynamic "rule" {
     for_each = var.s3_lifecycle_rules
 
     content {
       id     = rule.value.id
-      status = lookup(rule.value, "status", "Enabled")
+      status = rule.value.status
       filter {
         prefix = rule.value.prefix
       }
 
       dynamic "expiration" {
-        for_each = length(keys(lookup(rule.value, "expiration", {}))) == 0 ? [] : [lookup(rule.value, "expiration", {})]
+        for_each = 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)
+          date                         = expiration.value.date
+          days                         = expiration.value.days
+          expired_object_delete_marker = expiration.value.expired_object_delete_marker
         }
       }
+
       dynamic "transition" {
-        for_each = lookup(rule.value, "transition", [])
+        for_each = rule.value.transition
         content {
-          date          = lookup(transition.value, "date", null)
-          days          = lookup(transition.value, "days", null)
+          date          = transition.value.date
+          days          = transition.value.days
           storage_class = transition.value.storage_class
         }
       }

diff --git a/variables.tf b/variables.tf
@@ -1137,7 +1137,21 @@ variable "s3_versioning_enabled" {
 variable "s3_lifecycle_rules" {
   description = "S3 Lifecycle rules"
   default     = []
-  type        = any
+  type = list(object({
+    id     = string
+    status = optional(string, "Enabled")
+    prefix = string
+    expiration = optional(list(object({
+      days                         = optional(number)
+      date                         = optional(string)
+      expired_object_delete_marker = optional(bool, true)
+    })), [])
+    transition = optional(list(object({
+      days          = optional(number)
+      date          = optional(string)
+      storage_class = string
+    })), [])
+  }))
 }
 
 # -------------------------------------------------------------------------------------------------

diff --git a/versions.tf b/versions.tf
@@ -13,5 +13,5 @@ terraform {
       version = "~> 3.0"
     }
   }
-  required_version = ">= 1.0"
+  required_version = ">= 1.3"
 }