Add additional entry-points for deployWorkspaceProject (#482)

Author: MicroFish91

package.json

@@ -65,6 +65,11 @@
                 "category": "Azure Container Apps",
                 "icon": "$(add)"
             },
+            {
+                "command": "containerApps.createContainerAppFromWorkspace",
+                "title": "%containerApps.createContainerAppFromWorkspace%",
+                "category": "Azure Container Apps"
+            },
             {
                 "command": "containerApps.deleteManagedEnvironment",
                 "title": "%containerApps.deleteManagedEnvironment%",
@@ -90,6 +95,11 @@
                 "title": "%containerApps.deployWorkspaceProject%",
                 "category": "Azure Container Apps"
             },
+            {
+                "command": "containerApps.deployWorkspaceProjectToContainerApp",
+                "title": "%containerApps.deployWorkspaceProjectToContainerApp%",
+                "category": "Azure Container Apps"
+            },
             {
                 "command": "containerApps.deleteContainerApp",
                 "title": "%containerApps.deleteContainerApp%",
@@ -278,6 +288,11 @@
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /managedEnvironmentItem/i",
                     "group": "2@1"
                 },
+                {
+                    "command": "containerApps.createContainerAppFromWorkspace",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /managedEnvironmentItem/i",
+                    "group": "2@2"
+                },
                 {
                     "command": "containerApps.deleteManagedEnvironment",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /managedEnvironmentItem/i",
@@ -338,6 +353,11 @@
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
                     "group": "6@1"
                 },
