check for cancellation before apply confirmation#30979
Conversation
When executing an apply with no plan, it's possible for a cancellation to arrive during the final batch of provider operations, resulting in no errors in the plan. The run context was next checked during the confirmation for apply, but in the case of -auto-approve that confirmation is skipped, resulting in the canceled plan being applied. Make sure we directly check for cancellation before confirming the plan.
jbardin
added
the
1.2-backport
alisdair
left a comment
alisdair
left a comment
There was a problem hiding this comment.
Fix makes sense to me, one question/worry about the test inline (which might be nothing).
| testHookStopPlanApply = cancel | ||
| defer func() { | ||
| testHookStopPlanApply = nil | ||
| }() |
There was a problem hiding this comment.
Is there any chance of this leaking into another parallel test and causing a mid-process cancel?
There was a problem hiding this comment.
Tests must be explicitly marked with t.Parallel() in order to run concurrently, so there should be no conflict there.
|
Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch. |
ghost
mentioned this pull request
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
2 participants
When executing an apply with no plan, it's possible for a cancellation
to arrive during the final batch of provider operations, resulting in no
errors in the plan. The run context was next checked during the
confirmation for apply, but in the case of -auto-approve that
confirmation is skipped, resulting in the canceled plan being applied.
Make sure we directly check for cancellation before confirming the plan.
Fixes #30918