maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Always prompt for confirmation after a preview.

Browse source 
An empty preview is not a guarantee that a subsequent update will cause
no changes. As such, we should always offer the user the option to
perform an update even if the preview proposes no changes.

Note that this indirectly fixes #1410 by masking the effects of #1429.
This commit is contained in:
Pat Gavlin 2018-05-24 12:15:22 -07:00
parent a2c30f75ed
commit 31739c8840
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/backend/cloud/backend.go
View file

@ -536,7 +536,7 @@ func createDiff(events []engine.Event, displayOpts backend.DisplayOptions) strin
func (b *cloudBackend) PreviewThenPrompt(
ctx context.Context, updateKind client.UpdateKind, stack backend.Stack, pkg *workspace.Project, root string,
m backend.UpdateMetadata, opts backend.UpdateOptions,
scopes backend.CancellationScopeSource) (engine.ResourceChanges, bool, error) {
scopes backend.CancellationScopeSource) (engine.ResourceChanges, error) {
// create a channel to hear about the update events from the engine. this will be used so that
// we can build up the diff display in case the user asks to see the details of the diff
@ -559,25 +559,23 @@ func (b *cloudBackend) PreviewThenPrompt(
}()
// Perform the update operations, passing true for dryRun, so that we get a preview.
changes, hasChanges := engine.ResourceChanges(nil), true
changes := engine.ResourceChanges(nil)
if !opts.SkipPreview {
c, err := b.updateStack(
ctx, updateKind, stack, pkg, root, m, opts, eventsChannel, true /*dryRun*/, scopes)
if err != nil {
return c, false, err
return c, err
}
// TODO(ellismg)[pulumi/pulumi#1347]: Work around 1347 by forcing a choice when running a preview against a PPC
changes, hasChanges = c, c.HasChanges() || !stack.(Stack).RunLocally()
changes = c
}
// If there are no changes, or we're auto-approving or just previewing, we can skip the confirmation prompt.
if !hasChanges || opts.AutoApprove || updateKind == client.UpdateKindPreview {
return changes, hasChanges, nil
if opts.AutoApprove || updateKind == client.UpdateKindPreview {
return changes, nil
}
// Otherwise, ensure the user wants to proceed.
return changes, hasChanges, confirmBeforeUpdating(updateKind, stack, events, opts)
return changes, confirmBeforeUpdating(updateKind, stack, events, opts)
}
// confirmBeforeUpdating asks the user whether to proceed. A nil error means yes.
@ -649,8 +647,8 @@ func (b *cloudBackend) PreviewThenPromptThenExecute(
}
// Preview the operation to the user and ask them if they want to proceed.
changes, hasChanges, err := b.PreviewThenPrompt(ctx, updateKind, stack, pkg, root, m, opts, scopes)
if err != nil || !hasChanges || updateKind == client.UpdateKindPreview {
changes, err := b.PreviewThenPrompt(ctx, updateKind, stack, pkg, root, m, opts, scopes)
if err != nil || updateKind == client.UpdateKindPreview {
return changes, err
}