[engine] Check for old resources first by URN and then aliases #13883
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
Changelog[uncommitted] (2023-09-06)Bug Fixes
|
justinvp
commented
Sep 6, 2023
| snap, res = TestOp(Update).Run(project, p.GetTarget(t, snap), p.Options, false, p.BackendClient, nil) | ||
| assert.Nil(t, res) | ||
| assert.NotNil(t, snap) | ||
| assert.Nil(t, snap.VerifyIntegrity()) |
There was a problem hiding this comment.
Prior to the fix, this fails because we end up with two resources with the same URN (urn:pulumi:test::test::pkgA:m:typA::resB) in the snapshot.
This change fixes a regression in the step generator when looking for old resources. When generating steps for a register resource event, we previously looked for old resources first by the resource's URN and then by aliases. This regressed with #10819: ```diff - for _, urnOrAlias := range append([]resource.URN{urn}, goal.Aliases...) { + aliases[urn] = struct{}{} + for urnOrAlias := range aliases { ``` Previously, aliases were in a slice and we always looked for the URN first, then aliases. With #10819, aliases changed to being stored in a map (a set). The URN was added to the map before iterating over it, but there's no guarantee it will be looked at first (iteration order for maps is unspecified), and with the current behavior when there are aliases in the map, the URN very likely won't come first. This can lead to duplicate resources in the state (stack corruption) when the wrong old resource is chosen. The fix is to move back to always checking for old resources using the URN first. We also move back to maintaining aliases in a slice for consistent ordering.
justinvp
force-pushed
the
justin/aliasaftercreatefails
branch
from
e87f3d9
to
48b64d5
Compare
Frassle
approved these changes
Sep 6, 2023
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.
This change fixes a regression in the step generator when looking for old resources. When generating steps for a register resource event, we previously looked for old resources first by the resource's URN and then by aliases.
This regressed with #10819:
Previously, aliases were in a slice and we always looked for the URN first, then aliases.
With #10819, aliases changed to being stored in a map (a set). The URN was added to the map before iterating over it, but there's no guarantee it will be looked at first (iteration order for maps is unspecified), and with the current behavior when there are aliases in the map, the URN very likely won't come first.
This can lead to duplicate resources in the state (stack corruption) when the wrong old resource is chosen.
The fix is to move back to always checking for old resources using the URN first. We also move back to maintaining aliases in a slice for consistent ordering.
Fixes #13848