Merge pull request GoogleCloudPlatform#139 from modular-magician/code…

…gen-pr-920

Ignore empty json objects inside arrays

google-beta/resource_binaryauthorization_attestor.go

@@ -259,6 +259,9 @@ func flattenBinaryAuthorizationAttestorAttestationAuthorityNote(v interface{}) i
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["note_reference"] =
 		flattenBinaryAuthorizationAttestorAttestationAuthorityNoteNoteReference(original["noteReference"])
@@ -280,6 +283,10 @@ func flattenBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeys(v inte
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"comment":                      flattenBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeysComment(original["comment"]),
 			"id":                           flattenBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeysId(original["id"]),

google-beta/resource_binaryauthorization_policy.go

@@ -332,6 +332,10 @@ func flattenBinaryAuthorizationPolicyAdmissionWhitelistPatterns(v interface{}) i
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"name_pattern": flattenBinaryAuthorizationPolicyAdmissionWhitelistPatternsNamePattern(original["namePattern"]),
 		})
@@ -379,6 +383,9 @@ func flattenBinaryAuthorizationPolicyDefaultAdmissionRule(v interface{}) interfa
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["evaluation_mode"] =
 		flattenBinaryAuthorizationPolicyDefaultAdmissionRuleEvaluationMode(original["evaluationMode"])

google-beta/resource_compute_autoscaler.go

@@ -417,6 +417,9 @@ func flattenComputeAutoscalerAutoscalingPolicy(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["min_replicas"] =
 		flattenComputeAutoscalerAutoscalingPolicyMinReplicas(original["minNumReplicas"])
@@ -467,6 +470,9 @@ func flattenComputeAutoscalerAutoscalingPolicyCpuUtilization(v interface{}) inte
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["target"] =
 		flattenComputeAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["utilizationTarget"])
@@ -484,6 +490,10 @@ func flattenComputeAutoscalerAutoscalingPolicyMetric(v interface{}) interface{}
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"name":   flattenComputeAutoscalerAutoscalingPolicyMetricName(original["metric"]),
 			"target": flattenComputeAutoscalerAutoscalingPolicyMetricTarget(original["utilizationTarget"]),
@@ -514,6 +524,9 @@ func flattenComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interfa
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["target"] =
 		flattenComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["utilizationTarget"])

google-beta/resource_compute_disk.go

