Use values(...) to fix glob expression

terraform-google-modules · Mar 31, 2022 · 3bb49ad · 3bb49ad
1 parent b61bc0b
commit 3bb49ad
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl
@@ -177,7 +177,7 @@ locals {
   cluster_name                               = local.cluster_output_name
   {% if autopilot_cluster != true %}
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   {% else %}
   // cluster ID is in the form project/location/name
   cluster_name_computed                      = element(split("/", local.cluster_id), length(split("/", local.cluster_id)) - 1)

diff --git a/main.tf b/main.tf
@@ -126,7 +126,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf
@@ -149,7 +149,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -149,7 +149,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-public-cluster-update-variant/main.tf b/modules/beta-public-cluster-update-variant/main.tf
@@ -148,7 +148,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -148,7 +148,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/private-cluster-update-variant/main.tf b/modules/private-cluster-update-variant/main.tf
@@ -127,7 +127,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf
@@ -127,7 +127,7 @@ locals {
 
   cluster_name = local.cluster_output_name
   // node pool ID is in the form project/location/cluster/name
-  cluster_name_computed                      = element(split("/", element(google_container_node_pool.pools[*].id, 0)), length(split("/", element(google_container_node_pool.pools[*].id, 0))) - 2)
+  cluster_name_computed                      = element(split("/", element(values(google_container_node_pool.pools)[*].id, 0)), length(split("/", element(values(google_container_node_pool.pools)[*].id, 0))) - 3)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version