Update DefaultResourcesNameStep

extension.bundle.ts

@@ -17,7 +17,6 @@
 export * from '@microsoft/vscode-azext-utils';
 // Export activate/deactivate for main.js
 export * from './src/commands/deployWorkspaceProject/DeployWorkspaceProjectContext';
-export * from './src/commands/deployWorkspaceProject/getDefaultValues/DefaultResourcesNameStep';
 export * from './src/commands/ingress/IngressContext';
 export * from './src/commands/ingress/IngressPromptStep';
 export * from './src/commands/ingress/editTargetPort/getDefaultPort';

src/commands/api/deployWorkspaceProjectApi.ts

@@ -41,6 +41,7 @@ export async function deployWorkspaceProjectApi(deployWorkspaceProjectOptions: a
             suppressActivity: true,
             suppressConfirmation,
             suppressContainerAppCreation,
+            suppressProgress: true,
             suppressWizardTitle: true,
         });
 

src/commands/createManagedEnvironment/ManagedEnvironmentNameStep.ts

@@ -14,7 +14,7 @@ export class ManagedEnvironmentNameStep extends AzureWizardPromptStep<IManagedEn
         const prompt: string = localize('containerAppNamePrompt', 'Enter a container apps environment name.');
         context.newManagedEnvironmentName = (await context.ui.showInputBox({
             prompt,
-            validateInput: this.validateInput,
+            validateInput: ManagedEnvironmentNameStep.validateInput,
             asyncValidationTask: (name: string) => this.validateNameAvailable(context, name)
         })).trim();
 
@@ -25,7 +25,7 @@ export class ManagedEnvironmentNameStep extends AzureWizardPromptStep<IManagedEn
         return !context.managedEnvironment && !context.newManagedEnvironmentName;
     }
 
