refactor(appbuilder): combine sync/deploy wizard, add multipick

## Problem
Multiple bugs related to Sync/Build wizard

## Solution
Bug7: conflict params will be auto-resolved now
Bug8: code is no longer auto applied
Bug9: conflict params will be auto-resolved now
Bug11: Now back button in sync deploy wizard  will work

Deploy Parameter wizard will remember recent input

Author: roger-zhangg

packages/core/src/awsService/appBuilder/activation.ts

@@ -18,8 +18,11 @@ import { getLogger } from '../../shared/logger'
 import path from 'path'
 import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
 import { runBuild } from '../../shared/sam/build'
-import { deployTypePrompt, runOpenHandler, runOpenTemplate } from './utils'
+import { runOpenHandler, runOpenTemplate } from './utils'
 import { ResourceNode } from './explorer/nodes/resourceNode'
+import { getSyncWizard, runSync } from '../../shared/sam/sync'
+import { getDeployWizard, runDeploy } from '../../shared/sam/deploy'
+import { DeployTypeWizard } from './wizards/deployTypeWizard'
 
 export const templateToOpenAppComposer = 'aws.toolkit.appComposer.templateToOpenOnStart'
 
@@ -185,11 +188,17 @@ async function registerAppBuilderCommands(context: ExtContext): Promise<void> {
             })
         ),
         Commands.register({ id: 'aws.appBuilder.deploy', autoconnect: true }, async (arg) => {
-            const params = await deployTypePrompt()
-            if (params === 'deploy') {
-                await vscode.commands.executeCommand('aws.deploySamApplication', arg)
-            } else if (params === 'sync') {
-                await vscode.commands.executeCommand('aws.samcli.sync', arg)
+            const wizard = new DeployTypeWizard(
+                await getSyncWizard('infra', arg, undefined, false),
+                await getDeployWizard(arg, false)
+            )
+            const choices = await wizard.run()
+            if (choices) {
+                if (choices.choice === 'deploy' && choices.deployParam) {
+                    await runDeploy(arg, choices.deployParam)
+                } else if (choices.choice === 'sync' && choices.syncParam) {
+                    await runSync('infra', arg, undefined, choices.syncParam)
+                }
             }
         })
     )

packages/core/src/awsService/appBuilder/wizards/deployTypeWizard.ts

@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { samDeployUrl } from '../../../shared/constants'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { DataQuickPickItem, createQuickPick } from '../../../shared/ui/pickerPrompter'
+import * as nls from 'vscode-nls'
+import { Wizard } from '../../../shared/wizards/wizard'
+import { DeployParams, DeployWizard } from '../../../shared/sam/deploy'
+import { SyncParams, SyncWizard } from '../../../shared/sam/sync'
+import { WizardPrompter } from '../../../shared/ui/wizardPrompter'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+const localize = nls.loadMessageBundle()
+
+export class DeployTypeWizard extends Wizard<{
+    choice: string
+    syncParam: SyncParams
+    deployParam: DeployParams
+}> {
+    public constructor(syncWizard: SyncWizard, deployWizard: DeployWizard) {
+        super({ exitPrompterProvider: createExitPrompter })
+        const form = this.form
+
+        const items: DataQuickPickItem<string>[] = [
+            {
+                label: 'Sync',
+                data: 'sync',
+                detail: 'Speed up your development and testing experience in the AWS Cloud. With the --watch parameter, sync will build, deploy and watch for local changes',
+                description: 'Development environments',
+            },
+            {
+                label: 'Deploy',
+                data: 'deploy',
+                detail: 'Deploys your template through CloudFormation',
+                description: 'Production environments',
+            },
+        ]
+        form.choice.bindPrompter(() => {
+            return createQuickPick(items, {
+                title: localize('AWS.appBuilder.deployType.title', 'Select deployment command'),
+                placeholder: 'Press enter to proceed with highlighted option',
+                buttons: createCommonButtons(samDeployUrl),
+            })
+        })
+        form.deployParam.bindPrompter((state) => new WizardPrompter(deployWizard), {
+            showWhen: (state) => state.choice === 'deploy',
+        })
+        form.syncParam.bindPrompter((state) => new WizardPrompter(syncWizard), {
+            showWhen: (state) => state.choice === 'sync',
+        })
+    }
+}

packages/core/src/shared/constants.ts

@@ -75,6 +75,14 @@ export const lambdaFunctionUrlConfigUrl: string = 'https://docs.aws.amazon.com/l
 export const samSyncUrl = vscode.Uri.parse(
     'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/accelerate-getting-started.html'
 )
+// URLs for "sam build param selection"
+export const samBuildParamUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-build.html'
+)
+// URLs for "sam sync prarm selection"
+export const samSyncParamUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-sync.html'
+)
 
 //URLs for "sam build" wizard.
 export const samBuildUrl = vscode.Uri.parse(

packages/core/src/shared/sam/activation.ts

@@ -35,7 +35,7 @@ import { SamCliSettings } from './cli/samCliSettings'
 import { Commands } from '../vscode/commands2'
 import { runSync } from './sync'
 import { showExtensionPage } from '../utilities/vsCodeUtils'
-import { runDeploy } from '../../lambda/commands/deploySamApplication'
+import { runDeploy } from './deploy'
 import { telemetry } from '../telemetry/telemetry'
 
 const sharedDetectSamCli = shared(detectSamCli)
@@ -122,14 +122,6 @@ export async function activate(ctx: ExtContext): Promise<void> {
     if (globals.didReload) {
         await resumeCreateNewSamApp(ctx)
     }
-
-    Commands.register(
-        {
-            id: 'aws.samcli.sync',
-            autoconnect: true,
-        },
-        async (arg?, validate?: boolean) => await runSync('infra', arg, validate)
-    )
 }
 
 async function registerCommands(ctx: ExtContext, settings: SamCliSettings): Promise<void> {
@@ -159,7 +151,14 @@ async function registerCommands(ctx: ExtContext, settings: SamCliSettings): Prom
         Commands.register({ id: 'aws.toggleSamCodeLenses', autoconnect: false }, async () => {
             const toggled = !settings.get('enableCodeLenses', false)
             await settings.update('enableCodeLenses', toggled)
-        })
+        }),
+        Commands.register(
+            {
+                id: 'aws.samcli.sync',
+                autoconnect: true,
+            },
+            async (arg?, validate?: boolean) => await runSync('infra', arg, validate)
+        )
     )
 }