From c7c9544632397e17a53fbe524d1e95b87b9acc95 Mon Sep 17 00:00:00 2001
From: emily <emilyye@google.com>
Date: Wed, 26 Feb 2020 19:43:00 -0800
Subject: [PATCH] upstream
 https://github.com/terraform-providers/terraform-provider-google-beta/pull/1766
 (#3178)

---
 .../resources/resource_container_cluster.go.erb          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb
index 14451117ad5d..e68161710293 100644
--- a/third_party/terraform/resources/resource_container_cluster.go.erb
+++ b/third_party/terraform/resources/resource_container_cluster.go.erb
@@ -2790,9 +2790,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{}{
@@ -2804,6 +2807,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
 	}
 	<% unless version == 'ga' -%>
 	r["autoscaling_profile"] = a.AutoscalingProfile