Update to aws provider to v4.0+ (#23)

Flaconi · Apr 21, 2022 · dbadd04 · dbadd04
1 parent 11f5539
commit dbadd04
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ module "aws_vault" {
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
 | <a name="provider_template"></a> [template](#provider\_template) | n/a |
 
 <!-- TFDOCS_PROVIDER_END -->
@@ -56,7 +56,7 @@ module "aws_vault" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
 
 <!-- TFDOCS_REQUIREMENTS_END -->
 

diff --git a/modules/consul-cluster/README.md b/modules/consul-cluster/README.md
@@ -17,13 +17,13 @@ rules.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
 | <a name="provider_null"></a> [null](#provider\_null) | n/a |
 
 ## Modules

diff --git a/modules/consul-cluster/locals.tf b/modules/consul-cluster/locals.tf
@@ -8,6 +8,6 @@ resource "null_resource" "tags_as_list_of_maps" {
   triggers = {
     "key"                 = element(keys(var.tags), count.index)
     "value"               = element(values(var.tags), count.index)
-    "propagate_at_launch" = "true"
+    "propagate_at_launch" = true
   }
 }
diff --git a/modules/consul-cluster/main.tf b/modules/consul-cluster/main.tf
@@ -14,21 +14,28 @@ resource "aws_autoscaling_group" "autoscaling_group" {
   health_check_grace_period = var.health_check_grace_period
   wait_for_capacity_timeout = var.wait_for_capacity_timeout
 
-  tags = concat(
-    [
-      {
-        "key"                 = "Name"
-        "value"               = var.cluster_name
-        "propagate_at_launch" = true
-      },
-      {
-        "key"                 = var.cluster_tag_key
-        "value"               = var.cluster_tag_value
-        "propagate_at_launch" = true
-      }
-    ],
-    local.tags_asg_format,
-  )
+  dynamic "tag" {
+    for_each = concat(
+      [
+        {
+          key                 = "Name"
+          value               = var.cluster_name
+          propagate_at_launch = true
+        },
+        {
+          key                 = var.cluster_tag_key
+          value               = var.cluster_tag_value
+          propagate_at_launch = true
+        }
+      ],
+      local.tags_asg_format,
+    )
+    content {
+      key                 = tag.value["key"]
+      value               = tag.value["value"]
+      propagate_at_launch = tag.value["propagate_at_launch"]
+    }
+  }
 
   lifecycle {
     ignore_changes = [

diff --git a/modules/consul-cluster/versions.tf b/modules/consul-cluster/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3"
+      version = ">= 4"
     }
   }
   required_version = ">= 0.13"

diff --git a/modules/vault-cluster/README.md b/modules/vault-cluster/README.md
@@ -37,13 +37,13 @@ machines.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4 |
 | <a name="provider_null"></a> [null](#provider\_null) | n/a |
 
 ## Modules

diff --git a/modules/vault-cluster/locals.tf b/modules/vault-cluster/locals.tf
@@ -8,6 +8,6 @@ resource "null_resource" "tags_as_list_of_maps" {
   triggers = {
     "key"                 = element(keys(var.tags), count.index)
     "value"               = element(values(var.tags), count.index)
-    "propagate_at_launch" = "true"
+    "propagate_at_launch" = true
   }
 }
diff --git a/modules/vault-cluster/main.tf b/modules/vault-cluster/main.tf
@@ -14,16 +14,23 @@ resource "aws_autoscaling_group" "autoscaling_group" {
   health_check_grace_period = var.health_check_grace_period
   wait_for_capacity_timeout = var.wait_for_capacity_timeout
 
-  tags = concat(
-    [
-      {
-        "key"                 = "Name"
-        "value"               = var.cluster_name
-        "propagate_at_launch" = true
-      }
-    ],
-    local.tags_asg_format,
-  )
+  dynamic "tag" {
+    for_each = concat(
+      [
+        {
+          key                 = "Name"
+          value               = var.cluster_name
+          propagate_at_launch = true
+        }
+      ],
+      local.tags_asg_format,
+    )
+    content {
+      key                 = tag.value["key"]
+      value               = tag.value["value"]
+      propagate_at_launch = tag.value["propagate_at_launch"]
+    }
+  }
 
   lifecycle {
     ignore_changes = [

diff --git a/modules/vault-cluster/versions.tf b/modules/vault-cluster/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3"
+      version = ">= 4"
     }
   }
   required_version = ">= 0.13"

diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3"
+      version = ">= 4"
     }
   }
   required_version = ">= 0.13"