Skip to content

Backport of check for cancellation before apply confirmation into v1.2#30981

Merged
jbardin merged 1 commit intov1.2from
backport/jbardin/cancel-auto-approve/extremely-brave-bear
May 2, 2022
Merged

Backport of check for cancellation before apply confirmation into v1.2#30981
jbardin merged 1 commit intov1.2from
backport/jbardin/cancel-auto-approve/extremely-brave-bear

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented May 2, 2022

Backport

This PR is auto-generated from #30979 to be assessed for backporting due to the inclusion of the label 1.2-backport.

The below text is copied from the body of the original PR.


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

@ghost ghost force-pushed the backport/jbardin/cancel-auto-approve/extremely-brave-bear branch from d3652f9 to 9804d96 Compare May 2, 2022 21:14
@ghost ghost requested a review from jbardin May 2, 2022 21:14
@jbardin jbardin merged commit 35fa00f into v1.2 May 2, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 2, 2022

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 2, 2022

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.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 2, 2022
@xiehan xiehan deleted the backport/jbardin/cancel-auto-approve/extremely-brave-bear branch September 30, 2024 10:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant