Add output to containerized steps and fix basic create (#4518)

Author: nturinski

src/commands/createFunctionApp/containerImage/ContainerizedFunctionAppCreateStep.ts

@@ -7,7 +7,7 @@ import { type Site, type WebSiteManagementClient } from "@azure/arm-appservice";
 import { type ServiceClient } from "@azure/core-client";
 import { createHttpHeaders, createPipelineRequest } from "@azure/core-rest-pipeline";
 import { LocationListStep, createGenericClient } from "@microsoft/vscode-azext-azureutils";
-import { AzureWizardExecuteStep, nonNullProp } from "@microsoft/vscode-azext-utils";
+import { AzureWizardExecuteStepWithActivityOutput, nonNullProp } from "@microsoft/vscode-azext-utils";
 import { type AppResource } from "@microsoft/vscode-azext-utils/hostapi";
 import { type Progress } from "vscode";
 import { webProvider } from "../../../constants";
@@ -16,15 +16,33 @@ import { createWebSiteClient } from "../../../utils/azureClients";
 import { getStorageConnectionString } from "../../appSettings/connectionSettings/getLocalConnectionSetting";
 import { type IFunctionAppWizardContext } from "../IFunctionAppWizardContext";
 
-export class ContainerizedFunctionAppCreateStep extends AzureWizardExecuteStep<IFunctionAppWizardContext> {
+export class ContainerizedFunctionAppCreateStep extends AzureWizardExecuteStepWithActivityOutput<IFunctionAppWizardContext> {
+    public stepName: string = 'containerizedFunctionAppCreateStep';
     public priority: number = 140;
 
+    protected getTreeItemLabel(context: IFunctionAppWizardContext): string {
+        const siteName: string = nonNullProp(context, 'newSiteName');
+        return localize('creatingNewApp', 'Create containerized function app "{0}"', siteName);
+    }
+    protected getOutputLogSuccess(context: IFunctionAppWizardContext): string {
+        const siteName: string = nonNullProp(context, 'newSiteName');
+        return localize('createdNewApp', 'Successfully created containerized function app "{0}".', siteName);
+    }
+    protected getOutputLogFail(context: IFunctionAppWizardContext): string {
+        const siteName: string = nonNullProp(context, 'newSiteName');
+        return localize('failedToCreateNewApp', 'Failed to create containerized function app "{0}".', siteName);
+    }
+    protected getOutputLogProgress(context: IFunctionAppWizardContext): string {
+        const siteName: string = nonNullProp(context, 'newSiteName');
+        return localize('creatingNewApp', 'Creating containerized function app "{0}"...', siteName);
+    }
+
     public async execute(context: IFunctionAppWizardContext, progress: Progress<{ message?: string; increment?: number }>): Promise<void> {
         if (!context.deployWorkspaceResult?.registryLoginServer || !context.deployWorkspaceResult?.imageName) {
-            throw new Error(localize('failToCreateApp', 'Failed to create function app. There was an error creating the necessary container resources.'));
+            throw new Error(localize('failToCreateApp', 'Failed to create containerized function app. There was an error creating the necessary container resources.'));
         }
 
-        const message: string = localize('creatingNewApp', 'Creating function app "{0}"...', context.newSiteName);
+        const message: string = localize('creatingNewApp', 'Creating containerized function app "{0}"...', context.newSiteName);
         progress.report({ message });
 
         const siteName: string = nonNullProp(context, 'newSiteName');
@@ -77,23 +95,6 @@ export class ContainerizedFunctionAppCreateStep extends AzureWizardExecuteStep<I
             }
         }
     }
-
-    protected getTreeItemLabel(context: IFunctionAppWizardContext): string {
-        const siteName: string = nonNullProp(context, 'newSiteName');
-        return localize('creatingNewApp', 'Create function app "{0}"', siteName);
-    }
-    protected getOutputLogSuccess(context: IFunctionAppWizardContext): string {
-        const siteName: string = nonNullProp(context, 'newSiteName');
-        return localize('createdNewApp', 'Successfully created function app "{0}".', siteName);
-    }
-    protected getOutputLogFail(context: IFunctionAppWizardContext): string {
-        const siteName: string = nonNullProp(context, 'newSiteName');
-        return localize('failedToCreateNewApp', 'Failed to create function app "{0}".', siteName);
-    }
-    protected getOutputLogProgress(context: IFunctionAppWizardContext): string {
-        const siteName: string = nonNullProp(context, 'newSiteName');
-        return localize('creatingNewApp', 'Creating function app "{0}"...', siteName);
-    }
 }
 
 async function pingContainerizedFunctionApp(context: IFunctionAppWizardContext, client: WebSiteManagementClient, site: Site): Promise<void> {

src/commands/createFunctionApp/containerImage/DeployWorkspaceProjectStep.ts

@@ -3,19 +3,34 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizardExecuteStep } from "@microsoft/vscode-azext-utils";
+import { AzureWizardExecuteStepWithActivityOutput } from "@microsoft/vscode-azext-utils";
 import { type Progress } from "vscode";
