Skip to content

Commit

Permalink
Merge #11445
Browse files Browse the repository at this point in the history
11445: Only use preview plans for --yes in experimental mode r=Frassle a=Frassle

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11444

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


Co-authored-by: Fraser Waters <fraser@pulumi.com>
  • Loading branch information
bors[bot] and Frassle committed Nov 23, 2022
2 parents 8279e95 + 01fb243 commit 355e07d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: cli
description: `up --yes` should not use update plans.
5 changes: 5 additions & 0 deletions pkg/backend/apply.go
Expand Up @@ -122,6 +122,11 @@ func PreviewThenPrompt(ctx context.Context, kind apitype.UpdateKind, stack Stack
// If there are no changes, or we're auto-approving or just previewing, we can skip the confirmation prompt.
if op.Opts.AutoApprove || kind == apitype.PreviewUpdate {
close(eventsChannel)
// If we're running in experimental mode then return the plan generated, else discard it. The user may
// be explicitly setting a plan but that's handled higher up the call stack.
if !op.Opts.Engine.Experimental {
plan = nil
}
return plan, changes, nil
}

Expand Down

0 comments on commit 355e07d

Please sign in to comment.