chore: Simplify distribution policy zones in MIG modules (#324)

terraform-google-modules · Jul 18, 2023 · 31a9d8e · 31a9d8e
1 parent bd3526c
commit 31a9d8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -22,11 +22,7 @@ locals {
     google_compute_health_check.http.*.self_link,
     google_compute_health_check.tcp.*.self_link,
   )
-  distribution_policy_zones_base = {
-    default = data.google_compute_zones.available.names
-    user    = var.distribution_policy_zones
-  }
-  distribution_policy_zones    = local.distribution_policy_zones_base[length(var.distribution_policy_zones) == 0 ? "default" : "user"]
+  distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null
 }
 

diff --git a/modules/mig/main.tf b/modules/mig/main.tf
@@ -22,11 +22,7 @@ locals {
     google_compute_health_check.http.*.self_link,
     google_compute_health_check.tcp.*.self_link,
   )
-  distribution_policy_zones_base = {
-    default = data.google_compute_zones.available.names
-    user    = var.distribution_policy_zones
-  }
-  distribution_policy_zones    = local.distribution_policy_zones_base[length(var.distribution_policy_zones) == 0 ? "default" : "user"]
+  distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null
 }
 

diff --git a/modules/mig_with_percent/main.tf b/modules/mig_with_percent/main.tf
@@ -22,11 +22,7 @@ locals {
     google_compute_health_check.http.*.self_link,
     google_compute_health_check.tcp.*.self_link,
   )
-  distribution_policy_zones_base = {
-    default = data.google_compute_zones.available.names
-    user    = var.distribution_policy_zones
-  }
-  distribution_policy_zones    = local.distribution_policy_zones_base[length(var.distribution_policy_zones) == 0 ? "default" : "user"]
+  distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null
 }