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

Pass state back to the engine if Apply encountered an error 2 #2713

Merged
merged 2 commits into from
Dec 11, 2024

Conversation

VenelinMartinov
Copy link
Contributor

@VenelinMartinov VenelinMartinov commented Dec 10, 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 stateValues 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

@VenelinMartinov
Copy link
Contributor Author

VenelinMartinov commented Dec 10, 2024

This change is part of the following stack:

Change managed by git-spice.

@VenelinMartinov VenelinMartinov changed the title Revert "Revert "Pass state back to the engine if Apply encountered an error" (#2707)" Pass state back to the engine if Apply encountered an error Dec 10, 2024
@VenelinMartinov VenelinMartinov changed the title Pass state back to the engine if Apply encountered an error Pass state back to the engine if Apply encountered an error 2 Dec 10, 2024
Copy link

codecov bot commented Dec 10, 2024

Codecov Report

Attention: Patch coverage is 72.72727% with 6 lines in your changes missing coverage. Please review.

Project coverage is 69.56%. Comparing base (334d6b7) to head (0c78935).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
pkg/tfshim/sdk-v2/provider2.go 72.72% 4 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2713      +/-   ##
==========================================
+ Coverage   69.53%   69.56%   +0.03%     
==========================================
  Files         301      301              
  Lines       38655    38654       -1     
==========================================
+ Hits        26878    26890      +12     
+ Misses      10257    10244      -13     
  Partials     1520     1520              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@VenelinMartinov VenelinMartinov force-pushed the vvm/move_sdkv2_pulcheck_to_internal branch from a8594a2 to 545a6f3 Compare December 10, 2024 17:31
@VenelinMartinov VenelinMartinov force-pushed the vvm/fix_resource_init_errors2 branch from 0b07184 to 2b822d0 Compare December 10, 2024 17:31
@VenelinMartinov VenelinMartinov force-pushed the vvm/move_sdkv2_pulcheck_to_internal branch from 545a6f3 to f44bf76 Compare December 10, 2024 17:33
@VenelinMartinov VenelinMartinov force-pushed the vvm/fix_resource_init_errors2 branch from 2b822d0 to 89e62ea Compare December 10, 2024 17:33
@VenelinMartinov VenelinMartinov requested review from iwahbe and t0yv0 and removed request for t0yv0 and iwahbe December 10, 2024 17:33
Base automatically changed from vvm/move_sdkv2_pulcheck_to_internal to master December 10, 2024 18:33
@VenelinMartinov VenelinMartinov force-pushed the vvm/fix_resource_init_errors2 branch from 89e62ea to 0c78935 Compare December 11, 2024 10:54
@VenelinMartinov VenelinMartinov enabled auto-merge (squash) December 11, 2024 11:15
@VenelinMartinov VenelinMartinov merged commit 3d17412 into master Dec 11, 2024
17 checks passed
@VenelinMartinov VenelinMartinov deleted the vvm/fix_resource_init_errors2 branch December 11, 2024 11:48
@pulumi-bot
Copy link
Contributor

This PR has been shipped in release v3.98.0.

VenelinMartinov added a commit that referenced this pull request Dec 19, 2024
This adds an integration test for resourceInitErrors during `Update`.
Similar to the `Create` test in
#2713

fixes #2772
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The SDKv2 Bridge swallows resource init errors when run under PlanResourceChange
3 participants