tgc: fix diffs for container cluster (GoogleCloudPlatform#17488)

Author: zli82016

mmv1/products/container/Cluster.yaml

@@ -94,6 +94,12 @@ properties:
           type: 'String'
           description: 'The selected network policy provider.'
           is_missing_in_cai: true
+  - name: minMasterVersion
+    type: String
+    ignore_read: true
+  - name: nodeVersion
+    type: String
+    ignore_read: true
 tgc_tests:
   - name: TestAccContainerCluster_withDatabaseEncryption
     skip: Bug in the API, https://github.com/hashicorp/terraform-provider-google/issues/26882

mmv1/third_party/tgc_next/pkg/services/container/resource_container_cluster_cai2hcl.go

@@ -122,8 +122,6 @@ func (c *ContainerClusterCai2hclConverter) convertResourceData(asset caiasset.As
 			hclData["node_locations"] = locations
 		}
 	}
-	hclData["min_master_version"] = asset.Resource.Data["currentNodeVersion"]
-	hclData["node_version"] = asset.Resource.Data["currentNodeVersion"]
 	hclData["logging_service"] = asset.Resource.Data["loggingService"]
 	hclData["monitoring_service"] = asset.Resource.Data["monitoringService"]
 	hclData["node_config"] = flattenNodeConfig(asset.Resource.Data["nodeConfig"], nil)
@@ -1177,18 +1175,21 @@ func flattenClusterAutoscaling(v interface{}, enableAutopilot bool) []map[string
 		if !enableAutopilot {
 			transformed["enabled"] = true
 		}
-	} else if !enableAutopilot {
-		transformed["enabled"] = false
+		transformed["auto_provisioning_defaults"] = flattenAutoProvisioningDefaults(a["autoprovisioningNodePoolDefaults"])
+	}
+	if v := a["autoprovisioningLocations"]; v != nil {
+		transformed["auto_provisioning_locations"] = v
 	}
-	transformed["auto_provisioning_defaults"] = flattenAutoProvisioningDefaults(a["autoprovisioningNodePoolDefaults"])
-	transformed["auto_provisioning_locations"] = a["autoprovisioningLocations"]
 	if v := a["autoscalingProfile"]; v != nil && v != "BALANCED" {
 		transformed["autoscaling_profile"] = v
 	}
 	if dccc, ok := a["defaultComputeClassConfig"].(map[string]interface{}); ok {
 		transformed["default_compute_class_enabled"] = dccc["enabled"]
 	}
 
+	if len(transformed) == 0 {
+		return nil
+	}
 	return []map[string]interface{}{transformed}
 }