feat(google_container_node_pool): Handle nil mode in secondary boot disk. (#10854) (#18323)

[upstream:042ce9a6893952685b18d666959ab533d0763420]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/services/container/node_config.go

@@ -830,11 +830,25 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 	}
 
 	if v, ok := nodeConfig["secondary_boot_disks"]; ok && len(v.([]interface{})) > 0 {
-		conf := v.([]interface{})[0].(map[string]interface{})
-		nc.SecondaryBootDisks = append(nc.SecondaryBootDisks, &container.SecondaryBootDisk{
-			DiskImage: conf["disk_image"].(string),
-			Mode:      conf["mode"].(string),
-		})
+		conf, confOK := v.([]interface{})[0].(map[string]interface{})
+		if confOK {
+			modeValue, modeOK := conf["mode"]
+			diskImage := conf["disk_image"].(string)
+			if modeOK {
+				nc.SecondaryBootDisks = append(nc.SecondaryBootDisks, &container.SecondaryBootDisk{
+					DiskImage: diskImage,
+					Mode:      modeValue.(string),
+				})
+			} else {
+				nc.SecondaryBootDisks = append(nc.SecondaryBootDisks, &container.SecondaryBootDisk{
+					DiskImage: diskImage,
+				})
+			}
+		} else {
+			nc.SecondaryBootDisks = append(nc.SecondaryBootDisks, &container.SecondaryBootDisk{
+				DiskImage: "",
+			})
+		}
 	}
 
 	if v, ok := nodeConfig["gcfs_config"]; ok && len(v.([]interface{})) > 0 {

google/services/container/resource_container_node_pool_test.go

@@ -1516,6 +1516,11 @@ func TestAccContainerNodePool_secondaryBootDisks(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				ResourceName:      "google_container_node_pool.np-no-mode",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -1550,7 +1555,25 @@ resource "google_container_node_pool" "np" {
     }
   }
 }
-`, cluster, networkName, subnetworkName, np)
+
+resource "google_container_node_pool" "np-no-mode" {
+  name               = "%s-no-mode"
+  location           = "us-central1-a"
+  cluster            = google_container_cluster.cluster.name
+  initial_node_count = 1
+
+  node_config {
+    machine_type = "n1-standard-8"
+    image_type = "COS_CONTAINERD"
+	gcfs_config {
+  		enabled = true
+	}
+    secondary_boot_disks {
+      disk_image = ""
+    }
+  }
+}
+`, cluster, networkName, subnetworkName, np, np)
 }
 
 func TestAccContainerNodePool_gcfsConfig(t *testing.T) {