Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use lineage instead of api_name for property conflicts #7063

Conversation

modular-magician
Copy link
Collaborator

Fixes #6967

Within google_compute_url_map, both default_url_redirect and path_matcher.default_url_redirect exist, as well as default_route_action and path_matcher.default_route_action. default_url_redirect is set to conflict with default_route_action, but the path_matcher subfields are not intended to conflict with anything.

The logic to generate ConflictsWith used api_name which does not differentiate between the two versions of each field, causing the path_matcher subfields to conflict with the top-level fields. Using lineage instead of api_name will remove these unintended conflicts.

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

compute: fixed an issue where `google_compute_url_map` `path_matcher.default_route_action` would conflict with `default_url_redirect`

Derived from GoogleCloudPlatform/magic-modules#3885

@ghost ghost added the size/xs label Aug 19, 2020
@modular-magician modular-magician merged commit b61d742 into hashicorp:master Aug 19, 2020
@ghost
Copy link

ghost commented Sep 19, 2020

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 👉 [email protected]. Thanks!

@ghost ghost locked and limited conversation to collaborators Sep 19, 2020
@modular-magician modular-magician deleted the downstream-pr-0b984e8d6900ef44c5e67ab78c53f5bc0da983b8 branch November 16, 2024 23:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Path matcher default_route_action conflicts with default_url_redirect
1 participant