-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Fix issue 20073 with diff suppress #17283
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
Open
faustroxas
wants to merge
2
commits into
GoogleCloudPlatform:main
Choose a base branch
from
faustroxas:fix/issue_20073_followup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+15
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // TagKeyPurposeDataDiffSuppress suppresses diffs for purpose_data when the API | ||
| // returns normalized values. For example, the API may resolve "auto" to an | ||
| // actual organization number. Since purpose_data is immutable, if the old value | ||
| // (from state) exists and is non-empty, we suppress the diff to avoid | ||
| // unnecessary replacements after import. | ||
| func TagKeyPurposeDataDiffSuppress(k, old, new string, d *schema.ResourceData) bool { | ||
| // If the old value exists and the field is set in state, suppress the diff | ||
| // since the API normalizes values (e.g., "auto" -> actual org number) | ||
| if old != "" && new != "" { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I'm understanding correctly, wouldn't this also prevent someone from changing purpose_data in their config (and getting a plan to replace the tag key)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes that would be the case. Do you have any recommendations on how to get around the issue?
hashicorp/terraform-provider-google#20073
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@roaks3 for more context, we are trying to import these secure tag keys. However, since
purpose_datais not imported by provider, terraform is forcing replacements of the tag keys which we do not want as they are in use