initial fix (#11500)

GoogleCloudPlatform · Aug 23, 2024 · 723d418 · 723d418
1 parent bbf4d6c
commit 723d418
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/mmv1/third_party/terraform/services/container/go/node_config.go.tmpl b/mmv1/third_party/terraform/services/container/go/node_config.go.tmpl
@@ -1103,6 +1103,10 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 }
 
 func expandResourceManagerTags(v interface{}) *container.ResourceManagerTags {
+	if v == nil {
+		return nil
+	}
+
 	rmts := make(map[string]string)
 
 	if v != nil {
@@ -1442,6 +1446,10 @@ func flattenNodeConfig(c *container.NodeConfig, v interface{}) []map[string]inte
 }
 
 func flattenResourceManagerTags(c *container.ResourceManagerTags) map[string]interface{} {
+	if c == nil {
+		return nil
+	}
+
 	rmt := make(map[string]interface{})
 
 	if c != nil {

diff --git a/mmv1/third_party/terraform/services/container/go/resource_container_cluster.go.tmpl b/mmv1/third_party/terraform/services/container/go/resource_container_cluster.go.tmpl
@@ -5667,10 +5667,11 @@ func flattenNodePoolDefaults(c *container.NodePoolDefaults) []map[string]interfa
 }
 
 func expandNodePoolAutoConfig(configured interface{}) *container.NodePoolAutoConfig {
-	l := configured.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	l, ok := configured.([]interface{})
+	if !ok || l == nil || len(l) == 0 || l[0] == nil {
 		return nil
 	}
+
 	npac := &container.NodePoolAutoConfig{}
 	config := l[0].(map[string]interface{})
 

diff --git a/mmv1/third_party/terraform/services/container/node_config.go.erb b/mmv1/third_party/terraform/services/container/node_config.go.erb
@@ -1099,6 +1099,10 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 }
 
 func expandResourceManagerTags(v interface{}) *container.ResourceManagerTags {
+	if v == nil {
+		return nil
+	}
+
 	rmts := make(map[string]string)
 
 	if v != nil {
@@ -1438,6 +1442,10 @@ func flattenNodeConfig(c *container.NodeConfig, v interface{}) []map[string]inte
 }
 
 func flattenResourceManagerTags(c *container.ResourceManagerTags) map[string]interface{} {
+	if c == nil {
+		return nil
+	}
+
 	rmt := make(map[string]interface{})
 
 	if c != nil {

diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster.go.erb b/mmv1/third_party/terraform/services/container/resource_container_cluster.go.erb
@@ -5664,10 +5664,11 @@ func flattenNodePoolDefaults(c *container.NodePoolDefaults) []map[string]interfa
 }
 
 func expandNodePoolAutoConfig(configured interface{}) *container.NodePoolAutoConfig {
-	l := configured.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	l, ok := configured.([]interface{})
+	if !ok || l == nil || len(l) == 0 || l[0] == nil {
 		return nil
 	}
+
 	npac := &container.NodePoolAutoConfig{}
 	config := l[0].(map[string]interface{})