Skip to content

Commit 1bac728

Browse files
yorikyorik
committed
Fix type error if secondary_boot_disks is missing
1 parent d334336 commit 1bac728

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ resource "google_container_node_pool" "windows_pools" {
857857
}
858858

859859
dynamic "secondary_boot_disks" {
860-
for_each = lookup(each.value, "secondary_boot_disks", [])
860+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
861861
content {
862862
disk_image = secondary_boot_disks.value.disk_image
863863
mode = secondary_boot_disks.value.mode

‎cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ resource "google_container_node_pool" "pools" {
575575
}
576576

577577
dynamic "secondary_boot_disks" {
578-
for_each = lookup(each.value, "secondary_boot_disks", [])
578+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
579579
content {
580580
disk_image = secondary_boot_disks.value.disk_image
581581
mode = secondary_boot_disks.value.mode
@@ -799,7 +799,7 @@ resource "google_container_node_pool" "windows_pools" {
799799
}
800800

801801
dynamic "secondary_boot_disks" {
802-
for_each = lookup(each.value, "secondary_boot_disks", [])
802+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
803803
content {
804804
disk_image = secondary_boot_disks.value.disk_image
805805
mode = secondary_boot_disks.value.mode

‎modules/beta-private-cluster-update-variant/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ resource "google_container_node_pool" "pools" {
741741
}
742742

743743
dynamic "secondary_boot_disks" {
744-
for_each = lookup(each.value, "secondary_boot_disks", [])
744+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
745745
content {
746746
disk_image = secondary_boot_disks.value.disk_image
747747
mode = secondary_boot_disks.value.mode
@@ -991,7 +991,7 @@ resource "google_container_node_pool" "windows_pools" {
991991
}
992992

993993
dynamic "secondary_boot_disks" {
994-
for_each = lookup(each.value, "secondary_boot_disks", [])
994+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
995995
content {
996996
disk_image = secondary_boot_disks.value.disk_image
997997
mode = secondary_boot_disks.value.mode

‎modules/beta-private-cluster/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ resource "google_container_node_pool" "pools" {
666666
}
667667

668668
dynamic "secondary_boot_disks" {
669-
for_each = lookup(each.value, "secondary_boot_disks", [])
669+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
670670
content {
671671
disk_image = secondary_boot_disks.value.disk_image
672672
mode = secondary_boot_disks.value.mode
@@ -915,7 +915,7 @@ resource "google_container_node_pool" "windows_pools" {
915915
}
916916

917917
dynamic "secondary_boot_disks" {
918-
for_each = lookup(each.value, "secondary_boot_disks", [])
918+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
919919
content {
920920
disk_image = secondary_boot_disks.value.disk_image
921921
mode = secondary_boot_disks.value.mode

‎modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ resource "google_container_node_pool" "pools" {
722722
}
723723

724724
dynamic "secondary_boot_disks" {
725-
for_each = lookup(each.value, "secondary_boot_disks", [])
725+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
726726
content {
727727
disk_image = secondary_boot_disks.value.disk_image
728728
mode = secondary_boot_disks.value.mode
@@ -972,7 +972,7 @@ resource "google_container_node_pool" "windows_pools" {
972972
}
973973

974974
dynamic "secondary_boot_disks" {
975-
for_each = lookup(each.value, "secondary_boot_disks", [])
975+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
976976
content {
977977
disk_image = secondary_boot_disks.value.disk_image
978978
mode = secondary_boot_disks.value.mode

‎modules/beta-public-cluster/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ resource "google_container_node_pool" "pools" {
647647
}
648648

649649
dynamic "secondary_boot_disks" {
650-
for_each = lookup(each.value, "secondary_boot_disks", [])
650+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
651651
content {
652652
disk_image = secondary_boot_disks.value.disk_image
653653
mode = secondary_boot_disks.value.mode
@@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_pools" {
896896
}
897897

898898
dynamic "secondary_boot_disks" {
899-
for_each = lookup(each.value, "secondary_boot_disks", [])
899+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
900900
content {
901901
disk_image = secondary_boot_disks.value.disk_image
902902
mode = secondary_boot_disks.value.mode

‎modules/private-cluster-update-variant/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ resource "google_container_node_pool" "pools" {
669669
}
670670

671671
dynamic "secondary_boot_disks" {
672-
for_each = lookup(each.value, "secondary_boot_disks", [])
672+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
673673
content {
674674
disk_image = secondary_boot_disks.value.disk_image
675675
mode = secondary_boot_disks.value.mode
@@ -894,7 +894,7 @@ resource "google_container_node_pool" "windows_pools" {
894894
}
895895

896896
dynamic "secondary_boot_disks" {
897-
for_each = lookup(each.value, "secondary_boot_disks", [])
897+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
898898
content {
899899
disk_image = secondary_boot_disks.value.disk_image
900900
mode = secondary_boot_disks.value.mode

‎modules/private-cluster/cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ resource "google_container_node_pool" "pools" {
594594
}
595595

596596
dynamic "secondary_boot_disks" {
597-
for_each = lookup(each.value, "secondary_boot_disks", [])
597+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
598598
content {
599599
disk_image = secondary_boot_disks.value.disk_image
600600
mode = secondary_boot_disks.value.mode
@@ -818,7 +818,7 @@ resource "google_container_node_pool" "windows_pools" {
818818
}
819819

820820
dynamic "secondary_boot_disks" {
821-
for_each = lookup(each.value, "secondary_boot_disks", [])
821+
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
822822
content {
823823
disk_image = secondary_boot_disks.value.disk_image
824824
mode = secondary_boot_disks.value.mode

0 commit comments

Comments
 (0)