Use lineage
instead of api_name
for property conflicts
#7063
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6967
Within
google_compute_url_map
, bothdefault_url_redirect
andpath_matcher.default_url_redirect
exist, as well asdefault_route_action
andpath_matcher.default_route_action
.default_url_redirect
is set to conflict withdefault_route_action
, but thepath_matcher
subfields are not intended to conflict with anything.The logic to generate
ConflictsWith
usedapi_name
which does not differentiate between the two versions of each field, causing thepath_matcher
subfields to conflict with the top-level fields. Usinglineage
instead ofapi_name
will remove these unintended conflicts.If this PR is for Terraform, I acknowledge that I have:
make test
andmake lint
to ensure it passes unit and linter tests.Release Note Template for Downstream PRs (will be copied)
Derived from GoogleCloudPlatform/magic-modules#3885