-import { ext } from "../../../extensionVariables";
 import { getAzureContainerAppsApi } from "../../../getExtensionApi";
 import { localize } from "../../../localize";
 import { type IFunctionAppWizardContext } from "../IFunctionAppWizardContext";
 
-export class DeployWorkspaceProjectStep extends AzureWizardExecuteStep<IFunctionAppWizardContext> {
+export class DeployWorkspaceProjectStep extends AzureWizardExecuteStepWithActivityOutput<IFunctionAppWizardContext> {
     public priority: number = 137;
+    public stepName: string = 'deployWorkspaceProjectStep';
+
+    public getOutputLogSuccess(context: IFunctionAppWizardContext): string {
+        return localize('deployWorkspaceProjectSuccess', 'Successfully created container resources for "{0}".', context.deployWorkspaceResult?.imageName);
+    }
+    public getOutputLogFail(_context: IFunctionAppWizardContext): string {
+        return localize('deployWorkspaceProjectFail', 'Failed to create container resources.');
+    }
+
+    public getOutputLogProgress(_context: IFunctionAppWizardContext): string {
+        return localize('deployWorkspaceProjectProgress', 'Creating container resources; this may take a few minutes...');
+    }
+    public getTreeItemLabel(context: IFunctionAppWizardContext): string {
+        return context.deployWorkspaceResult ?
+            localize('deployWorkspaceProjectLabel', 'Create container resources for "{0}"', context.deployWorkspaceResult.imageName) :
+            localize('deployWorkspaceProjectLabel', 'Create container resources; this may take a few minutes...'); '';
+    }
 
     public async execute(context: IFunctionAppWizardContext, progress: Progress<{ message?: string; increment?: number }>): Promise<void> {
         const message: string = localize('creatingCAResources', 'Creating container resources; this may take a few minutes...');
-        ext.outputChannel.appendLog(message);
         progress.report({ message });
 
         const containerAppsApi = await getAzureContainerAppsApi(context);

src/commands/createFunctionApp/createCreateFunctionAppComponents.ts

@@ -69,7 +69,8 @@ export async function createCreateFunctionAppComponents(context: ICreateFunction
 
     if (!wizardContext.advancedCreation) {
         LocationListStep.addStep(wizardContext, promptSteps);
-        wizardContext.useFlexConsumptionPlan = true;
+        // if the user is deploying to a container app, do not use a flex consumption plan
+        wizardContext.useFlexConsumptionPlan = true && !context.dockerfilePath;
         wizardContext.stackFilter = getRootFunctionsWorkerRuntime(wizardContext.language);
         promptSteps.push(new ConfigureCommonNamesStep());
         executeSteps.push(new ResourceGroupCreateStep());