Refactor / consolidate deployImage & deployImageApi commands (#476)

Author: MicroFish91

package.json

@@ -75,12 +75,6 @@
                 "title": "%containerApps.editContainerApp%",
                 "category": "Azure Container Apps"
             },
-            {
-                "command": "containerApps.deployImage",
-                "title": "%containerApps.deployImage%",
-                "category": "Azure Container Apps",
-                "icon": "$(cloud-upload)"
-            },
             {
                 "command": "containerApps.deployImageApi",
                 "title": "%containerApps.deployImageApi%",
@@ -334,11 +328,6 @@
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
                     "group": "5@1"
                 },
-                {
-                    "command": "containerApps.deployImage",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
-                    "group": "6@1"
-                },
                 {
                     "command": "containerApps.startStreamingLogs",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",

package.nls.json

@@ -7,8 +7,7 @@
     "containerApps.browse": "Browse",
     "containerApps.createContainerApp": "Create Container App...",
     "containerApps.editContainerApp": "Edit Container App (Advanced)...",
-    "containerApps.deployImage": "Update Container App Image...",
-    "containerApps.deployImageApi": "Update Container App Image (API)...",
+    "containerApps.deployImageApi": "Deploy Image to Container App (API)...",
     "containerApps.deployWorkspaceProject": "Deploy Project from Workspace...",
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",

…mage/ContainerAppOverwriteConfirmStep.ts …ands/ContainerAppOverwriteConfirmStep.tssrc/commands/deployImage/ContainerAppOverwriteConfirmStep.ts renamed to src/commands/ContainerAppOverwriteConfirmStep.ts src/commands/deployImage/ContainerAppOverwriteConfirmStep.ts renamed to src/commands/ContainerAppOverwriteConfirmStep.ts

@@ -6,14 +6,14 @@
 import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
 import { AzureWizardPromptStep, nonNullProp } from "@microsoft/vscode-azext-utils";
 import type { MessageItem } from "vscode";
-import type { ContainerAppModel } from "../../tree/ContainerAppItem";
-import { localize } from "../../utils/localize";
-import type { IDeployImageContext } from "./deployImage";
+import type { ContainerAppModel } from "../tree/ContainerAppItem";
+import { localize } from "../utils/localize";
+import type { IContainerAppContext } from "./IContainerAppContext";
 
-export class ContainerAppOverwriteConfirmStep extends AzureWizardPromptStep<IDeployImageContext> {
+export class ContainerAppOverwriteConfirmStep<T extends IContainerAppContext> extends AzureWizardPromptStep<T> {
     public hideStepCount: boolean = true;
 
-    public async prompt(context: IDeployImageContext): Promise<void> {
+    public async prompt(context: T): Promise<void> {
         const containerApp: ContainerAppModel = nonNullProp(context, 'containerApp');
         const warning: string = containerApp.revisionsMode === KnownActiveRevisionsMode.Single ?
             localize('confirmDeploySingle', 'Are you sure you want to deploy to "{0}"? This will overwrite the active revision and unsupported features in VS Code will be lost.', containerApp.name) :
@@ -23,12 +23,12 @@ export class ContainerAppOverwriteConfirmStep extends AzureWizardPromptStep<IDep
         await context.ui.showWarningMessage(warning, { modal: true, stepName: 'confirmDestructiveDeployment' }, ...items);
     }
 
-    public shouldPrompt(context: IDeployImageContext): boolean {
+    public shouldPrompt(context: T): boolean {
         return !!context.containerApp && this.hasUnsupportedFeatures(context);
     }
 
     // Check for any portal features that VS Code doesn't currently support
-    private hasUnsupportedFeatures(context: IDeployImageContext): boolean {
+    private hasUnsupportedFeatures(context: T): boolean {
         const containerApp: ContainerAppModel = nonNullProp(context, 'containerApp');
         if (containerApp.template?.volumes) {
             return true;

src/commands/createContainerApp/ContainerAppCreateStep.ts

@@ -13,7 +13,7 @@ import { ExecuteActivityOutput, ExecuteActivityOutputStepBase } from "../../util
 import { createActivityChildContext } from "../../utils/activity/activityUtils";
 import { createContainerAppsAPIClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
-import { getContainerNameForImage } from "../deployImage/imageSource/containerRegistry/getContainerNameForImage";
+import { getContainerNameForImage } from "../image/imageSource/containerRegistry/getContainerNameForImage";
 import type { ICreateContainerAppContext } from "./ICreateContainerAppContext";
 
 export class ContainerAppCreateStep extends ExecuteActivityOutputStepBase<ICreateContainerAppContext> {

src/commands/createContainerApp/ICreateContainerAppContext.ts

@@ -7,7 +7,7 @@ import type { ManagedEnvironment } from '@azure/arm-appcontainers';
 import type { IResourceGroupWizardContext } from '@microsoft/vscode-azext-azureutils';
 import type { ExecuteActivityContext } from '@microsoft/vscode-azext-utils';
 import type { IContainerAppContext } from '../IContainerAppContext';
-import type { ImageSourceBaseContext } from '../deployImage/imageSource/ImageSourceBaseContext';
+import type { ImageSourceBaseContext } from '../image/imageSource/ImageSourceBaseContext';
 import type { IngressContext } from '../ingress/IngressContext';
 
 export interface ICreateContainerAppContext extends IResourceGroupWizardContext, ImageSourceBaseContext, IngressContext, IContainerAppContext, ExecuteActivityContext {

src/commands/createContainerApp/createContainerApp.ts

@@ -13,7 +13,7 @@ import type { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { createActivityContext } from "../../utils/activity/activityUtils";
 import { localize } from "../../utils/localize";
 import { pickEnvironment } from "../../utils/pickItem/pickEnvironment";
-import { ImageSourceListStep } from "../deployImage/imageSource/ImageSourceListStep";
+import { ImageSourceListStep } from "../image/imageSource/ImageSourceListStep";
 import { IngressPromptStep } from "../ingress/IngressPromptStep";
 import { ContainerAppCreateStep } from "./ContainerAppCreateStep";
 import { ContainerAppNameStep } from "./ContainerAppNameStep";

src/commands/deployImage/deployImage.ts

@@ -6,8 +6,8 @@
 import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
 import type { ICreateContainerAppContext } from "../createContainerApp/ICreateContainerAppContext";
 import type { IManagedEnvironmentContext } from "../createManagedEnvironment/IManagedEnvironmentContext";
-import type { IBuildImageInAzureContext } from "../deployImage/imageSource/buildImageInAzure/IBuildImageInAzureContext";
-import type { CreateAcrContext } from "../deployImage/imageSource/containerRegistry/acr/createAcr/CreateAcrContext";
+import type { IBuildImageInAzureContext } from "../image/imageSource/buildImageInAzure/IBuildImageInAzureContext";
+import type { CreateAcrContext } from "../image/imageSource/containerRegistry/acr/createAcr/CreateAcrContext";
 
 // Use intersection typing instead of an interface here to bypass some minor (relatively trivial) type mismatch issues introduced by having to use the 'Partial' utility
 export type DeployWorkspaceProjectContext = IManagedEnvironmentContext & ICreateContainerAppContext & CreateAcrContext & Partial<IBuildImageInAzureContext> & ExecuteActivityContext & {

src/commands/deployWorkspaceProject/DeployWorkspaceProjectContext.ts

@@ -12,13 +12,13 @@ import { ext } from "../../extensionVariables";
 import { ContainerAppModel, isIngressEnabled } from "../../tree/ContainerAppItem";
 import { createActivityChildContext, createActivityContext } from "../../utils/activity/activityUtils";
 import { localize } from "../../utils/localize";
+import { ContainerAppOverwriteConfirmStep } from "../ContainerAppOverwriteConfirmStep";
 import { browseContainerApp } from "../browseContainerApp";
 import { ContainerAppCreateStep } from "../createContainerApp/ContainerAppCreateStep";
 import { LogAnalyticsCreateStep } from "../createManagedEnvironment/LogAnalyticsCreateStep";
 import { ManagedEnvironmentCreateStep } from "../createManagedEnvironment/ManagedEnvironmentCreateStep";
-import { ContainerAppOverwriteConfirmStep } from "../deployImage/ContainerAppOverwriteConfirmStep";
-import { ContainerAppUpdateStep } from "../deployImage/ContainerAppUpdateStep";
-import { ImageSourceListStep } from "../deployImage/imageSource/ImageSourceListStep";
+import { ContainerAppUpdateStep } from "../image/imageSource/ContainerAppUpdateStep";
+import { ImageSourceListStep } from "../image/imageSource/ImageSourceListStep";
 import { IngressPromptStep } from "../ingress/IngressPromptStep";
 import { DeployWorkspaceProjectConfirmStep } from "./DeployWorkspaceProjectConfirmStep";
 import type { DeployWorkspaceProjectContext } from "./DeployWorkspaceProjectContext";

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

@@ -11,7 +11,7 @@ import { localize } from "../../../utils/localize";
 import { validateUtils } from "../../../utils/validateUtils";
 import { ContainerAppNameStep } from "../../createContainerApp/ContainerAppNameStep";
 import { ManagedEnvironmentNameStep } from "../../createManagedEnvironment/ManagedEnvironmentNameStep";
-import { RegistryNameStep } from "../../deployImage/imageSource/containerRegistry/acr/createAcr/RegistryNameStep";
+import { RegistryNameStep } from "../../image/imageSource/containerRegistry/acr/createAcr/RegistryNameStep";
 import type { DeployWorkspaceProjectContext } from "../DeployWorkspaceProjectContext";
 
 export class DefaultResourcesNameStep extends AzureWizardPromptStep<DeployWorkspaceProjectContext> {