Merge with main

Author: MicroFish91

package.json

@@ -81,10 +81,9 @@
                 "category": "Azure Container Apps"
             },
             {
-                "command": "containerApps.deployImage",
-                "title": "%containerApps.deployImage%",
-                "category": "Azure Container Apps",
-                "icon": "$(cloud-upload)"
+                "command": "containerApps.updateImage",
+                "title": "%containerApps.updateImage%",
+                "category": "Azure Container Apps"
             },
             {
                 "command": "containerApps.deployImageApi",
@@ -350,8 +349,8 @@
                     "group": "5@1"
                 },
                 {
-                    "command": "containerApps.deployImage",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
+                    "command": "containerApps.updateImage",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
                     "group": "6@1"
                 },
                 {
@@ -399,6 +398,11 @@
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionState:active/i",
                     "group": "2@4"
                 },
+                {
+                    "command": "containerApps.updateImage",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionDraft:false(.*)revisionItem/i",
+                    "group": "3@1"
+                },
                 {
                     "command": "containerApps.deployRevisionDraft",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionDraftItem(.*)unsavedChanges:true/i",
@@ -420,10 +424,15 @@
                     "group": "1@2"
                 },
                 {
-                    "command": "containerApps.editRevisionDraft",
+                    "command": "containerApps.updateImage",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionDraftItem/i",
                     "group": "2@1"
                 },
+                {
+                    "command": "containerApps.editRevisionDraft",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionDraftItem/i",
+                    "group": "3@1"
+                },
                 {
                     "command": "containerApps.editScaleRange",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /scaleItem/i",
@@ -541,6 +550,11 @@
                             "%containerApps.deleteConfirmation.ClickButton%"
                         ],
                         "default": "EnterName"
+                    },
+                    "containerApps.showDraftCommandDeployPopup": {
+                        "type": "boolean",
+                        "description": "%containerApps.showDraftCommandDeployPopup%",
+                        "default": true
                     }
                 }
             }

package.nls.json

@@ -4,14 +4,21 @@
     "containerApps.revealResource": "Reveal Resource",
     "containerApps.description": "An Azure Container Apps extension for Visual Studio Code.",
     "containerApps.enableOutputTimestamps": "Prepends each line displayed in the output channel with a timestamp.",
+    "containerApps.showDraftCommandDeployPopup": "Show an informational deploy pop-up message whenever a draft command is run.",
     "containerApps.browse": "Browse",
     "containerApps.createContainerApp": "Create Container App...",
     "containerApps.createContainerAppFromWorkspace": "Create Container App from Workspace...",
     "containerApps.editContainerApp": "Edit Container App (Advanced)...",
+<<<<<<< HEAD
     "containerApps.deployImage": "Update Container App Image...",
     "containerApps.deployImageApi": "Update Container App Image (API)...",
     "containerApps.deployWorkspaceProject": "Deploy Workspace Project...",
     "containerApps.deployWorkspaceProjectToContainerApp": "Deploy Workspace to Container App...",
+=======
+    "containerApps.updateImage": "Update Container Image...",
+    "containerApps.deployImageApi": "Deploy Image to Container App (API)...",
+    "containerApps.deployWorkspaceProject": "Deploy Project from Workspace...",
+>>>>>>> 8b6a8e78961895378a4931b7e95c79b032b7d3a1
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",
     "containerApps.enableIngress": "Enable 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/EXECUTE_PRIORITY.md

@@ -22,53 +22,56 @@ When creating or updating resources, execute steps should occupy certain priorit
 
 - RegistryCreateStep: 350
 
-### 3. Image Source
+### 3. Image
 
 <b>Priority Range</b>: 400 - 490
 
-#### Build Image in Azure Steps
+#### General Steps
+##### Build Image in Azure Steps
 
 - TarFileStep: 420
 - UploadSourceCodeStep: 430
 - RunStep: 440
 - BuildImageStep: 450
 - ContainerRegistryImageConfigureStep: 470
 
-#### Container Registry Steps
+##### Container Registry Steps
 
 - ContainerRegistryImageConfigureStep: 470
 
-#### Common Steps
+#### `updateImage` Steps
 
-- ContainerAppUpdateStep: 480 (Todo - investigate decoupling this command from imageSource when revision draft update support is added)
+- UpdateRegistryAndSecretsStep: 480
+- UpdateImageDraftStep: 490 (revision draft)
 
-### 4. Environment Variables
+### 4. Unallocated Space
 
 <b>Priority Range</b>: 500 - 590
 
 #### Steps
 
 Reserved
 
-### 5. Ingress
+### 5. Container App
 
 <b>Priority Range</b>: 600 - 690
 
 #### Steps
 
-- EnableIngressStep: 650
-- DisableIngressStep: 650
+- ContainerAppCreateStep: 620
+- ContainerAppUpdateStep: 650
 
-- TargetPortUpdateStep: 650 (single command only)
-- ToggleIngressVisibilityStep: 650 (single command only)
-
-### 6. Container App
+### 6. Ingress
 
 <b>Priority Range</b>: 700 - 790
 
 #### Steps
 
-- ContainerAppCreateStep: 750
+- EnableIngressStep: 750 (update existing container app)
+- DisableIngressStep: 750 (update existing container app)
+
+- TargetPortUpdateStep: 750 (single command only)
+- ToggleIngressVisibilityStep: 750 (single command only)
 
 ### 7. Secrets
 
@@ -93,8 +96,7 @@ Reserved
 
 #### Steps
 
-- ScaleRangeUpdateStep: 1110
-- AddScaleRuleStep: 1120
+- AddScaleRuleStep: 1120 (revision draft)
 
 ### 10. Unallocated Space
 

src/commands/createContainerApp/ContainerAppCreateStep.ts

@@ -13,11 +13,11 @@ 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> {
-    public priority: number = 750;
+    public priority: number = 620;
 
     protected async executeCore(context: ICreateContainerAppContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
         const appClient: ContainerAppsAPIClient = await createContainerAppsAPIClient(context);

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

@@ -13,13 +13,13 @@ import { ContainerAppItem, ContainerAppModel, isIngressEnabled } from "../../tre
 import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 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";