Use lineage instead of api_name for property conflicts#7063
Merged
modular-magician merged 1 commit intohashicorp:masterfrom Aug 19, 2020
Conversation
…#3885) Signed-off-by: Modular Magician <magic-modules@google.com>
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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_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)
Derived from GoogleCloudPlatform/magic-modules#3885