-    private validateInput(name: string | undefined): string | undefined {
+    public static validateInput(name: string | undefined): string | undefined {
         name = name ? name.trim() : '';
 
         const { minLength, maxLength } = { minLength: 4, maxLength: 20 };

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

@@ -5,17 +5,20 @@
 
 import { callWithTelemetryAndErrorHandling, createSubscriptionContext, nonNullProp, subscriptionExperience, type IActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
 import { type AzureSubscription } from "@microsoft/vscode-azureresources-api";
-import { ProgressLocation, window } from "vscode";
+import { window } from "vscode";
 import { ext } from "../../extensionVariables";
 import { type SetTelemetryProps } from "../../telemetry/SetTelemetryProps";
 import { type DeployWorkspaceProjectNotificationTelemetryProps as NotificationTelemetryProps } from "../../telemetry/commandTelemetryProps";
 import { ContainerAppItem, isIngressEnabled, type ContainerAppModel } from "../../tree/ContainerAppItem";
 import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
 import { localize } from "../../utils/localize";
+import { type IContainerAppContext } from "../IContainerAppContext";
 import { type DeployWorkspaceProjectResults } from "../api/vscode-azurecontainerapps.api";
 import { browseContainerApp } from "../browseContainerApp";
 import { type DeployWorkspaceProjectContext } from "./DeployWorkspaceProjectContext";
-import { getDefaultContextValues } from "./getDefaultValues/getDefaultContextValues";
+import { type DeploymentConfiguration } from "./deploymentConfiguration/DeploymentConfiguration";
+import { getTreeItemDeploymentConfiguration } from "./deploymentConfiguration/getTreeItemDeploymentConfiguration";
+import { getWorkspaceDeploymentConfiguration } from "./deploymentConfiguration/workspace/getWorkspaceDeploymentConfiguration";
 import { getDeployWorkspaceProjectResults } from "./getDeployWorkspaceProjectResults";
 import { deployWorkspaceProjectInternal, type DeployWorkspaceProjectInternalContext } from "./internal/deployWorkspaceProjectInternal";
 
@@ -25,29 +28,32 @@ export async function deployWorkspaceProject(context: IActionContext & Partial<D
         item = undefined;
     }
 
-    const subscription: AzureSubscription = await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider);
+    const subscription: AzureSubscription = item?.subscription ?? await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider);
     const subscriptionContext: ISubscriptionContext = createSubscriptionContext(subscription);
-
-    // Show loading indicator while we configure default values
-    let defaultContextValues: Partial<DeployWorkspaceProjectContext> | undefined;
-    await window.withProgress({
-        location: ProgressLocation.Notification,
-        cancellable: false,
-        title: localize('loadingWorkspaceTitle', 'Loading workspace project deployment configurations...')
-    }, async () => {
-        defaultContextValues = await getDefaultContextValues({ ...context, ...subscriptionContext }, item);
-    });
-
-    const deployWorkspaceProjectInternalContext: DeployWorkspaceProjectInternalContext = Object.assign(context, {
-        ...defaultContextValues,
+    const containerAppContext: IContainerAppContext = Object.assign(context, {
         ...subscriptionContext,
         subscription
     });
 
+    let deploymentConfiguration: DeploymentConfiguration;
+    if (item) {
+        deploymentConfiguration = await getTreeItemDeploymentConfiguration(item);
+    } else {
+        // Todo: Conditionally call v1 to v2 settings conversion (https://github.com/microsoft/vscode-azurecontainerapps/issues/612)
+
+        // Todo: Monorepo core logic (workspace settings path) https://github.com/microsoft/vscode-azurecontainerapps/issues/613
+        deploymentConfiguration = await getWorkspaceDeploymentConfiguration({ ...containerAppContext });
+    }
+
+    const deployWorkspaceProjectInternalContext: DeployWorkspaceProjectInternalContext = Object.assign(containerAppContext, {
+        ...deploymentConfiguration,
+    });
+
     const deployWorkspaceProjectResultContext: DeployWorkspaceProjectContext = await deployWorkspaceProjectInternal(deployWorkspaceProjectInternalContext, {
         suppressActivity: false,
         suppressConfirmation: false,
         suppressContainerAppCreation: false,
+        suppressProgress: false,
         suppressWizardTitle: false
     });
 

src/commands/deployWorkspaceProject/deploymentConfiguration/DeploymentConfiguration.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { type ManagedEnvironment } from "@azure/arm-appcontainers";
 import { type Registry } from "@azure/arm-containerregistry";
 import { type ResourceGroup } from "@azure/arm-resources";
 import { type WorkspaceFolder } from "vscode";
@@ -15,6 +16,7 @@ export interface DeploymentConfiguration {
     srcPath?: string;
     envPath?: string;
     resourceGroup?: ResourceGroup;
+    managedEnvironment?: ManagedEnvironment;
     containerApp?: ContainerAppModel;
     containerRegistry?: Registry;
 }

src/commands/deployWorkspaceProject/deploymentConfiguration/getTreeItemDeploymentConfiguration.ts

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ext } from "../../../extensionVariables";
+import { ContainerAppItem } from "../../../tree/ContainerAppItem";
+import { ManagedEnvironmentItem } from "../../../tree/ManagedEnvironmentItem";
+import { localize } from "../../../utils/localize";
+import { type DeploymentConfiguration } from "./DeploymentConfiguration";
+
+export async function getTreeItemDeploymentConfiguration(item: ContainerAppItem | ManagedEnvironmentItem): Promise<DeploymentConfiguration> {
+    if (ContainerAppItem.isContainerAppItem(item)) {
+        return { containerApp: item.containerApp };
+    } else if (ManagedEnvironmentItem.isManagedEnvironmentItem(item)) {
+        return { managedEnvironment: item.managedEnvironment };
+    } else {
+        const incompatibleMessage: string = localize('incompatibleTreeItem', 'An incompatible tree item was provided to Azure Container Apps for project deployment.');
+        ext.outputChannel.appendLog(localize('incompatibleMessageLog', 'Error: {0}', incompatibleMessage));
+        throw new Error(incompatibleMessage);
+    }
+}