Fix: correct confidential node field name (#2140)

redoak666 · web-flow · commit 373c96954af9 · 2024-10-16T17:10:55.000-07:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -1094,7 +1094,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/cluster.tf b/cluster.tf
@@ -782,7 +782,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1058,7 +1058,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -959,7 +959,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1249,7 +1249,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -874,7 +874,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1163,7 +1163,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -938,7 +938,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1228,7 +1228,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -853,7 +853,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1142,7 +1142,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -887,7 +887,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1164,7 +1164,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -803,7 +803,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }
@@ -1079,7 +1079,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "confidential_nodes" {
-      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
+      for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []
       content {
         enabled = confidential_nodes.value
       }

Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`	`1096`	`dynamic "confidential_nodes" {`
`1097`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1097`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1098`	`1098`	`content {`
`1099`	`1099`	`enabled = confidential_nodes.value`
`1100`	`1100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ resource "google_container_node_pool" "pools" {`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`dynamic "confidential_nodes" {`
`785`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`785`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`786`	`786`	`content {`
`787`	`787`	`enabled = confidential_nodes.value`
`788`	`788`	`}`
`@@ -1058,7 +1058,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1058`	`1058`	`}`
`1059`	`1059`
`1060`	`1060`	`dynamic "confidential_nodes" {`
`1061`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1061`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1062`	`1062`	`content {`
`1063`	`1063`	`enabled = confidential_nodes.value`
`1064`	`1064`	`}`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ resource "google_container_node_pool" "pools" {`
`959`	`959`	`}`
`960`	`960`
`961`	`961`	`dynamic "confidential_nodes" {`
`962`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`962`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`963`	`963`	`content {`
`964`	`964`	`enabled = confidential_nodes.value`
`965`	`965`	`}`
`@@ -1249,7 +1249,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1249`	`1249`	`}`
`1250`	`1250`
`1251`	`1251`	`dynamic "confidential_nodes" {`
`1252`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1252`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1253`	`1253`	`content {`
`1254`	`1254`	`enabled = confidential_nodes.value`
`1255`	`1255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -874,7 +874,7 @@ resource "google_container_node_pool" "pools" {`
`874`	`874`	`}`
`875`	`875`
`876`	`876`	`dynamic "confidential_nodes" {`
`877`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`877`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`878`	`878`	`content {`
`879`	`879`	`enabled = confidential_nodes.value`
`880`	`880`	`}`
`@@ -1163,7 +1163,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`	`1165`	`dynamic "confidential_nodes" {`
`1166`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1166`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1167`	`1167`	`content {`
`1168`	`1168`	`enabled = confidential_nodes.value`
`1169`	`1169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ resource "google_container_node_pool" "pools" {`
`938`	`938`	`}`
`939`	`939`
`940`	`940`	`dynamic "confidential_nodes" {`
`941`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`941`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`942`	`942`	`content {`
`943`	`943`	`enabled = confidential_nodes.value`
`944`	`944`	`}`
`@@ -1228,7 +1228,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1228`	`1228`	`}`
`1229`	`1229`
`1230`	`1230`	`dynamic "confidential_nodes" {`
`1231`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1231`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1232`	`1232`	`content {`
`1233`	`1233`	`enabled = confidential_nodes.value`
`1234`	`1234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ resource "google_container_node_pool" "pools" {`
`853`	`853`	`}`
`854`	`854`
`855`	`855`	`dynamic "confidential_nodes" {`
`856`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`856`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`857`	`857`	`content {`
`858`	`858`	`enabled = confidential_nodes.value`
`859`	`859`	`}`
`@@ -1142,7 +1142,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`	`1144`	`dynamic "confidential_nodes" {`
`1145`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1145`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1146`	`1146`	`content {`
`1147`	`1147`	`enabled = confidential_nodes.value`
`1148`	`1148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ resource "google_container_node_pool" "pools" {`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`dynamic "confidential_nodes" {`
`890`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`890`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`891`	`891`	`content {`
`892`	`892`	`enabled = confidential_nodes.value`
`893`	`893`	`}`
`@@ -1164,7 +1164,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1164`	`1164`	`}`
`1165`	`1165`
`1166`	`1166`	`dynamic "confidential_nodes" {`
`1167`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1167`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1168`	`1168`	`content {`
`1169`	`1169`	`enabled = confidential_nodes.value`
`1170`	`1170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ resource "google_container_node_pool" "pools" {`
`803`	`803`	`}`
`804`	`804`
`805`	`805`	`dynamic "confidential_nodes" {`
`806`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`806`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`807`	`807`	`content {`
`808`	`808`	`enabled = confidential_nodes.value`
`809`	`809`	`}`
`@@ -1079,7 +1079,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`	`1081`	`dynamic "confidential_nodes" {`
`1082`		`- for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []`
	`1082`	`+ for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : []`
`1083`	`1083`	`content {`
`1084`	`1084`	`enabled = confidential_nodes.value`
`1085`	`1085`	`}`