Pass state back to the engine if Apply encountered an error #2695
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
VenelinMartinov
force-pushed
the
vvm/fix_partial_init_errors
branch
from
9be63d5 to
03b9498
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2695 +/- ##
==========================================
+ Coverage 69.47% 69.51% +0.04%
==========================================
Files 301 301
Lines 38644 38637 -7
==========================================
+ Hits 26847 26858 +11
+ Misses 10272 10259 -13
+ Partials 1525 1520 -5 ☔ View full report in Codecov by Sentry. |
VenelinMartinov
force-pushed
the
vvm/fix_partial_init_errors
branch
from
03b9498 to
5978502
Compare
VenelinMartinov
changed the title
VenelinMartinov
changed the title
VenelinMartinov
force-pushed
the
vvm/fix_partial_init_errors
branch
from
5978502 to
79e39da
Compare
iwahbe
approved these changes
Dec 9, 2024
VenelinMartinov
force-pushed
the
vvm/fix_partial_init_errors
branch
from
79e39da to
5ede56d
Compare
flostadler
approved these changes
Dec 9, 2024
t0yv0
reviewed
Dec 9, 2024
pkg/tfshim/sdk-v2/provider2.go
Outdated
| @@ -349,7 +349,7 @@ func (p *planResourceChangeImpl) Apply( | |||
|
|
|||
| resp, err := p.server.ApplyResourceChange(ctx, t, ty, cfg, st, pl, priv, meta) | |||
| if err != nil { | |||
| return nil, err | |||
| return resp, err | |||
There was a problem hiding this comment.
Curious how does this type-check? resp is the result of ApplyResourceChange but the type is shim.InstanceState?
There was a problem hiding this comment.
Hm, ApplyResourceChange returns a v2InstanceState2 which fulfils shim.InstanceState and is the same type we create on the following line.
I wonder why we recreate it there. Thanks for spotting this.
EDIT: Seems entirely redundant - all the parameters created on the following line are identical to what is returned by ApplyResourceChange. I've simplified it
|
This PR has been shipped in release v3.97.0. |
iwahbe
added a commit
that referenced
this pull request
Dec 10, 2024
VenelinMartinov
added a commit
that referenced
this pull request
Dec 11, 2024
In the SDKv2 bridge under PlanResourceChange we are not passing any state we receive during TF Apply back to the engine if we also received an error. This causes us to incorrectly miss any resources which were created but encountered errors during the creation process. The engine should see these as ResourceInitError, which allows the engine to attempt to update the partially created resource on the next up. This PR fixes the issue by passing the state down to the engine in the case when we receive an error and a non-nil state from TF during Apply. This is the second attempt at this. The first was #2695 but was reverted because it caused a different panic: #2706. We added a regression test for that in #2710 The reason for that panic was that we were now creating a non-nil `InstanceState` with a nil `stateValue` which causes the `ID` function to panic. This PR fixes both issues by not allowing non-nil states with nil `stateValue`s and by preventing the panic in `ID`. There was also a bit of fun with go nil interfaces along the way, which is the reason why `ApplyResourceChange` now returns a `shim.InstanceState` interface instead of a `*v2InstanceState2`. Otherwise we end up creating a non-nil interface with a nil value. related to pulumi/pulumi-gcp#2700 related to pulumi/pulumi-aws#4759 fixes #2696
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.
In the SDKv2 bridge under PlanResourceChange we are not passing any state we receive during TF Apply back to the engine if we also received an error. This causes us to incorrectly miss any resources which were created but encountered errors during the creation process. The engine should see these as
ResourceInitError, which allows the engine to attempt to update the partially created resource on the nextup.This PR fixes the issue by passing the state down to the engine in the case when we receive an error and a non-nil state from TF during Apply.
related to pulumi/pulumi-gcp#2700
related to pulumi/pulumi-aws#4759
fixes #2696