+                {
+                    "command": "containerApps.deployWorkspaceProjectToContainerApp",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
+                    "group": "6@2"
+                },
                 {
                     "command": "containerApps.startStreamingLogs",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
@@ -480,6 +500,14 @@
                 }
             ],
             "commandPalette": [
+                {
+                    "command": "containerApps.createContainerAppFromWorkspace",
+                    "when": "never"
+                },
+                {
+                    "command": "containerApps.deployWorkspaceProjectToContainerApp",
+                    "when": "never"
+                },
                 {
                     "command": "containerApps.deployImageApi",
                     "when": "never"

package.nls.json

@@ -7,10 +7,12 @@
     "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)...",
     "containerApps.updateImage": "Update Container Image...",
     "containerApps.deployImageApi": "Deploy Image to Container App (API)...",
     "containerApps.deployWorkspaceProject": "Deploy Project from Workspace...",
+    "containerApps.deployWorkspaceProjectToContainerApp": "Deploy Workspace to Container App...",
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",
     "containerApps.enableIngress": "Enable Ingress for Container App...",

src/commands/deployWorkspaceProject/README.md

@@ -9,7 +9,8 @@ import type { AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { ProgressLocation, window } from "vscode";
 import { activityInfoIcon, activitySuccessContext, appProvider, managedEnvironmentsId, operationalInsightsProvider, webProvider } from "../../constants";
 import { ext } from "../../extensionVariables";
-import { ContainerAppModel, isIngressEnabled } from "../../tree/ContainerAppItem";
+import { ContainerAppItem, ContainerAppModel, isIngressEnabled } from "../../tree/ContainerAppItem";
+import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { createActivityChildContext, createActivityContext } from "../../utils/activity/activityUtils";
 import { localize } from "../../utils/localize";
 import { ContainerAppOverwriteConfirmStep } from "../ContainerAppOverwriteConfirmStep";
@@ -27,7 +28,7 @@ import { ShouldSaveDeploySettingsPromptStep } from "./ShouldSaveDeploySettingsPr
 import { DefaultResourcesNameStep } from "./getDefaultValues/DefaultResourcesNameStep";
 import { getDefaultContextValues } from "./getDefaultValues/getDefaultContextValues";
 
-export async function deployWorkspaceProject(context: IActionContext): Promise<void> {
+export async function deployWorkspaceProject(context: IActionContext, item?: ContainerAppItem | ManagedEnvironmentItem): Promise<void> {
     ext.outputChannel.appendLog(localize('beginCommandExecution', '--------Initializing deploy workspace project--------'));
 
     const subscription: AzureSubscription = await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider);
@@ -40,7 +41,7 @@ export async function deployWorkspaceProject(context: IActionContext): Promise<v
         cancellable: false,
         title: localize('loadingWorkspaceTitle', 'Loading workspace project deployment configurations...')
     }, async () => {
-        defaultContextValues = await getDefaultContextValues({ ...context, ...subscriptionContext });
+        defaultContextValues = await getDefaultContextValues({ ...context, ...subscriptionContext }, item);
     });
 
     const wizardContext: DeployWorkspaceProjectContext = {

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

@@ -14,7 +14,7 @@ export interface DeployWorkspaceProjectSettings {
     containerRegistryName?: string;
 }
 
-const deployWorkspaceProjectPrefix: string = 'deployWorkspaceProject';
+export const deployWorkspaceProjectPrefix: string = 'deployWorkspaceProject';
 
 export async function getDeployWorkspaceProjectSettings(rootFolder: WorkspaceFolder): Promise<DeployWorkspaceProjectSettings> {
     const settingsPath: string = settingUtils.getDefaultRootWorkspaceSettingsPath(rootFolder);

src/commands/deployWorkspaceProject/deployWorkspaceProjectSettings.ts

@@ -22,7 +22,7 @@ export class DefaultResourcesNameStep extends AzureWizardPromptStep<DeployWorksp
         );
 
         const resourceBaseName: string = (await context.ui.showInputBox({
-            prompt: localize('resourceBaseNamePrompt', 'Enter a name for new container app resources.'),
+            prompt: localize('resourceBaseNamePrompt', 'Enter a name for the new container app resource(s).'),
             validateInput: this.validateInput,
             asyncValidationTask: (name: string) => this.validateNameAvailability(context, name)
         })).trim();

src/commands/deployWorkspaceProject/getDefaultValues/DefaultResourcesNameStep.ts

@@ -6,19 +6,26 @@
 import type { Registry } from "@azure/arm-containerregistry";
 import type { ISubscriptionActionContext } from "@microsoft/vscode-azext-utils";
 import { ext } from "../../../extensionVariables";
+import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
+import type { ManagedEnvironmentItem } from "../../../tree/ManagedEnvironmentItem";
 import { localize } from "../../../utils/localize";
 import { AcrListStep } from "../../image/imageSource/containerRegistry/acr/AcrListStep";
 import { DeployWorkspaceProjectSettings } from "../deployWorkspaceProjectSettings";
+import { triggerSettingsOverride } from "./getDefaultContextValues";
 
 interface DefaultAcrResources {
     registry?: Registry;
     imageName?: string;
 }
 
-export async function getDefaultAcrResources(context: ISubscriptionActionContext, settings: DeployWorkspaceProjectSettings | undefined): Promise<DefaultAcrResources> {
+export async function getDefaultAcrResources(
+    context: ISubscriptionActionContext,
+    settings: DeployWorkspaceProjectSettings | undefined,
+    item: ContainerAppItem | ManagedEnvironmentItem | undefined
+): Promise<DefaultAcrResources> {
     const noMatchingResource = { registry: undefined, imageName: undefined };
 
-    if (!settings || !settings.containerRegistryName) {
+    if (!settings || !settings.containerRegistryName || triggerSettingsOverride(settings, item)) {
         return noMatchingResource;
     }
 

src/commands/deployWorkspaceProject/getDefaultValues/getDefaultAcrResources.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import type { ManagedEnvironment } from "@azure/arm-appcontainers";
+import type { ResourceGroup } from "@azure/arm-resources";
+import { type ISubscriptionActionContext } from "@microsoft/vscode-azext-utils";
+import { ContainerAppItem, ContainerAppModel } from "../../../../tree/ContainerAppItem";
+import { ManagedEnvironmentItem } from "../../../../tree/ManagedEnvironmentItem";
+import type { DeployWorkspaceProjectSettings } from "../../deployWorkspaceProjectSettings";
+import { getContainerAppResourcesFromItem, getContainerAppResourcesFromSettings } from "./getDefaultResourcesFrom";
+import { promptForEnvironmentResources } from "./promptForEnvironmentResources";
+
+export interface DefaultContainerAppsResources {
+    resourceGroup?: ResourceGroup;
+    managedEnvironment?: ManagedEnvironment;
+    containerApp?: ContainerAppModel;
+}
+
+export async function getDefaultContainerAppsResources(
+    context: ISubscriptionActionContext,
+    settings: DeployWorkspaceProjectSettings | undefined,
+    item?: ContainerAppItem | ManagedEnvironmentItem
+): Promise<DefaultContainerAppsResources> {
+    // If a tree item is provided that can be used to deduce default context values, try to use those first
+    if (item) {
+        return await getContainerAppResourcesFromItem(context, item);
+    }
+
+    // Otherwise try to obtain container app resources using any saved workspace settings
+    const { resourceGroup, managedEnvironment, containerApp } = await getContainerAppResourcesFromSettings(context, settings);
+    if (resourceGroup && managedEnvironment && containerApp) {
+        return { resourceGroup, managedEnvironment, containerApp };
+    }
+
+    // Otherwise prompt the user for managed environment resources to use
+    return await promptForEnvironmentResources(context);
+}