diff --git a/google/resource_compute_autoscaler.go b/google/resource_compute_autoscaler.go index dac6dddb..eb607e32 100644 --- a/google/resource_compute_autoscaler.go +++ b/google/resource_compute_autoscaler.go @@ -413,6 +413,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"]) @@ -463,6 +466,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"]) @@ -480,6 +486,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"]), @@ -505,6 +515,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"]) diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go index abf25a33..f9ec7987 100644 --- a/google/resource_compute_disk.go +++ b/google/resource_compute_disk.go @@ -913,6 +913,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"]) @@ -937,6 +940,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"]) @@ -964,6 +970,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"]) diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go index 61367ad9..faa41ffc 100644 --- a/google/resource_compute_firewall.go +++ b/google/resource_compute_firewall.go @@ -593,6 +593,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"]), @@ -620,6 +624,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"]), diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go index ff62218f..c7f4c227 100644 --- a/google/resource_compute_health_check.go +++ b/google/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"]) diff --git a/google/resource_compute_interconnect_attachment.go b/google/resource_compute_interconnect_attachment.go index 09edbff9..2a624891 100644 --- a/google/resource_compute_interconnect_attachment.go +++ b/google/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"]) diff --git a/google/resource_compute_region_autoscaler.go b/google/resource_compute_region_autoscaler.go index 4be06005..4d3e64ff 100644 --- a/google/resource_compute_region_autoscaler.go +++ b/google/resource_compute_region_autoscaler.go @@ -412,6 +412,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"]) @@ -462,6 +465,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"]) @@ -479,6 +485,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"]), @@ -504,6 +514,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"]) diff --git a/google/resource_compute_region_disk.go b/google/resource_compute_region_disk.go index aba872a6..a0f08b86 100644 --- a/google/resource_compute_region_disk.go +++ b/google/resource_compute_region_disk.go @@ -642,6 +642,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"]) @@ -669,6 +672,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"]) diff --git a/google/resource_compute_router.go b/google/resource_compute_router.go index ca465bfe..2ae6c69c 100644 --- a/google/resource_compute_router.go +++ b/google/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"]), diff --git a/google/resource_compute_subnetwork.go b/google/resource_compute_subnetwork.go index da1bb8a0..0b4416f2 100644 --- a/google/resource_compute_subnetwork.go +++ b/google/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"]), diff --git a/google/resource_compute_url_map.go b/google/resource_compute_url_map.go index 97047e07..8bb635b0 100644 --- a/google/resource_compute_url_map.go +++ b/google/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"]), diff --git a/google/resource_monitoring_alert_policy.go b/google/resource_monitoring_alert_policy.go index b0cf883d..4ebe8d9a 100644 --- a/google/resource_monitoring_alert_policy.go +++ b/google/resource_monitoring_alert_policy.go @@ -555,6 +555,9 @@ func flattenMonitoringAlertPolicyCreationRecord(v interface{}) interface{} { return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["mutate_time"] = flattenMonitoringAlertPolicyCreationRecordMutateTime(original["mutateTime"]) @@ -582,6 +585,10 @@ func flattenMonitoringAlertPolicyConditions(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{}{ "condition_absent": flattenMonitoringAlertPolicyConditionsConditionAbsent(original["conditionAbsent"]), "name": flattenMonitoringAlertPolicyConditionsName(original["name"]), @@ -596,6 +603,9 @@ func flattenMonitoringAlertPolicyConditionsConditionAbsent(v interface{}) interf return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["aggregations"] = flattenMonitoringAlertPolicyConditionsConditionAbsentAggregations(original["aggregations"]) @@ -615,6 +625,10 @@ func flattenMonitoringAlertPolicyConditionsConditionAbsentAggregations(v interfa 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{}{ "per_series_aligner": flattenMonitoringAlertPolicyConditionsConditionAbsentAggregationsPerSeriesAligner(original["perSeriesAligner"]), "group_by_fields": flattenMonitoringAlertPolicyConditionsConditionAbsentAggregationsGroupByFields(original["groupByFields"]), @@ -645,6 +659,9 @@ func flattenMonitoringAlertPolicyConditionsConditionAbsentTrigger(v interface{}) return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["percent"] = flattenMonitoringAlertPolicyConditionsConditionAbsentTriggerPercent(original["percent"]) @@ -683,6 +700,9 @@ func flattenMonitoringAlertPolicyConditionsConditionThreshold(v interface{}) int return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["threshold_value"] = flattenMonitoringAlertPolicyConditionsConditionThresholdThresholdValue(original["thresholdValue"]) @@ -718,6 +738,10 @@ func flattenMonitoringAlertPolicyConditionsConditionThresholdDenominatorAggregat 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{}{ "per_series_aligner": flattenMonitoringAlertPolicyConditionsConditionThresholdDenominatorAggregationsPerSeriesAligner(original["perSeriesAligner"]), "group_by_fields": flattenMonitoringAlertPolicyConditionsConditionThresholdDenominatorAggregationsGroupByFields(original["groupByFields"]), @@ -756,6 +780,9 @@ func flattenMonitoringAlertPolicyConditionsConditionThresholdTrigger(v interface return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["percent"] = flattenMonitoringAlertPolicyConditionsConditionThresholdTriggerPercent(original["percent"]) @@ -785,6 +812,10 @@ func flattenMonitoringAlertPolicyConditionsConditionThresholdAggregations(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{}{ "per_series_aligner": flattenMonitoringAlertPolicyConditionsConditionThresholdAggregationsPerSeriesAligner(original["perSeriesAligner"]), "group_by_fields": flattenMonitoringAlertPolicyConditionsConditionThresholdAggregationsGroupByFields(original["groupByFields"]), @@ -831,6 +862,9 @@ func flattenMonitoringAlertPolicyDocumentation(v interface{}) interface{} { return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["content"] = flattenMonitoringAlertPolicyDocumentationContent(original["content"]) diff --git a/google/resource_storage_default_object_access_control.go b/google/resource_storage_default_object_access_control.go index 5ae86adb..cdab4147 100644 --- a/google/resource_storage_default_object_access_control.go +++ b/google/resource_storage_default_object_access_control.go @@ -297,6 +297,9 @@ func flattenStorageDefaultObjectAccessControlProjectTeam(v interface{}) interfac return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["project_number"] = flattenStorageDefaultObjectAccessControlProjectTeamProjectNumber(original["projectNumber"]) diff --git a/google/resource_storage_object_access_control.go b/google/resource_storage_object_access_control.go index 5b6e57ee..396f6feb 100644 --- a/google/resource_storage_object_access_control.go +++ b/google/resource_storage_object_access_control.go @@ -307,6 +307,9 @@ func flattenStorageObjectAccessControlProjectTeam(v interface{}) interface{} { return nil } original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } transformed := make(map[string]interface{}) transformed["project_number"] = flattenStorageObjectAccessControlProjectTeamProjectNumber(original["projectNumber"])