fix: no gcfs block when enable_gcfs null (#2093)

apeabody · web-flow · commit f4c1af2a544a · 2024-09-13T11:37:53.000-05:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -516,7 +516,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/cluster.tf b/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
+        for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []
         content {
           enabled = gcfs_config.value
         }

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ resource "google_container_cluster" "primary" {`
`516`	`516`	`min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
`517`	`517`	`enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)`
`518`	`518`	`dynamic "gcfs_config" {`
`519`		`- for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]`
	`519`	`+ for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []`
`520`	`520`	`content {`
`521`	`521`	`enabled = gcfs_config.value`
`522`	`522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {`
`393`	`393`	`min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
`394`	`394`	`enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)`
`395`	`395`	`dynamic "gcfs_config" {`
`396`		`- for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]`
	`396`	`+ for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []`
`397`	`397`	`content {`
`398`	`398`	`enabled = gcfs_config.value`
`399`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {`
`439`	`439`	`min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")`
`440`	`440`	`enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)`
`441`	`441`	`dynamic "gcfs_config" {`
`442`		`- for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]`
	`442`	`+ for_each = lookup(var.node_pools[0], "enable_gcfs", null) != null ? [var.node_pools[0]] : []`
`443`	`443`	`content {`
`444`	`444`	`enabled = gcfs_config.value`
`445`	`445`	`}`