Use lineage instead of api_name for property conflicts#3885
Use lineage instead of api_name for property conflicts#3885c2thorn merged 1 commit intoGoogleCloudPlatform:masterfrom
lineage instead of api_name for property conflicts#3885Conversation
|
I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=140954" |
|
I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceComputeInstanceSerialPort_basic|TestAccDataSourceComputeInstance_basic|TestAccActiveDirectoryDomain_activeDirectoryDomainBasicExample|TestAccActiveDirectoryDomainTrust_activeDirectoryDomainTrustBasicExample|TestAccComposerEnvironment_basic|TestAccComposerEnvironment_private|TestAccComposerEnvironment_update|TestAccComposerEnvironment_privateWithWebServerControl|TestAccComposerEnvironment_withUpdateOnCreate|TestAccComposerEnvironment_withSoftwareConfig|TestAccComputeAttachedDisk_count|TestAccComposerEnvironment_withNodeConfig|TestAccComputeBackendService_withMaxRatePerEndpoint|TestAccComputeBackendService_withMaxConnectionsPerEndpoint|TestAccComputeHealthCheck_healthCheckGrpcExample|TestAccComputeHealthCheck_healthCheckGrpcFullExample|TestAccComputeInstanceFromTemplate_basic|TestAccComputeRegionDisk_deleteDetach|TestAccComputeRegionHealthCheck_regionHealthCheckGrpcExample|TestAccComputeRegionHealthCheck_regionHealthCheckGrpcFullExample|TestAccRegionInstanceGroupManager_basic|TestAccComputeVpnGateway_targetVpnGatewayBasicExample|TestAccComputeVpnTunnel_vpnTunnelBasicExample|TestAccComputeVpnTunnel_vpnTunnelBetaExample|TestAccComputeVpnTunnel_router|TestAccComputeVpnTunnel_defaultTrafficSelectors|TestAccContainerCluster_withNodePoolNodeConfig|TestAccContainerCluster_nodeAutoprovisioning|TestAccContainerNodePool_withWorkloadIdentityConfig|TestAccMemcacheInstance_update|TestAccMemcacheInstance_memcacheInstanceBasicExample|TestAccNetworkManagementConnectivityTest_networkManagementConnectivityTestInstancesExample|TestAccNetworkManagementConnectivityTest_networkManagementConnectivityTestAddressesExample|TestAccNetworkManagementConnectivityTest_update You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=140956" |
nat-henderson
left a comment
There was a problem hiding this comment.
Ooh, lineage. Fun name. :)
Fixes hashicorp/terraform-provider-google#6967
Within
google_compute_url_map, bothdefault_url_redirectandpath_matcher.default_url_redirectexist, as well asdefault_route_actionandpath_matcher.default_route_action.default_url_redirectis set to conflict withdefault_route_action, but thepath_matchersubfields are not intended to conflict with anything.The logic to generate
ConflictsWithusedapi_namewhich does not differentiate between the two versions of each field, causing thepath_matchersubfields to conflict with the top-level fields. Usinglineageinstead ofapi_namewill remove these unintended conflicts.If this PR is for Terraform, I acknowledge that I have:
make testandmake lintto ensure it passes unit and linter tests.Release Note Template for Downstream PRs (will be copied)