Do not send empty values for nested properties (#2117)

<!-- This change is generated by MagicModules. -->
/cc @chrisst

google/resource_binaryauthorization_attestor.go

@@ -324,18 +324,24 @@ func expandBinaryAuthorizationAttestorAttestationAuthorityNote(v interface{}, d
 	transformedNoteReference, err := expandBinaryAuthorizationAttestorAttestationAuthorityNoteNoteReference(original["note_reference"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedNoteReference); val.IsValid() && !isEmptyValue(val) {
+		transformed["noteReference"] = transformedNoteReference
 	}
-	transformed["noteReference"] = transformedNoteReference
+
 	transformedPublicKeys, err := expandBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeys(original["public_keys"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedPublicKeys); val.IsValid() && !isEmptyValue(val) {
+		transformed["publicKeys"] = transformedPublicKeys
 	}
-	transformed["publicKeys"] = transformedPublicKeys
+
 	transformedDelegationServiceAccountEmail, err := expandBinaryAuthorizationAttestorAttestationAuthorityNoteDelegationServiceAccountEmail(original["delegation_service_account_email"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedDelegationServiceAccountEmail); val.IsValid() && !isEmptyValue(val) {
+		transformed["delegationServiceAccountEmail"] = transformedDelegationServiceAccountEmail
 	}
-	transformed["delegationServiceAccountEmail"] = transformedDelegationServiceAccountEmail
+
 	return transformed, nil
 }
 
@@ -363,18 +369,24 @@ func expandBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeys(v inter
 		transformedComment, err := expandBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeysComment(original["comment"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedComment); val.IsValid() && !isEmptyValue(val) {
+			transformed["comment"] = transformedComment
 		}
-		transformed["comment"] = transformedComment
+
 		transformedId, err := expandBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeysId(original["id"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedId); val.IsValid() && !isEmptyValue(val) {
+			transformed["id"] = transformedId
 		}
-		transformed["id"] = transformedId
+
 		transformedAsciiArmoredPgpPublicKey, err := expandBinaryAuthorizationAttestorAttestationAuthorityNotePublicKeysAsciiArmoredPgpPublicKey(original["ascii_armored_pgp_public_key"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedAsciiArmoredPgpPublicKey); val.IsValid() && !isEmptyValue(val) {
+			transformed["asciiArmoredPgpPublicKey"] = transformedAsciiArmoredPgpPublicKey
 		}
-		transformed["asciiArmoredPgpPublicKey"] = transformedAsciiArmoredPgpPublicKey
+
 		req = append(req, transformed)
 	}
 	return req, nil

google/resource_binaryauthorization_policy.go

@@ -417,8 +417,10 @@ func expandBinaryAuthorizationPolicyAdmissionWhitelistPatterns(v interface{}, d
 		transformedNamePattern, err := expandBinaryAuthorizationPolicyAdmissionWhitelistPatternsNamePattern(original["name_pattern"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedNamePattern); val.IsValid() && !isEmptyValue(val) {
+			transformed["namePattern"] = transformedNamePattern
 		}
-		transformed["namePattern"] = transformedNamePattern
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -505,18 +507,24 @@ func expandBinaryAuthorizationPolicyDefaultAdmissionRule(v interface{}, d *schem
 	transformedEvaluationMode, err := expandBinaryAuthorizationPolicyDefaultAdmissionRuleEvaluationMode(original["evaluation_mode"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedEvaluationMode); val.IsValid() && !isEmptyValue(val) {
+		transformed["evaluationMode"] = transformedEvaluationMode
 	}
-	transformed["evaluationMode"] = transformedEvaluationMode
+
 	transformedRequireAttestationsBy, err := expandBinaryAuthorizationPolicyDefaultAdmissionRuleRequireAttestationsBy(original["require_attestations_by"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRequireAttestationsBy); val.IsValid() && !isEmptyValue(val) {
+		transformed["requireAttestationsBy"] = transformedRequireAttestationsBy
 	}
-	transformed["requireAttestationsBy"] = transformedRequireAttestationsBy
+
 	transformedEnforcementMode, err := expandBinaryAuthorizationPolicyDefaultAdmissionRuleEnforcementMode(original["enforcement_mode"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedEnforcementMode); val.IsValid() && !isEmptyValue(val) {
+		transformed["enforcementMode"] = transformedEnforcementMode
 	}
-	transformed["enforcementMode"] = transformedEnforcementMode
+
 	return transformed, nil
 }
 

google/resource_compute_autoscaler.go

@@ -548,33 +548,45 @@ func expandComputeAutoscalerAutoscalingPolicy(v interface{}, d *schema.ResourceD
 	transformedMinReplicas, err := expandComputeAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMinReplicas); val.IsValid() && !isEmptyValue(val) {
+		transformed["minNumReplicas"] = transformedMinReplicas
 	}
-	transformed["minNumReplicas"] = transformedMinReplicas
+
 	transformedMaxReplicas, err := expandComputeAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMaxReplicas); val.IsValid() && !isEmptyValue(val) {
+		transformed["maxNumReplicas"] = transformedMaxReplicas
 	}
-	transformed["maxNumReplicas"] = transformedMaxReplicas
+
 	transformedCooldownPeriod, err := expandComputeAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedCooldownPeriod); val.IsValid() && !isEmptyValue(val) {
+		transformed["coolDownPeriodSec"] = transformedCooldownPeriod
 	}
-	transformed["coolDownPeriodSec"] = transformedCooldownPeriod
+
 	transformedCpuUtilization, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedCpuUtilization); val.IsValid() && !isEmptyValue(val) {
+		transformed["cpuUtilization"] = transformedCpuUtilization
 	}
-	transformed["cpuUtilization"] = transformedCpuUtilization
+
 	transformedMetric, err := expandComputeAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMetric); val.IsValid() && !isEmptyValue(val) {
+		transformed["customMetricUtilizations"] = transformedMetric
 	}
-	transformed["customMetricUtilizations"] = transformedMetric
+
 	transformedLoadBalancingUtilization, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedLoadBalancingUtilization); val.IsValid() && !isEmptyValue(val) {
+		transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
 	}
-	transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
+
 	return transformed, nil
 }
 
@@ -602,8 +614,10 @@ func expandComputeAutoscalerAutoscalingPolicyCpuUtilization(v interface{}, d *sc
 	transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+		transformed["utilizationTarget"] = transformedTarget
 	}
-	transformed["utilizationTarget"] = transformedTarget
+
 	return transformed, nil
 }
 
@@ -621,18 +635,24 @@ func expandComputeAutoscalerAutoscalingPolicyMetric(v interface{}, d *schema.Res
 		transformedName, err := expandComputeAutoscalerAutoscalingPolicyMetricName(original["name"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedName); val.IsValid() && !isEmptyValue(val) {
+			transformed["metric"] = transformedName
 		}
-		transformed["metric"] = transformedName
+
 		transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyMetricTarget(original["target"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+			transformed["utilizationTarget"] = transformedTarget
 		}
-		transformed["utilizationTarget"] = transformedTarget
+
 		transformedType, err := expandComputeAutoscalerAutoscalingPolicyMetricType(original["type"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedType); val.IsValid() && !isEmptyValue(val) {
+			transformed["utilizationTargetType"] = transformedType
 		}
-		transformed["utilizationTargetType"] = transformedType
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -662,8 +682,10 @@ func expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interfac
 	transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+		transformed["utilizationTarget"] = transformedTarget
 	}
-	transformed["utilizationTarget"] = transformedTarget
+
 	return transformed, nil
 }
 

google/resource_compute_disk.go

@@ -1050,13 +1050,17 @@ func expandComputeDiskSourceImageEncryptionKey(v interface{}, d *schema.Resource
 	transformedRawKey, err := expandComputeDiskSourceImageEncryptionKeyRawKey(original["raw_key"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !isEmptyValue(val) {
+		transformed["rawKey"] = transformedRawKey
 	}
-	transformed["rawKey"] = transformedRawKey
+
 	transformedSha256, err := expandComputeDiskSourceImageEncryptionKeySha256(original["sha256"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !isEmptyValue(val) {
+		transformed["sha256"] = transformedSha256
 	}
-	transformed["sha256"] = transformedSha256
+
 	return transformed, nil
 }
 
@@ -1107,13 +1111,17 @@ func expandComputeDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.Resou
 	transformedRawKey, err := expandComputeDiskSourceSnapshotEncryptionKeyRawKey(original["raw_key"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !isEmptyValue(val) {
+		transformed["rawKey"] = transformedRawKey
 	}
-	transformed["rawKey"] = transformedRawKey
+
 	transformedSha256, err := expandComputeDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !isEmptyValue(val) {
+		transformed["sha256"] = transformedSha256
 	}
-	transformed["sha256"] = transformedSha256
+
 	return transformed, nil
 }
 

google/resource_compute_firewall.go

@@ -750,13 +750,17 @@ func expandComputeFirewallAllow(v interface{}, d *schema.ResourceData, config *C
 		transformedProtocol, err := expandComputeFirewallAllowProtocol(original["protocol"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedProtocol); val.IsValid() && !isEmptyValue(val) {
+			transformed["IPProtocol"] = transformedProtocol
 		}
-		transformed["IPProtocol"] = transformedProtocol
+
 		transformedPorts, err := expandComputeFirewallAllowPorts(original["ports"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedPorts); val.IsValid() && !isEmptyValue(val) {
+			transformed["ports"] = transformedPorts
 		}
-		transformed["ports"] = transformedPorts
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -781,13 +785,17 @@ func expandComputeFirewallDeny(v interface{}, d *schema.ResourceData, config *Co
 		transformedProtocol, err := expandComputeFirewallDenyProtocol(original["protocol"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedProtocol); val.IsValid() && !isEmptyValue(val) {
+			transformed["IPProtocol"] = transformedProtocol
 		}
-		transformed["IPProtocol"] = transformedProtocol
+
 		transformedPorts, err := expandComputeFirewallDenyPorts(original["ports"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedPorts); val.IsValid() && !isEmptyValue(val) {
+			transformed["ports"] = transformedPorts
 		}
-		transformed["ports"] = transformedPorts
+
 		req = append(req, transformed)
 	}
 	return req, nil

google/resource_compute_health_check.go

@@ -784,23 +784,31 @@ func expandComputeHealthCheckHttpHealthCheck(v interface{}, d *schema.ResourceDa
 	transformedHost, err := expandComputeHealthCheckHttpHealthCheckHost(original["host"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedHost); val.IsValid() && !isEmptyValue(val) {
+		transformed["host"] = transformedHost
 	}
-	transformed["host"] = transformedHost
+
 	transformedRequestPath, err := expandComputeHealthCheckHttpHealthCheckRequestPath(original["request_path"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRequestPath); val.IsValid() && !isEmptyValue(val) {
+		transformed["requestPath"] = transformedRequestPath
 	}
-	transformed["requestPath"] = transformedRequestPath
+
 	transformedPort, err := expandComputeHealthCheckHttpHealthCheckPort(original["port"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedPort); val.IsValid() && !isEmptyValue(val) {
+		transformed["port"] = transformedPort
 	}
-	transformed["port"] = transformedPort
+
 	transformedProxyHeader, err := expandComputeHealthCheckHttpHealthCheckProxyHeader(original["proxy_header"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedProxyHeader); val.IsValid() && !isEmptyValue(val) {
+		transformed["proxyHeader"] = transformedProxyHeader
 	}
-	transformed["proxyHeader"] = transformedProxyHeader
+
 	return transformed, nil
 }
 
@@ -832,23 +840,31 @@ func expandComputeHealthCheckHttpsHealthCheck(v interface{}, d *schema.ResourceD
 	transformedHost, err := expandComputeHealthCheckHttpsHealthCheckHost(original["host"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedHost); val.IsValid() && !isEmptyValue(val) {
+		transformed["host"] = transformedHost
 	}
-	transformed["host"] = transformedHost
+
 	transformedRequestPath, err := expandComputeHealthCheckHttpsHealthCheckRequestPath(original["request_path"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRequestPath); val.IsValid() && !isEmptyValue(val) {
+		transformed["requestPath"] = transformedRequestPath
 	}
-	transformed["requestPath"] = transformedRequestPath
+
 	transformedPort, err := expandComputeHealthCheckHttpsHealthCheckPort(original["port"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedPort); val.IsValid() && !isEmptyValue(val) {
+		transformed["port"] = transformedPort
 	}
-	transformed["port"] = transformedPort
+
 	transformedProxyHeader, err := expandComputeHealthCheckHttpsHealthCheckProxyHeader(original["proxy_header"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedProxyHeader); val.IsValid() && !isEmptyValue(val) {
+		transformed["proxyHeader"] = transformedProxyHeader
 	}
-	transformed["proxyHeader"] = transformedProxyHeader
+
 	return transformed, nil
 }
 
@@ -880,23 +896,31 @@ func expandComputeHealthCheckTcpHealthCheck(v interface{}, d *schema.ResourceDat
 	transformedRequest, err := expandComputeHealthCheckTcpHealthCheckRequest(original["request"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRequest); val.IsValid() && !isEmptyValue(val) {
+		transformed["request"] = transformedRequest
 	}
-	transformed["request"] = transformedRequest
+
 	transformedResponse, err := expandComputeHealthCheckTcpHealthCheckResponse(original["response"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedResponse); val.IsValid() && !isEmptyValue(val) {
+		transformed["response"] = transformedResponse
 	}
-	transformed["response"] = transformedResponse
+
 	transformedPort, err := expandComputeHealthCheckTcpHealthCheckPort(original["port"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedPort); val.IsValid() && !isEmptyValue(val) {
+		transformed["port"] = transformedPort
 	}
-	transformed["port"] = transformedPort
+
 	transformedProxyHeader, err := expandComputeHealthCheckTcpHealthCheckProxyHeader(original["proxy_header"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedProxyHeader); val.IsValid() && !isEmptyValue(val) {
+		transformed["proxyHeader"] = transformedProxyHeader
 	}
-	transformed["proxyHeader"] = transformedProxyHeader
+
 	return transformed, nil
 }
 
@@ -928,23 +952,31 @@ func expandComputeHealthCheckSslHealthCheck(v interface{}, d *schema.ResourceDat
 	transformedRequest, err := expandComputeHealthCheckSslHealthCheckRequest(original["request"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRequest); val.IsValid() && !isEmptyValue(val) {
+		transformed["request"] = transformedRequest
 	}
-	transformed["request"] = transformedRequest
+
 	transformedResponse, err := expandComputeHealthCheckSslHealthCheckResponse(original["response"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedResponse); val.IsValid() && !isEmptyValue(val) {
+		transformed["response"] = transformedResponse
 	}
-	transformed["response"] = transformedResponse
+
 	transformedPort, err := expandComputeHealthCheckSslHealthCheckPort(original["port"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedPort); val.IsValid() && !isEmptyValue(val) {
+		transformed["port"] = transformedPort
 	}
-	transformed["port"] = transformedPort
+
 	transformedProxyHeader, err := expandComputeHealthCheckSslHealthCheckProxyHeader(original["proxy_header"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedProxyHeader); val.IsValid() && !isEmptyValue(val) {
+		transformed["proxyHeader"] = transformedProxyHeader
 	}
-	transformed["proxyHeader"] = transformedProxyHeader
+
 	return transformed, nil
 }
 

google/resource_compute_region_autoscaler.go

@@ -544,33 +544,45 @@ func expandComputeRegionAutoscalerAutoscalingPolicy(v interface{}, d *schema.Res
 	transformedMinReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMinReplicas); val.IsValid() && !isEmptyValue(val) {
+		transformed["minNumReplicas"] = transformedMinReplicas
 	}
-	transformed["minNumReplicas"] = transformedMinReplicas
+
 	transformedMaxReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMaxReplicas); val.IsValid() && !isEmptyValue(val) {
+		transformed["maxNumReplicas"] = transformedMaxReplicas
 	}
-	transformed["maxNumReplicas"] = transformedMaxReplicas
+
 	transformedCooldownPeriod, err := expandComputeRegionAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedCooldownPeriod); val.IsValid() && !isEmptyValue(val) {
+		transformed["coolDownPeriodSec"] = transformedCooldownPeriod
 	}
-	transformed["coolDownPeriodSec"] = transformedCooldownPeriod
+
 	transformedCpuUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedCpuUtilization); val.IsValid() && !isEmptyValue(val) {
+		transformed["cpuUtilization"] = transformedCpuUtilization
 	}
-	transformed["cpuUtilization"] = transformedCpuUtilization
+
 	transformedMetric, err := expandComputeRegionAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedMetric); val.IsValid() && !isEmptyValue(val) {
+		transformed["customMetricUtilizations"] = transformedMetric
 	}
-	transformed["customMetricUtilizations"] = transformedMetric
+
 	transformedLoadBalancingUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedLoadBalancingUtilization); val.IsValid() && !isEmptyValue(val) {
+		transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
 	}
-	transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
+
 	return transformed, nil
 }
 
@@ -598,8 +610,10 @@ func expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(v interface{},
 	transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+		transformed["utilizationTarget"] = transformedTarget
 	}
-	transformed["utilizationTarget"] = transformedTarget
+
 	return transformed, nil
 }
 
@@ -617,18 +631,24 @@ func expandComputeRegionAutoscalerAutoscalingPolicyMetric(v interface{}, d *sche
 		transformedName, err := expandComputeRegionAutoscalerAutoscalingPolicyMetricName(original["name"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedName); val.IsValid() && !isEmptyValue(val) {
+			transformed["metric"] = transformedName
 		}
-		transformed["metric"] = transformedName
+
 		transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyMetricTarget(original["target"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+			transformed["utilizationTarget"] = transformedTarget
 		}
-		transformed["utilizationTarget"] = transformedTarget
+
 		transformedType, err := expandComputeRegionAutoscalerAutoscalingPolicyMetricType(original["type"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedType); val.IsValid() && !isEmptyValue(val) {
+			transformed["utilizationTargetType"] = transformedType
 		}
-		transformed["utilizationTargetType"] = transformedType
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -658,8 +678,10 @@ func expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(v in
 	transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !isEmptyValue(val) {
+		transformed["utilizationTarget"] = transformedTarget
 	}
-	transformed["utilizationTarget"] = transformedTarget
+
 	return transformed, nil
 }
 

google/resource_compute_region_disk.go

@@ -743,13 +743,17 @@ func expandComputeRegionDiskDiskEncryptionKey(v interface{}, d *schema.ResourceD
 	transformedRawKey, err := expandComputeRegionDiskDiskEncryptionKeyRawKey(original["raw_key"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !isEmptyValue(val) {
+		transformed["rawKey"] = transformedRawKey
 	}
-	transformed["rawKey"] = transformedRawKey
+
 	transformedSha256, err := expandComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !isEmptyValue(val) {
+		transformed["sha256"] = transformedSha256
 	}
-	transformed["sha256"] = transformedSha256
+
 	return transformed, nil
 }
 
@@ -781,13 +785,17 @@ func expandComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d *schema
 	transformedRawKey, err := expandComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["raw_key"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !isEmptyValue(val) {
+		transformed["rawKey"] = transformedRawKey
 	}
-	transformed["rawKey"] = transformedRawKey
+
 	transformedSha256, err := expandComputeRegionDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !isEmptyValue(val) {
+		transformed["sha256"] = transformedSha256
 	}
-	transformed["sha256"] = transformedSha256
+
 	return transformed, nil
 }
 

google/resource_compute_router.go

@@ -501,23 +501,31 @@ func expandComputeRouterBgp(v interface{}, d *schema.ResourceData, config *Confi
 	transformedAsn, err := expandComputeRouterBgpAsn(original["asn"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedAsn); val.IsValid() && !isEmptyValue(val) {
+		transformed["asn"] = transformedAsn
 	}
-	transformed["asn"] = transformedAsn
+
 	transformedAdvertiseMode, err := expandComputeRouterBgpAdvertiseMode(original["advertise_mode"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedAdvertiseMode); val.IsValid() && !isEmptyValue(val) {
+		transformed["advertiseMode"] = transformedAdvertiseMode
 	}
-	transformed["advertiseMode"] = transformedAdvertiseMode
+
 	transformedAdvertisedGroups, err := expandComputeRouterBgpAdvertisedGroups(original["advertised_groups"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedAdvertisedGroups); val.IsValid() && !isEmptyValue(val) {
+		transformed["advertisedGroups"] = transformedAdvertisedGroups
 	}
-	transformed["advertisedGroups"] = transformedAdvertisedGroups
+
 	transformedAdvertisedIpRanges, err := expandComputeRouterBgpAdvertisedIpRanges(original["advertised_ip_ranges"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedAdvertisedIpRanges); val.IsValid() && !isEmptyValue(val) {
+		transformed["advertisedIpRanges"] = transformedAdvertisedIpRanges
 	}
-	transformed["advertisedIpRanges"] = transformedAdvertisedIpRanges
+
 	return transformed, nil
 }
 
@@ -543,13 +551,17 @@ func expandComputeRouterBgpAdvertisedIpRanges(v interface{}, d *schema.ResourceD
 		transformedRange, err := expandComputeRouterBgpAdvertisedIpRangesRange(original["range"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedRange); val.IsValid() && !isEmptyValue(val) {
+			transformed["range"] = transformedRange
 		}
-		transformed["range"] = transformedRange
+
 		transformedDescription, err := expandComputeRouterBgpAdvertisedIpRangesDescription(original["description"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedDescription); val.IsValid() && !isEmptyValue(val) {
+			transformed["description"] = transformedDescription
 		}
-		transformed["description"] = transformedDescription
+
 		req = append(req, transformed)
 	}
 	return req, nil

google/resource_compute_subnetwork.go

@@ -645,13 +645,17 @@ func expandComputeSubnetworkSecondaryIpRange(v interface{}, d *schema.ResourceDa
 		transformedRangeName, err := expandComputeSubnetworkSecondaryIpRangeRangeName(original["range_name"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedRangeName); val.IsValid() && !isEmptyValue(val) {
+			transformed["rangeName"] = transformedRangeName
 		}
-		transformed["rangeName"] = transformedRangeName
+
 		transformedIpCidrRange, err := expandComputeSubnetworkSecondaryIpRangeIpCidrRange(original["ip_cidr_range"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedIpCidrRange); val.IsValid() && !isEmptyValue(val) {
+			transformed["ipCidrRange"] = transformedIpCidrRange
 		}
-		transformed["ipCidrRange"] = transformedIpCidrRange
+
 		req = append(req, transformed)
 	}
 	return req, nil

google/resource_containeranalysis_note.go

@@ -264,8 +264,10 @@ func expandContainerAnalysisNoteAttestationAuthority(v interface{}, d *schema.Re
 	transformedHint, err := expandContainerAnalysisNoteAttestationAuthorityHint(original["hint"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedHint); val.IsValid() && !isEmptyValue(val) {
+		transformed["hint"] = transformedHint
 	}
-	transformed["hint"] = transformedHint
+
 	return transformed, nil
 }
 
@@ -281,8 +283,10 @@ func expandContainerAnalysisNoteAttestationAuthorityHint(v interface{}, d *schem
 	transformedHumanReadableName, err := expandContainerAnalysisNoteAttestationAuthorityHintHumanReadableName(original["human_readable_name"], d, config)
 	if err != nil {
 		return nil, err
+	} else if val := reflect.ValueOf(transformedHumanReadableName); val.IsValid() && !isEmptyValue(val) {
+		transformed["humanReadableName"] = transformedHumanReadableName
 	}
-	transformed["humanReadableName"] = transformedHumanReadableName
+
 	return transformed, nil
 }
 

google/resource_filestore_instance.go

@@ -534,13 +534,17 @@ func expandFilestoreInstanceFileShares(v interface{}, d *schema.ResourceData, co
 		transformedName, err := expandFilestoreInstanceFileSharesName(original["name"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedName); val.IsValid() && !isEmptyValue(val) {
+			transformed["name"] = transformedName
 		}
-		transformed["name"] = transformedName
+
 		transformedCapacityGb, err := expandFilestoreInstanceFileSharesCapacityGb(original["capacity_gb"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedCapacityGb); val.IsValid() && !isEmptyValue(val) {
+			transformed["capacityGb"] = transformedCapacityGb
 		}
-		transformed["capacityGb"] = transformedCapacityGb
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -564,23 +568,31 @@ func expandFilestoreInstanceNetworks(v interface{}, d *schema.ResourceData, conf
 		transformedNetwork, err := expandFilestoreInstanceNetworksNetwork(original["network"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedNetwork); val.IsValid() && !isEmptyValue(val) {
+			transformed["network"] = transformedNetwork
 		}
-		transformed["network"] = transformedNetwork
+
 		transformedModes, err := expandFilestoreInstanceNetworksModes(original["modes"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedModes); val.IsValid() && !isEmptyValue(val) {
+			transformed["modes"] = transformedModes
 		}
-		transformed["modes"] = transformedModes
+
 		transformedReservedIpRange, err := expandFilestoreInstanceNetworksReservedIpRange(original["reserved_ip_range"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedReservedIpRange); val.IsValid() && !isEmptyValue(val) {
+			transformed["reservedIpRange"] = transformedReservedIpRange
 		}
-		transformed["reservedIpRange"] = transformedReservedIpRange
+
 		transformedIpAddresses, err := expandFilestoreInstanceNetworksIpAddresses(original["ip_addresses"], d, config)
 		if err != nil {
 			return nil, err
+		} else if val := reflect.ValueOf(transformedIpAddresses); val.IsValid() && !isEmptyValue(val) {
+			transformed["ipAddresses"] = transformedIpAddresses
 		}
-		transformed["ipAddresses"] = transformedIpAddresses
+
 		req = append(req, transformed)
 	}
 	return req, nil