Added a more generic deploy command

package.json

@@ -65,9 +65,10 @@
                 "icon": "$(add)"
             },
             {
-                "command": "containerApps.deployImage",
-                "title": "%containerApps.deployImage%",
-                "category": "Azure Container Apps"
+                "command": "containerApps.deploy",
+                "title": "%containerApps.deploy%",
+                "category": "Azure Container Apps",
+                "icon": "$(cloud-upload)"
             },
             {
                 "command": "containerApps.deployImageApi",
@@ -151,6 +152,13 @@
             }
         ],
         "menus": {
+            "azureWorkspaceDeploy": [
+                {
+                    "command": "containerApps.deploy",
+                    "when": "view == azureWorkspace",
+                    "group": "navigation@3"
+                }
+            ],
             "view/item/context": [
                 {
                     "command": "containerApps.createManagedEnvironment",
@@ -168,7 +176,7 @@
                     "group": "3@1"
                 },
                 {
-                    "command": "containerApps.deployImage",
+                    "command": "containerApps.deploy",
                     "when": "view == azureResourceGroups && viewItem =~ /containerApp[^s]/i",
                     "group": "3@1"
                 },

package.nls.json

@@ -6,7 +6,7 @@
     "containerApps.enableOutputTimestamps": "Prepends each line displayed in the output channel with a timestamp.",
     "containerApps.browse": "Browse",
     "containerApps.createContainerApp": "Create Container App...",
-    "containerApps.deployImage": "Update Image in Container App...",
+    "containerApps.deploy": "Deploy to Container App...",
     "containerApps.deployImageApi": "Update Image in Container App (API)...",
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",

src/commands/createContainerApp/createContainerApp.ts

@@ -55,6 +55,9 @@ export async function createContainerApp(context: IActionContext & Partial<ICrea
         showLoadingPrompt: true
     });
 
+    // we want to add the quick start image _only_ for the create scenairo
+    wizardContext.useQuickStartImage = true;
+
     await wizard.prompt();
     const newContainerAppName = nonNullProp(wizardContext, 'newContainerAppName');
 

src/commands/deploy/IDeployBaseContext.ts

@@ -14,6 +14,7 @@ export interface IDeployBaseContext extends ISubscriptionActionContext {
     targetContainer?: ContainerAppModel;
 
     imageSource?: ImageSourceValues;
+    useQuickStartImage?: boolean;
 
     // Base image attributes used as a precursor for either creating or updating a container app
     image?: string;

src/commands/deploy/ImageSourceListStep.ts

@@ -15,18 +15,21 @@ import { DeployFromRegistryConfigureStep } from "./deployFromRegistry/DeployFrom
 export class ImageSourceListStep extends AzureWizardPromptStep<IDeployBaseContext> {
     public async prompt(context: IDeployBaseContext): Promise<void> {
         const imageSourceLabels: string[] = [
-            localize('quickStartImage', 'Use quickstart image'),
             localize('externalRegistry', 'Use existing image'),
+            localize('quickStartImage', 'Use quickstart image'),
             // localize('buildFromProject', 'Build from project'),
         ];
 
         const placeHolder: string = localize('imageBuildSourcePrompt', 'Select an image source for the container app');
         const picks: IAzureQuickPickItem<ImageSourceValues | undefined>[] = [
-            { label: imageSourceLabels[0], data: ImageSource.QuickStartImage, suppressPersistence: true },
-            { label: imageSourceLabels[1], data: ImageSource.ExternalRegistry, suppressPersistence: true },
+            { label: imageSourceLabels[0], data: ImageSource.ExternalRegistry, suppressPersistence: true },
             // { label: imageSourceLabels[2], data: undefined, suppressPersistence: true },
         ];
 
+        if (context.useQuickStartImage !== undefined) {
+            picks.unshift({ label: imageSourceLabels[1], data: ImageSource.QuickStartImage, suppressPersistence: true });
+        }
+
         context.imageSource = (await context.ui.showQuickPick(picks, { placeHolder })).data;
     }
 

src/commands/deploy/deploy.ts

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+import { VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, ITreeItemPickerContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
+import { webProvider } from "../../constants";
+import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { localize } from "../../utils/localize";
+import { pickContainerApp } from "../../utils/pickContainerApp";
+import { ContainerAppOverwriteConfirmStep } from "./ContainerAppOverwriteConfirmStep";
+import { ContainerAppUpdateStep } from "./ContainerAppUpdateStep";
+import { IDeployBaseContext } from "./IDeployBaseContext";
+import { ImageSourceListStep } from "./ImageSourceListStep";
+
+export async function deploy(context: ITreeItemPickerContext & Partial<IDeployBaseContext>, node?: ContainerAppItem): Promise<void> {
+    if (!node) {
+        context.suppressCreatePick = true;
+        node = await pickContainerApp(context);
+    }
+
+    const { subscription, containerApp } = node;
+
+    const wizardContext: IDeployBaseContext = {
+        ...context,
+        ...createSubscriptionContext(subscription),
+        subscription,
+        targetContainer: containerApp
+    };
+
+    const title: string = localize('deploy', 'Deploying to "{0}"', containerApp.name);
+
+    const promptSteps: AzureWizardPromptStep<IDeployBaseContext>[] = [
+        new ContainerAppOverwriteConfirmStep(),
+        new ImageSourceListStep()
+    ];
+
+    const executeSteps: AzureWizardExecuteStep<IDeployBaseContext>[] = [
+        new VerifyProvidersStep([webProvider]),
+        new ContainerAppUpdateStep()
+    ];
+
+    const wizard: AzureWizard<IDeployBaseContext> = new AzureWizard(wizardContext, {
+        title,
+        promptSteps,
+        executeSteps,
+        showLoadingPrompt: true
+    });
+
+    await wizard.prompt();
+    await wizard.execute();
+}

src/commands/registerCommands.ts

@@ -10,7 +10,7 @@ import { createContainerApp } from './createContainerApp/createContainerApp';
 import { createManagedEnvironment } from './createManagedEnvironment/createManagedEnvironment';
 import { deleteContainerApp } from './deleteContainerApp/deleteContainerApp';
 import { deleteManagedEnvironment } from './deleteManagedEnvironment/deleteManagedEnvironment';
-import { deployFromRegistry } from './deploy/deployFromRegistry/deployFromRegistry';
+import { deploy } from './deploy/deploy';
 import { deployImageApi } from './deploy/deployFromRegistry/deployImageApi';
 import { disableIngress } from './ingress/disableIngress';
 import { editTargetPort } from './ingress/editTargetPort';
@@ -31,7 +31,7 @@ export function registerCommands(): void {
     // container apps
     registerCommandWithTreeNodeUnwrapping('containerApps.createContainerApp', createContainerApp);
     registerCommandWithTreeNodeUnwrapping('containerApps.deleteContainerApp', deleteContainerApp);
-    registerCommandWithTreeNodeUnwrapping('containerApps.deployImage', deployFromRegistry);
+    registerCommandWithTreeNodeUnwrapping('containerApps.deploy', deploy);
     registerCommandWithTreeNodeUnwrapping('containerApps.deployImageApi', deployImageApi);
     registerCommandWithTreeNodeUnwrapping('containerApps.openConsoleInPortal', openConsoleInPortal);
     registerCommandWithTreeNodeUnwrapping('containerApps.browse', browseContainerAppNode);