upstream hashicorp/terraform-provider-google-beta#1766 (#3178) (#5782)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Feb 27, 2020 · 724e0e5 · 724e0e5
1 parent dcf9cfe
commit 724e0e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changelog/3178.txt b/.changelog/3178.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+container: Fixed panic when upgrading `google_container_cluster` with autoscaling block 
+```
diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go
@@ -2196,9 +2196,12 @@ func flattenMasterAuth(ma *containerBeta.MasterAuth) []map[string]interface{} {
 
 func flattenClusterAutoscaling(a *containerBeta.ClusterAutoscaling) []map[string]interface{} {
 	r := make(map[string]interface{})
-	if a == nil || !a.EnableNodeAutoprovisioning {
+	if a == nil {
 		r["enabled"] = false
-	} else {
+		return []map[string]interface{}{r}
+	}
+
+	if a.EnableNodeAutoprovisioning {
 		resourceLimits := make([]interface{}, 0, len(a.ResourceLimits))
 		for _, rl := range a.ResourceLimits {
 			resourceLimits = append(resourceLimits, map[string]interface{}{
@@ -2210,6 +2213,8 @@ func flattenClusterAutoscaling(a *containerBeta.ClusterAutoscaling) []map[string
 		r["resource_limits"] = resourceLimits
 		r["enabled"] = true
 		r["auto_provisioning_defaults"] = flattenAutoProvisioningDefaults(a.AutoprovisioningNodePoolDefaults)
+	} else {
+		r["enabled"] = false
 	}
 
 	return []map[string]interface{}{r}