Remove spurious ConflictsWith warnings on import #1948
Merged
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1948 +/- ##
==========================================
+ Coverage 60.51% 62.41% +1.89%
==========================================
Files 329 329
Lines 44477 37056 -7421
==========================================
- Hits 26917 23127 -3790
+ Misses 16050 12418 -3632
- Partials 1510 1511 +1 ☔ View full report in Codecov by Sentry. |
t0yv0
changed the title
iwahbe
approved these changes
May 9, 2024
pkg/tfbridge/deconflict_test.go
Outdated
Comment on lines
33
to
48
| schema := &schema.SchemaMap{ | ||
| "availability_zone": (&schema.Schema{ | ||
| Type: shim.TypeString, | ||
| Optional: true, | ||
| Computed: true, | ||
| ForceNew: true, | ||
| ConflictsWith: []string{"availability_zone_id"}, | ||
| }).Shim(), | ||
| "availability_zone_id": (&schema.Schema{ | ||
| Type: shim.TypeString, | ||
| Optional: true, | ||
| Computed: true, | ||
| ForceNew: true, | ||
| ConflictsWith: []string{"availability_zone"}, | ||
| }).Shim(), | ||
| } |
There was a problem hiding this comment.
Can you add a test for different ConflictsWith topologies?
At the very least:
A conflicts with B (where B does not conflict with A)
A conflicts with B and C, B conflicts with A and C, C conflicts with A and B
There was a problem hiding this comment.
Yeah good point, adding a few.
This was referenced May 20, 2024
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Toward #1225 - this fixes the special case of ConflictsWith warnings. This fixes spurious warnings on
pulumi import, popular bugs such as:TF does not guarantee Read results to be compatible with calling Check on, in particular Read can return results that run afoul of ConflictsWith constraint. This change compensates by arbitrarily dropping data from the Read result until it passes ConflictsWith checks.
This affects
pulumi refreshas well as I think it should although I have not seen "in the wild" cases where refresh is affected, since it typically will not copy these properties to the input bag unless they're present in old inputs, which are usually correct wrt to ConflictsWith.