@@ -931,6 +931,9 @@ func flattenComputeDiskSourceImageEncryptionKey(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["raw_key"] =
 		flattenComputeDiskSourceImageEncryptionKeyRawKey(original["rawKey"])
@@ -961,6 +964,9 @@ func flattenComputeDiskDiskEncryptionKey(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["raw_key"] =
 		flattenComputeDiskDiskEncryptionKeyRawKey(original["rawKey"])
@@ -994,6 +1000,9 @@ func flattenComputeDiskSourceSnapshotEncryptionKey(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["raw_key"] =
 		flattenComputeDiskSourceSnapshotEncryptionKeyRawKey(original["rawKey"])

google-beta/resource_compute_firewall.go

@@ -612,6 +612,10 @@ func flattenComputeFirewallAllow(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"protocol": flattenComputeFirewallAllowProtocol(original["IPProtocol"]),
 			"ports":    flattenComputeFirewallAllowPorts(original["ports"]),
@@ -639,6 +643,10 @@ func flattenComputeFirewallDeny(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"protocol": flattenComputeFirewallDenyProtocol(original["IPProtocol"]),
 			"ports":    flattenComputeFirewallDenyPorts(original["ports"]),

google-beta/resource_compute_health_check.go

@@ -601,6 +601,9 @@ func flattenComputeHealthCheckHttpHealthCheck(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["host"] =
 		flattenComputeHealthCheckHttpHealthCheckHost(original["host"])
@@ -639,6 +642,9 @@ func flattenComputeHealthCheckHttpsHealthCheck(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["host"] =
 		flattenComputeHealthCheckHttpsHealthCheckHost(original["host"])
@@ -677,6 +683,9 @@ func flattenComputeHealthCheckTcpHealthCheck(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["request"] =
 		flattenComputeHealthCheckTcpHealthCheckRequest(original["request"])
@@ -715,6 +724,9 @@ func flattenComputeHealthCheckSslHealthCheck(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["request"] =
 		flattenComputeHealthCheckSslHealthCheckRequest(original["request"])

google-beta/resource_compute_interconnect_attachment.go

@@ -321,6 +321,9 @@ func flattenComputeInterconnectAttachmentPrivateInterconnectInfo(v interface{})
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["tag8021q"] =
 		flattenComputeInterconnectAttachmentPrivateInterconnectInfoTag8021q(original["tag8021q"])

google-beta/resource_compute_region_autoscaler.go

@@ -416,6 +416,9 @@ func flattenComputeRegionAutoscalerAutoscalingPolicy(v interface{}) interface{}
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["min_replicas"] =
 		flattenComputeRegionAutoscalerAutoscalingPolicyMinReplicas(original["minNumReplicas"])
@@ -466,6 +469,9 @@ func flattenComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(v interface{}
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["target"] =
 		flattenComputeRegionAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["utilizationTarget"])
@@ -483,6 +489,10 @@ func flattenComputeRegionAutoscalerAutoscalingPolicyMetric(v interface{}) interf
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"name":   flattenComputeRegionAutoscalerAutoscalingPolicyMetricName(original["metric"]),
 			"target": flattenComputeRegionAutoscalerAutoscalingPolicyMetricTarget(original["utilizationTarget"]),
@@ -513,6 +523,9 @@ func flattenComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(v i
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["target"] =
 		flattenComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["utilizationTarget"])

google-beta/resource_compute_region_disk.go

@@ -653,6 +653,9 @@ func flattenComputeRegionDiskDiskEncryptionKey(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["raw_key"] =
 		flattenComputeRegionDiskDiskEncryptionKeyRawKey(original["rawKey"])
@@ -686,6 +689,9 @@ func flattenComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}) interfac
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["raw_key"] =
 		flattenComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["rawKey"])

google-beta/resource_compute_router.go

@@ -396,6 +396,9 @@ func flattenComputeRouterBgp(v interface{}) interface{} {
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["asn"] =
 		flattenComputeRouterBgpAsn(original["asn"])
@@ -433,6 +436,10 @@ func flattenComputeRouterBgpAdvertisedIpRanges(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"range":       flattenComputeRouterBgpAdvertisedIpRangesRange(original["range"]),
 			"description": flattenComputeRouterBgpAdvertisedIpRangesDescription(original["description"]),

google-beta/resource_compute_subnetwork.go

@@ -595,6 +595,10 @@ func flattenComputeSubnetworkSecondaryIpRange(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"range_name":    flattenComputeSubnetworkSecondaryIpRangeRangeName(original["rangeName"]),
 			"ip_cidr_range": flattenComputeSubnetworkSecondaryIpRangeIpCidrRange(original["ipCidrRange"]),

google-beta/resource_compute_url_map.go

@@ -473,6 +473,10 @@ func flattenComputeUrlMapHost_rule(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"description":  flattenComputeUrlMapHost_ruleDescription(original["description"]),
 			"hosts":        flattenComputeUrlMapHost_ruleHosts(original["hosts"]),
@@ -522,6 +526,10 @@ func flattenComputeUrlMapPath_matcher(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"default_service": flattenComputeUrlMapPath_matcherDefaultService(original["defaultService"]),
 			"description":     flattenComputeUrlMapPath_matcherDescription(original["description"]),
@@ -554,6 +562,10 @@ func flattenComputeUrlMapPath_matcherPath_rule(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"paths":   flattenComputeUrlMapPath_matcherPath_rulePaths(original["paths"]),
 			"service": flattenComputeUrlMapPath_matcherPath_ruleService(original["service"]),
@@ -583,6 +595,10 @@ func flattenComputeUrlMapTest(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"description": flattenComputeUrlMapTestDescription(original["description"]),
 			"host":        flattenComputeUrlMapTestHost(original["host"]),

google-beta/resource_containeranalysis_note.go

@@ -223,6 +223,9 @@ func flattenContainerAnalysisNoteAttestationAuthority(v interface{}) interface{}
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["hint"] =
 		flattenContainerAnalysisNoteAttestationAuthorityHint(original["hint"])
@@ -233,6 +236,9 @@ func flattenContainerAnalysisNoteAttestationAuthorityHint(v interface{}) interfa
 		return nil
 	}
 	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
 	transformed := make(map[string]interface{})
 	transformed["human_readable_name"] =
 		flattenContainerAnalysisNoteAttestationAuthorityHintHumanReadableName(original["humanReadableName"])

google-beta/resource_filestore_instance.go

@@ -423,6 +423,10 @@ func flattenFilestoreInstanceFileShares(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"name":        flattenFilestoreInstanceFileSharesName(original["name"]),
 			"capacity_gb": flattenFilestoreInstanceFileSharesCapacityGb(original["capacityGb"]),
@@ -452,6 +456,10 @@ func flattenFilestoreInstanceNetworks(v interface{}) interface{} {
 	transformed := make([]interface{}, 0, len(l))
 	for _, raw := range l {
 		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
 		transformed = append(transformed, map[string]interface{}{
 			"network":           flattenFilestoreInstanceNetworksNetwork(original["network"]),
 			"modes":             flattenFilestoreInstanceNetworksModes(original["modes"]),