update timeouts make consistent

terraform-aws-modules · Nov 8, 2021 · e362bf8 · e362bf8
1 parent acc6835
commit e362bf8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/locals.tf b/locals.tf
@@ -117,7 +117,6 @@ locals {
     instance_refresh_instance_warmup         = null                                                 # The number of seconds until a newly launched instance is configured and ready to use. Defaults to the ASG's health check grace period.
     instance_refresh_triggers                = []                                                   # Set of additional property names that will trigger an Instance Refresh. A refresh will always be triggered by a change in any of launch_configuration, launch_template, or mixed_instances_policy.
     capacity_rebalance                       = false                                                # Enable capacity rebalance
-    asg_delete_timeout                       = null                                                 # Enable setting the timeouts for autoscaling groups delete operation
   }
 
   workers_group_defaults = merge(

diff --git a/workers.tf b/workers.tf
@@ -104,11 +104,7 @@ resource "aws_autoscaling_group" "workers" {
     local.workers_group_defaults["capacity_rebalance"]
   )
   timeouts {
-    delete = lookup(
-      var.worker_groups[count.index],
-      "delete_timeout",
-      local.workers_group_defaults["asg_delete_timeout"]
-    )
+    delete = lookup(each.value["timeouts"], "delete", null)
   }
 
   dynamic "initial_lifecycle_hook" {

diff --git a/workers_launch_template.tf b/workers_launch_template.tf
@@ -103,11 +103,7 @@ resource "aws_autoscaling_group" "workers_launch_template" {
     local.workers_group_defaults["capacity_rebalance"]
   )
   timeouts {
-    delete = lookup(
-      var.worker_groups_launch_template[count.index],
-      "delete_timeout",
-      local.workers_group_defaults["asg_delete_timeout"]
-    )
+    delete = lookup(each.value["timeouts"], "delete", null)
   }
 
   dynamic "mixed_instances_policy" {