add trimspace

terraform-google-modules · Aug 25, 2024 · a1d17dc · a1d17dc
1 parent ba4ddf8
commit a1d17dc
Show file tree

Hide file tree

Showing 9 changed files with 359 additions and 47 deletions.
diff --git a/README.md b/README.md
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -776,7 +776,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(
@@ -1072,7 +1072,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -694,7 +694,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(
@@ -989,7 +989,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -755,7 +755,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(
@@ -1051,7 +1051,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -673,7 +673,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(
@@ -968,7 +968,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -712,7 +712,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(
@@ -995,7 +995,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = lookup(reservation_affinity.value, "queued_provisioning", false) ? "NO_RESERVATION" : lookup(reservation_affinity.value, "consume_reservation_type", null)
         key                      = lookup(reservation_affinity.value, "reservation_affinity_key", null)
-        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null))
+        values                   = lookup(reservation_affinity.value, "reservation_affinity_values", null) == null ? null : [for s in split(",", lookup(reservation_affinity.value, "reservation_affinity_values", null)) : trimspace(s)]
       }
     }
     labels = merge(