@microsoft/teamsfx-core 1.1.2 → 1.1.3-alpha.12edbb86.0

package/build/plugins/solution/fx-solution/arm.js

@@ -2,26 +2,26 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formattedDeploymentError = exports.ArmTemplateRenderContext = exports.getParameterJson = exports.copyParameterJson = exports.deployArmTemplates = exports.doDeployArmTemplates = exports.pollDeploymentStatus = exports.getRequiredOperation = exports.generateArmTemplate = void 0;
+exports.armV2 = exports.formattedDeploymentError = exports.ArmTemplateRenderContext = exports.getParameterJsonV3 = exports.getParameterJson = exports.copyParameterJson = exports.deployArmTemplatesV3 = exports.deployArmTemplates = exports.doDeployArmTemplatesV3 = exports.doDeployArmTemplates = exports.pollDeploymentStatus = exports.getRequiredOperation = exports.generateArmTemplateV3 = exports.generateArmTemplate = void 0;
 const tslib_1 = require("tslib");
+const arm_resources_1 = require("@azure/arm-resources");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const ResourcePluginContainer_1 = require("./ResourcePluginContainer");
-const util_1 = require("./utils/util");
-const util_2 = require("util");
-const common_1 = require("../../../common");
-const path_1 = tslib_1.__importDefault(require("path"));
 const fs = tslib_1.__importStar(require("fs-extra"));
-const constants_1 = require("../../../common/constants");
+const os_1 = tslib_1.__importDefault(require("os"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const typedi_1 = require("typedi");
+const util_1 = require("util");
+const constants_1 = require("./constants");
+const environment_1 = require("../../../core/environment");
+const common_1 = require("../../../common");
+const constants_2 = require("../../../common/constants");
+const cpUtils_1 = require("../../../common/cpUtils");
 const tools_1 = require("../../../common/tools");
-const __1 = require("../../..");
-const constants_2 = require("./constants");
-const arm_resources_1 = require("@azure/arm-resources");
-const progressHelper_1 = require("./utils/progressHelper");
 const folder_1 = require("../../../folder");
+const ResourcePluginContainer_1 = require("./ResourcePluginContainer");
 const bicepChecker_1 = require("./utils/depsChecker/bicepChecker");
-const cpUtils_1 = require("../../../common/cpUtils");
-const _1 = require(".");
-const os_1 = tslib_1.__importDefault(require("os"));
+const progressHelper_1 = require("./utils/progressHelper");
+const util_2 = require("./utils/util");
 const adaptor_1 = require("./v2/adaptor");
 const bicepOrchestrationFileName = "main.bicep";
 const bicepOrchestrationProvisionFileName = "provision.bicep";
@@ -29,6 +29,8 @@ const bicepOrchestrationConfigFileName = "config.bicep";
 const templatesFolder = "./templates/azure";
 const configsFolder = `.${teamsfx_api_1.ConfigFolderName}/configs`;
 const parameterFileNameTemplate = `azure.parameters.${teamsfx_api_1.EnvNamePlaceholder}.json`;
+const pollWaitSeconds = 10;
+const maxRetryTimes = 4;
 // constant string
 const resourceBaseName = "resourceBaseName";
 const parameterName = "parameters";
@@ -38,28 +40,53 @@ const InvalidTemplateErrorCode = "InvalidTemplate";
 async function generateArmTemplate(ctx, selectedPlugins = []) {
     var _a, _b;
     let result;
-    (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.GenerateArmTemplateStart, {
-        [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+    (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GenerateArmTemplateStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
     try {
         result = await doGenerateArmTemplate(ctx, selectedPlugins);
         if (result.isOk()) {
-            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.GenerateArmTemplate, {
-                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
-                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, {
+                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
             });
         }
         else {
-            util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
+            util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
         }
     }
     catch (error) {
-        result = teamsfx_api_1.err(teamsfx_api_1.returnSystemError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToGenerateArmTemplates));
-        util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
+        result = teamsfx_api_1.err(teamsfx_api_1.returnSystemError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToGenerateArmTemplates));
+        util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
     }
     return result;
 }
 exports.generateArmTemplate = generateArmTemplate;
+async function generateArmTemplateV3(ctx, inputs, activatedPlugins, addedPlugins) {
+    var _a, _b;
+    let result;
+    (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GenerateArmTemplateStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+    });
+    try {
+        result = await doGenerateArmTemplateV3(ctx, inputs, activatedPlugins, addedPlugins);
+        if (result.isOk()) {
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, {
+                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+            });
+        }
+        else {
+            util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
+        }
+    }
+    catch (error) {
+        result = teamsfx_api_1.err(teamsfx_api_1.returnSystemError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToGenerateArmTemplates));
+        util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GenerateArmTemplate, result.error, ctx.telemetryReporter);
+    }
+    return result;
+}
+exports.generateArmTemplateV3 = generateArmTemplateV3;
 function getRequiredOperation(operation, deployCtx) {
     var _a, _b, _c, _d, _e, _f, _g;
     if (((_b = (_a = operation.properties) === null || _a === void 0 ? void 0 : _a.targetResource) === null || _b === void 0 ? void 0 : _b.resourceName) &&
@@ -74,6 +101,7 @@ function getRequiredOperation(operation, deployCtx) {
                 resourceName: (_g = (_f = operation.properties) === null || _f === void 0 ? void 0 : _f.targetResource) === null || _g === void 0 ? void 0 : _g.resourceName,
                 resourceGroupName: resourceGroupName,
                 subscriptionId: subscriptionId,
+                resourceType: operation.properties.targetResource.resourceType,
                 status: operation.properties.provisioningState,
             };
         }
@@ -88,13 +116,12 @@ function getRequiredOperation(operation, deployCtx) {
 exports.getRequiredOperation = getRequiredOperation;
 async function pollDeploymentStatus(deployCtx) {
     var _a, _b, _c;
-    const failedCount = 4;
     let tryCount = 0;
     let previousStatus = {};
     let polledOperations = [];
-    (_a = deployCtx.ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_2.format(common_1.getStrings().solution.DeployArmTemplates.PollDeploymentStatusNotice, constants_1.PluginDisplayName.Solution));
+    (_a = deployCtx.ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.PollDeploymentStatusNotice, constants_2.PluginDisplayName.Solution));
     while (!deployCtx.finished) {
-        await tools_1.waitSeconds(10);
+        await tools_1.waitSeconds(pollWaitSeconds);
         try {
             const operations = await deployCtx.client.deploymentOperations.list(deployCtx.resourceGroupName, deployCtx.deploymentName);
             if (deployCtx.finished) {
@@ -108,24 +135,27 @@ async function pollDeploymentStatus(deployCtx) {
                     currentStatus[operation.resourceName] = operation.status;
                     if (!polledOperations.includes(operation.resourceName)) {
                         polledOperations.push(operation.resourceName);
-                        let client = deployCtx.client;
-                        if (operation.subscriptionId !== deployCtx.client.subscriptionId) {
-                            const azureToken = await ((_a = deployCtx.ctx.azureAccountProvider) === null || _a === void 0 ? void 0 : _a.getAccountCredentialAsync());
-                            client = new arm_resources_1.ResourceManagementClient(azureToken, operation.subscriptionId);
-                        }
-                        const subOperations = await client.deploymentOperations.list(operation.resourceGroupName, operation.resourceName);
-                        subOperations.forEach((sub) => {
-                            const subOperation = getRequiredOperation(sub, deployCtx);
-                            if (subOperation) {
-                                currentStatus[subOperation.resourceName] = subOperation.status;
+                        // get sub operations when resource type is deployments.
+                        if (operation.resourceType === constants_2.ConstantString.DeploymentResourceType) {
+                            let client = deployCtx.client;
+                            if (operation.subscriptionId !== deployCtx.client.subscriptionId) {
+                                const azureToken = await ((_a = deployCtx.ctx.azureAccountProvider) === null || _a === void 0 ? void 0 : _a.getAccountCredentialAsync());
+                                client = new arm_resources_1.ResourceManagementClient(azureToken, operation.subscriptionId);
                             }
-                        });
+                            const subOperations = await client.deploymentOperations.list(operation.resourceGroupName, operation.resourceName);
+                            subOperations.forEach((sub) => {
+                                const subOperation = getRequiredOperation(sub, deployCtx);
+                                if (subOperation) {
+                                    currentStatus[subOperation.resourceName] = subOperation.status;
+                                }
+                            });
+                        }
                     }
                 }
             }));
             for (const key in currentStatus) {
                 if (currentStatus[key] !== previousStatus[key]) {
-                    (_b = deployCtx.ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[${constants_1.PluginDisplayName.Solution}] ${key} -> ${currentStatus[key]}`);
+                    (_b = deployCtx.ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[${constants_2.PluginDisplayName.Solution}] ${key} -> ${currentStatus[key]}`);
                 }
             }
             previousStatus = currentStatus;
@@ -133,33 +163,37 @@ async function pollDeploymentStatus(deployCtx) {
         }
         catch (error) {
             tryCount++;
-            if (tryCount > failedCount) {
-                throw error;
+            if (tryCount < maxRetryTimes) {
+                (_c = deployCtx.ctx.logProvider) === null || _c === void 0 ? void 0 : _c.warning(`[${constants_2.PluginDisplayName.Solution}] ${deployCtx.deploymentName} -> waiting to get deplomyment status [Retry time: ${tryCount}]`);
+            }
+            else if (tryCount === maxRetryTimes) {
+                const pollError = teamsfx_api_1.returnSystemError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToPollArmDeploymentStatus);
+                util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ArmDeployment, pollError, deployCtx.ctx.telemetryReporter);
             }
-            (_c = deployCtx.ctx.logProvider) === null || _c === void 0 ? void 0 : _c.warning(`[${constants_1.PluginDisplayName.Solution}] ${deployCtx.deploymentName} -> waiting to get deplomyment status [${tryCount}]`);
         }
     }
 }
 exports.pollDeploymentStatus = pollDeploymentStatus;
 async function doDeployArmTemplates(ctx) {
     var _a, _b, _c;
-    const progressHandler = await progressHelper_1.ProgressHelper.startDeployArmTemplatesProgressHandler(util_1.getPluginContext(ctx, constants_2.PluginNames.SOLUTION));
+    const progressHandler = await progressHelper_1.ProgressHelper.startDeployArmTemplatesProgressHandler(ctx.ui);
     await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(progressHelper_1.DeployArmTemplatesSteps.ExecuteDeployment));
     // update parameters
     const parameterJson = await getParameterJson(ctx);
-    const resourceGroupName = (_a = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.getString(constants_2.RESOURCE_GROUP_NAME);
+    const resourceGroupName = (_a = ctx.envInfo.state.get(constants_1.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.getString(constants_1.RESOURCE_GROUP_NAME);
     if (!resourceGroupName) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to get resource group from project solution settings."), constants_2.SolutionSource, "NoResourceGroupFound"));
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to get resource group from project solution settings."), constants_1.SolutionSource, "NoResourceGroupFound"));
     }
-    const bicepCommand = await bicepChecker_1.ensureBicep(ctx);
+    const bicepCommand = await bicepChecker_1.ensureBicep(ctx, ctx.answers);
     // Compile bicep file to json
     const templateDir = path_1.default.join(ctx.root, templatesFolder);
     const bicepOrchestrationFilePath = path_1.default.join(templateDir, bicepOrchestrationFileName);
     const armTemplateJson = await compileBicepToJson(bicepCommand, bicepOrchestrationFilePath, ctx.logProvider);
-    (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(util_2.format(common_1.getStrings().solution.DeployArmTemplates.CompileBicepSuccessNotice, constants_1.PluginDisplayName.Solution));
+    (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.CompileBicepSuccessNotice, constants_2.PluginDisplayName.Solution));
     // deploy arm templates to azure
-    const client = await getResourceManagementClientForArmDeployment(ctx);
-    const deploymentName = `${constants_1.PluginDisplayName.Solution}_deployment`.replace(" ", "_").toLowerCase();
+    const subscriptionId = (_c = ctx.envInfo.state.get(constants_1.GLOBAL_CONFIG)) === null || _c === void 0 ? void 0 : _c.get(constants_1.SUBSCRIPTION_ID);
+    const client = await getResourceManagementClientForArmDeployment(ctx.azureAccountProvider, subscriptionId);
+    const deploymentName = `${constants_2.PluginDisplayName.Solution}_deployment`.replace(" ", "_").toLowerCase();
     const deploymentParameters = {
         properties: {
             parameters: parameterJson.parameters,
@@ -180,8 +214,8 @@ async function doDeployArmTemplates(ctx) {
             .createOrUpdate(resourceGroupName, deploymentName, deploymentParameters)
             .then((result) => {
             var _a, _b;
-            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_2.format(common_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_1.PluginDisplayName.Solution, resourceGroupName, deploymentName));
-            syncArmOutput(ctx, (_b = result.properties) === null || _b === void 0 ? void 0 : _b.outputs);
+            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_2.PluginDisplayName.Solution, resourceGroupName, deploymentName));
+            syncArmOutput(ctx.envInfo, (_b = result.properties) === null || _b === void 0 ? void 0 : _b.outputs);
             return result;
         })
             .finally(() => {
@@ -194,7 +228,7 @@ async function doDeployArmTemplates(ctx) {
     catch (error) {
         // return the error if the template is invalid
         if (error.code === InvalidTemplateErrorCode) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToValidateArmTemplates));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToValidateArmTemplates));
         }
         // try to get deployment error
         const result = await wrapGetDeploymentError(deployCtx, resourceGroupName, deploymentName);
@@ -202,21 +236,14 @@ async function doDeployArmTemplates(ctx) {
             const deploymentError = result.value;
             // return thrown error if deploymentError is empty
             if (!deploymentError) {
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToDeployArmTemplatesToAzure));
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure));
             }
             const deploymentErrorObj = formattedDeploymentError(deploymentError);
             const deploymentErrorMessage = JSON.stringify(deploymentErrorObj, undefined, 2);
-            const errorMessage = util_2.format(common_1.getStrings().solution.DeployArmTemplates.FailNotice, constants_1.PluginDisplayName.Solution, resourceGroupName, deploymentName);
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.error(errorMessage +
-                `\nError message: ${error.message}\nDetailed message: \n${deploymentErrorMessage}\nGet toolkit help from ${constants_1.HelpLinks.ArmHelpLink}.`);
-            let failedDeployments = [];
-            if (deploymentError.subErrors) {
-                failedDeployments = Object.keys(deploymentError.subErrors);
-            }
-            else {
-                failedDeployments.push(deploymentName);
-            }
-            const returnError = formattedDeploymentName(failedDeployments);
+            let errorMessage = util_1.format(common_1.getStrings().solution.DeployArmTemplates.FailNotice, constants_2.PluginDisplayName.Solution, resourceGroupName, deploymentName);
+            errorMessage += `\nError message: ${error.message}\nDetailed message: \n${deploymentErrorMessage}\nGet toolkit help from ${constants_2.HelpLinks.ArmHelpLink}.`;
+            const notificationMessage = getNotificationMessage(deploymentError, deploymentName);
+            const returnError = new teamsfx_api_1.UserError(new Error(errorMessage), constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure, constants_2.HelpLinks.ArmHelpLink, notificationMessage);
             returnError.innerError = JSON.stringify(deploymentErrorObj);
             return teamsfx_api_1.err(returnError);
         }
@@ -226,7 +253,86 @@ async function doDeployArmTemplates(ctx) {
     }
 }
 exports.doDeployArmTemplates = doDeployArmTemplates;
-function syncArmOutput(ctx, armOutput) {
+async function doDeployArmTemplatesV3(ctx, inputs, envInfo, azureAccountProvider) {
+    var _a;
+    const progressHandler = await progressHelper_1.ProgressHelper.startDeployArmTemplatesProgressHandler(ctx.userInteraction);
+    await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(progressHelper_1.DeployArmTemplatesSteps.ExecuteDeployment));
+    // update parameters
+    const parameterJson = await getParameterJsonV3(ctx, inputs.projectPath, envInfo);
+    const envState = envInfo.state;
+    const resourceGroupName = envState.solution.resourceGroupName;
+    if (!resourceGroupName) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to get resource group from project solution settings."), constants_1.SolutionSource, "NoResourceGroupFound"));
+    }
+    const bicepCommand = await bicepChecker_1.ensureBicep(ctx, inputs);
+    // Compile bicep file to json
+    const templateDir = path_1.default.join(inputs.projectPath, templatesFolder);
+    const bicepOrchestrationFilePath = path_1.default.join(templateDir, bicepOrchestrationFileName);
+    const armTemplateJson = await compileBicepToJson(bicepCommand, bicepOrchestrationFilePath, ctx.logProvider);
+    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.CompileBicepSuccessNotice, constants_2.PluginDisplayName.Solution));
+    // deploy arm templates to azure
+    const client = await getResourceManagementClientForArmDeployment(azureAccountProvider, envState.solution.subscriptionId);
+    const deploymentName = `${constants_2.PluginDisplayName.Solution}_deployment`.replace(" ", "_").toLowerCase();
+    const deploymentParameters = {
+        properties: {
+            parameters: parameterJson.parameters,
+            template: armTemplateJson,
+            mode: "Incremental",
+        },
+    };
+    const deployCtx = {
+        ctx: ctx,
+        finished: false,
+        deploymentStartTime: Date.now(),
+        client: client,
+        resourceGroupName: resourceGroupName,
+        deploymentName: deploymentName,
+    };
+    try {
+        const result = client.deployments
+            .createOrUpdate(resourceGroupName, deploymentName, deploymentParameters)
+            .then((result) => {
+            var _a, _b;
+            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_2.PluginDisplayName.Solution, resourceGroupName, deploymentName));
+            syncArmOutput(envInfo, (_b = result.properties) === null || _b === void 0 ? void 0 : _b.outputs);
+            return result;
+        })
+            .finally(() => {
+            deployCtx.finished = true;
+        });
+        await pollDeploymentStatus(deployCtx);
+        await result;
+        return teamsfx_api_1.ok(undefined);
+    }
+    catch (error) {
+        // return the error if the template is invalid
+        if (error.code === InvalidTemplateErrorCode) {
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToValidateArmTemplates));
+        }
+        // try to get deployment error
+        const result = await wrapGetDeploymentError(deployCtx, resourceGroupName, deploymentName);
+        if (result.isOk()) {
+            const deploymentError = result.value;
+            // return thrown error if deploymentError is empty
+            if (!deploymentError) {
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure));
+            }
+            const deploymentErrorObj = formattedDeploymentError(deploymentError);
+            const deploymentErrorMessage = JSON.stringify(deploymentErrorObj, undefined, 2);
+            let errorMessage = util_1.format(common_1.getStrings().solution.DeployArmTemplates.FailNotice, constants_2.PluginDisplayName.Solution, resourceGroupName, deploymentName);
+            errorMessage += `\nError message: ${error.message}\nDetailed message: \n${deploymentErrorMessage}\nGet toolkit help from ${constants_2.HelpLinks.ArmHelpLink}.`;
+            const notificationMessage = getNotificationMessage(deploymentError, deploymentName);
+            const returnError = new teamsfx_api_1.UserError(new Error(errorMessage), constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure, constants_2.HelpLinks.ArmHelpLink, notificationMessage);
+            returnError.innerError = JSON.stringify(deploymentErrorObj);
+            return teamsfx_api_1.err(returnError);
+        }
+        else {
+            return result;
+        }
+    }
+}
+exports.doDeployArmTemplatesV3 = doDeployArmTemplatesV3;
+function syncArmOutput(envInfo, armOutput) {
     var _a;
     if (armOutput instanceof Object) {
         const armOutputKeys = Object.keys(armOutput);
@@ -237,13 +343,19 @@ function syncArmOutput(ctx, armOutput) {
                 for (const moduleOutputKey of moduleOutputKeys) {
                     const pluginOutput = moduleOutput[moduleOutputKey].value;
                     if (pluginOutput instanceof Object) {
-                        const pluginId = pluginOutput[_1.TEAMS_FX_RESOURCE_ID_KEY];
+                        const pluginId = pluginOutput[constants_1.TEAMS_FX_RESOURCE_ID_KEY];
                         if (pluginId) {
                             const pluginOutputKeys = Object.keys(pluginOutput);
                             for (const pluginOutputKey of pluginOutputKeys) {
-                                if (pluginOutputKey != _1.TEAMS_FX_RESOURCE_ID_KEY) {
-                                    (_a = ctx.envInfo.state
-                                        .get(pluginId)) === null || _a === void 0 ? void 0 : _a.set(pluginOutputKey, pluginOutput[pluginOutputKey]);
+                                if (pluginOutputKey != constants_1.TEAMS_FX_RESOURCE_ID_KEY) {
+                                    if (envInfo.state instanceof Map) {
+                                        (_a = envInfo.state
+                                            .get(pluginId)) === null || _a === void 0 ? void 0 : _a.set(pluginOutputKey, pluginOutput[pluginOutputKey]);
+                                    }
+                                    else {
+                                        envInfo.state[pluginId][pluginOutputKey] =
+                                            pluginOutput[pluginOutputKey];
+                                    }
                                 }
                             }
                         }
@@ -255,58 +367,88 @@ function syncArmOutput(ctx, armOutput) {
 }
 async function deployArmTemplates(ctx) {
     var _a, _b, _c;
-    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_2.format(common_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_1.PluginDisplayName.Solution));
+    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_2.PluginDisplayName.Solution));
     let result;
-    (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ArmDeploymentStart, {
-        [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+    (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ArmDeploymentStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
     try {
         result = await doDeployArmTemplates(ctx);
         if (result.isOk()) {
-            (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ArmDeployment, {
-                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
-                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+            (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ArmDeployment, {
+                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
             });
         }
         else {
             const errorProperties = {};
             if (result.error.innerError) {
-                errorProperties[constants_2.SolutionTelemetryProperty.ArmDeploymentError] = result.error.innerError;
+                errorProperties[constants_1.SolutionTelemetryProperty.ArmDeploymentError] = result.error.innerError;
             }
-            util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter, errorProperties);
+            util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter, errorProperties);
         }
     }
     catch (error) {
-        result = teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToDeployArmTemplatesToAzure));
-        util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter);
+        result = teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure));
+        util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter);
     }
     await progressHelper_1.ProgressHelper.endDeployArmTemplatesProgress(result.isOk());
     return result;
 }
 exports.deployArmTemplates = deployArmTemplates;
-async function copyParameterJson(ctx, targetEnvName, sourceEnvName) {
+async function deployArmTemplatesV3(ctx, inputs, envInfo, azureAccountProvider) {
+    var _a, _b, _c;
+    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util_1.format(common_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_2.PluginDisplayName.Solution));
+    let result;
+    (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ArmDeploymentStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+    });
+    try {
+        result = await doDeployArmTemplatesV3(ctx, inputs, envInfo, azureAccountProvider);
+        if (result.isOk()) {
+            (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ArmDeployment, {
+                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+            });
+        }
+        else {
+            const errorProperties = {};
+            if (result.error.innerError) {
+                errorProperties[constants_1.SolutionTelemetryProperty.ArmDeploymentError] = result.error.innerError;
+            }
+            util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter, errorProperties);
+        }
+    }
+    catch (error) {
+        result = teamsfx_api_1.err(teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToDeployArmTemplatesToAzure));
+        util_2.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ArmDeployment, result.error, ctx.telemetryReporter);
+    }
+    await progressHelper_1.ProgressHelper.endDeployArmTemplatesProgress(result.isOk());
+    return result;
+}
+exports.deployArmTemplatesV3 = deployArmTemplatesV3;
+async function copyParameterJson(projectPath, appName, targetEnvName, sourceEnvName) {
     var _a, _b, _c;
     if (!targetEnvName || !sourceEnvName) {
         return;
     }
-    const parameterFolderPath = path_1.default.join(ctx.root, configsFolder);
+    const parameterFolderPath = path_1.default.join(projectPath, configsFolder);
     const targetParameterFileName = parameterFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, targetEnvName);
     const sourceParameterFileName = parameterFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, sourceEnvName);
     const targetParameterFilePath = path_1.default.join(parameterFolderPath, targetParameterFileName);
     const sourceParameterFilePath = path_1.default.join(parameterFolderPath, sourceParameterFileName);
     const targetParameterContent = await fs.readJson(sourceParameterFilePath);
     if ((_c = (_b = (_a = targetParameterContent[parameterName]) === null || _a === void 0 ? void 0 : _a.provisionParameters) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.resourceBaseName) {
-        const appName = ctx.projectSettings.appName;
         targetParameterContent[parameterName].provisionParameters.value.resourceBaseName =
             generateResourceBaseName(appName, targetEnvName);
     }
     await fs.ensureDir(parameterFolderPath);
-    await fs.writeFile(targetParameterFilePath, JSON.stringify(targetParameterContent, undefined, 4));
+    await fs.writeFile(targetParameterFilePath, JSON.stringify(targetParameterContent, undefined, 4).replace(/\r?\n/g, os_1.default.EOL));
 }
 exports.copyParameterJson = copyParameterJson;
 async function getParameterJson(ctx) {
-    var _a, _b;
-    if (!((_a = ctx.envInfo) === null || _a === void 0 ? void 0 : _a.envName)) {
+    var _a;
+    if (!ctx.envInfo.envName) {
         throw new Error("Failed to get target environment name from solution context.");
     }
     const parameterFileName = parameterFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, ctx.envInfo.envName);
@@ -316,14 +458,34 @@ async function getParameterJson(ctx) {
         await fs.stat(parameterFilePath);
     }
     catch (err) {
-        (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.error(`[${constants_1.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
-        const returnError = new Error(`[${constants_1.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
-        throw teamsfx_api_1.returnUserError(returnError, constants_2.SolutionSource, "ParameterFileNotExist");
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_2.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
+        const returnError = new Error(`[${constants_2.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
+        throw teamsfx_api_1.returnUserError(returnError, constants_1.SolutionSource, "ParameterFileNotExist");
     }
     const parameterJson = await getExpandedParameter(ctx, parameterFilePath); // only expand secrets in memory
     return parameterJson;
 }
 exports.getParameterJson = getParameterJson;
+async function getParameterJsonV3(ctx, projectPath, envInfo) {
+    var _a;
+    if (!(envInfo === null || envInfo === void 0 ? void 0 : envInfo.envName)) {
+        throw new Error("Failed to get target environment name from solution context.");
+    }
+    const parameterFileName = parameterFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, envInfo.envName);
+    const parameterFolderPath = path_1.default.join(projectPath, configsFolder);
+    const parameterFilePath = path_1.default.join(parameterFolderPath, parameterFileName);
+    try {
+        await fs.stat(parameterFilePath);
+    }
+    catch (err) {
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_2.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
+        const returnError = new Error(`[${constants_2.PluginDisplayName.Solution}] ${parameterFilePath} does not exist.`);
+        throw teamsfx_api_1.returnUserError(returnError, constants_1.SolutionSource, "ParameterFileNotExist");
+    }
+    const parameterJson = await getExpandedParameterV3(ctx, envInfo, parameterFilePath); // only expand secrets in memory
+    return parameterJson;
+}
+exports.getParameterJsonV3 = getParameterJsonV3;
 function generateArmFromResult(result, bicepOrchestrationTemplate, pluginWithArm, moduleProvisionFiles, moduleConfigFiles) {
     var _a, _b;
     bicepOrchestrationTemplate.applyTemplate(pluginWithArm.name, result);
@@ -343,28 +505,29 @@ function generateArmFromResult(result, bicepOrchestrationTemplate, pluginWithArm
     }
 }
 async function doGenerateArmTemplate(ctx, selectedPlugins) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const azureSolutionSettings = (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
     const baseName = generateResourceBaseName(ctx.projectSettings.appName, ctx.envInfo.envName);
-    const plugins = __1.isV2()
-        ? ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p))
-        : ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p)); // This function ensures return result won't be empty
     const bicepOrchestrationTemplate = new BicepOrchestrationContent(plugins.map((p) => p.name), baseName);
     const moduleProvisionFiles = new Map();
     const moduleConfigFiles = new Map();
     // Get bicep content from each resource plugin
     for (const plugin of plugins) {
         const pluginWithArm = plugin; // Temporary solution before adding it to teamsfx-api
-        const pluginContext = util_1.getPluginContext(ctx, pluginWithArm.name);
+        const pluginContext = util_2.getPluginContext(ctx, pluginWithArm.name);
         let result;
         let errMessage = "";
+        let method = "";
         if (pluginWithArm.updateArmTemplates &&
             !selectedPlugins.find((pluginItem) => pluginItem.name === pluginWithArm.name)) {
+            method = "updateArmTemplates";
             result = (await pluginWithArm.updateArmTemplates(pluginContext));
             errMessage = common_1.getStrings().solution.UpdateArmTemplateFailNotice;
         }
         else if (pluginWithArm.generateArmTemplates &&
             selectedPlugins.find((pluginItem) => pluginItem.name === pluginWithArm.name)) {
+            method = "generateArmTemplates";
             result = (await pluginWithArm.generateArmTemplates(pluginContext));
             errMessage = common_1.getStrings().solution.GenerateArmTemplateFailNotice;
         }
@@ -372,22 +535,69 @@ async function doGenerateArmTemplate(ctx, selectedPlugins) {
             continue;
         }
         if (result.isOk()) {
+            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[arm] ${plugin.name}.${method} success!`);
             generateArmFromResult(result.value, bicepOrchestrationTemplate, pluginWithArm, moduleProvisionFiles, moduleConfigFiles);
         }
         else {
-            const msg = util_2.format(errMessage, (_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.appName);
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.error(msg);
+            const msg = util_1.format(errMessage, (_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.appName);
+            (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.error(msg);
             return result;
         }
     }
+    await persistBicepTemplates(bicepOrchestrationTemplate, moduleProvisionFiles, moduleConfigFiles, ctx.root);
+    return teamsfx_api_1.ok(undefined); // Nothing to return when success
+}
+async function doGenerateArmTemplateV3(ctx, inputs, activatedPlugins, addedPlugins) {
+    var _a;
+    const baseName = generateResourceBaseName(ctx.projectSetting.appName, "");
+    const bicepOrchestrationTemplate = new BicepOrchestrationContent(activatedPlugins.map((p) => p.name), baseName);
+    const moduleProvisionFiles = new Map();
+    const moduleConfigFiles = new Map();
+    const addedSet = new Set();
+    addedPlugins.forEach((p) => addedSet.add(p.name));
+    for (const plugin of activatedPlugins) {
+        let result;
+        let errMessage = "";
+        let method = "";
+        const isAdd = addedSet.has(plugin.name);
+        if (plugin.updateResourceTemplate && !isAdd) {
+            result = await plugin.updateResourceTemplate(ctx, inputs);
+            errMessage = common_1.getStrings().solution.UpdateArmTemplateFailNotice;
+            method = "updateResourceTemplate";
+        }
+        else if (plugin.generateResourceTemplate && isAdd) {
+            result = await plugin.generateResourceTemplate(ctx, inputs);
+            errMessage = common_1.getStrings().solution.GenerateArmTemplateFailNotice;
+            method = "generateResourceTemplate";
+        }
+        else {
+            continue;
+        }
+        if (result.isOk()) {
+            ctx.logProvider.info(`[arm] ${plugin.name}.${method} success!`);
+            if (result.value.kind === "bicep") {
+                const armTemplate = result.value.template;
+                generateArmFromResult(armTemplate, bicepOrchestrationTemplate, plugin, moduleProvisionFiles, moduleConfigFiles);
+            }
+        }
+        else {
+            const msg = util_1.format(errMessage, ctx.projectSetting.appName);
+            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(msg);
+            return result;
+        }
+    }
+    await persistBicepTemplates(bicepOrchestrationTemplate, moduleProvisionFiles, moduleConfigFiles, inputs.projectPath);
+    return teamsfx_api_1.ok(undefined); // Nothing to return when success
+}
+async function persistBicepTemplates(bicepOrchestrationTemplate, moduleProvisionFiles, moduleConfigFiles, projectaPath) {
     // Write bicep content to project folder
     if (bicepOrchestrationTemplate.needsGenerateTemplate()) {
         // Output parameter file
-        const envListResult = await __1.environmentManager.listEnvConfigs(ctx.root);
+        const envListResult = await environment_1.environmentManager.listEnvConfigs(projectaPath);
         if (envListResult.isErr()) {
             return teamsfx_api_1.err(envListResult.error);
         }
-        const parameterEnvFolderPath = path_1.default.join(ctx.root, configsFolder);
+        const parameterEnvFolderPath = path_1.default.join(projectaPath, configsFolder);
         await fs.ensureDir(parameterEnvFolderPath);
         for (const env of envListResult.value) {
             const parameterFileName = parameterFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, env);
@@ -401,33 +611,33 @@ async function doGenerateArmTemplate(ctx, selectedPlugins) {
                     const duplicateParam = Object.keys(parameterObj).filter((val) => Object.keys(appendParam).includes(val));
                     if (duplicateParam && duplicateParam.length != 0) {
                         const duplicateParamError = new Error(`There are some duplicate parameters in ${parameterEnvFilePath}, to avoid the conflict, please modify these parameter names: ${duplicateParam}`);
-                        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(duplicateParamError, constants_2.SolutionSource, constants_2.SolutionError.FailedToUpdateArmParameters, constants_1.HelpLinks.ArmHelpLink));
+                        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(duplicateParamError, constants_1.SolutionSource, constants_1.SolutionError.FailedToUpdateArmParameters, constants_2.HelpLinks.ArmHelpLink));
                     }
                     parameterFile.parameters.provisionParameters.value = Object.assign(parameterObj, appendParam);
                     parameterFileContent = JSON.stringify(parameterFile, undefined, 2);
                 }
                 catch (error) {
                     const parameterFileError = new Error(`There are some errors in ${parameterEnvFilePath}, please make sure this file is valid. The error message is ${error.message}`);
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(parameterFileError, constants_2.SolutionSource, constants_2.SolutionError.FailedToUpdateArmParameters, constants_1.HelpLinks.ArmHelpLink));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(parameterFileError, constants_1.SolutionSource, constants_1.SolutionError.FailedToUpdateArmParameters, constants_2.HelpLinks.ArmHelpLink));
                 }
             }
             else {
                 parameterFileContent = bicepOrchestrationTemplate.getParameterFileContent();
             }
-            await fs.writeFile(parameterEnvFilePath, parameterFileContent);
+            await fs.writeFile(parameterEnvFilePath, parameterFileContent.replace(/\r?\n/g, os_1.default.EOL));
         }
         // Generate main.bicep, config.bicep, provision.bicep
-        const templateFolderPath = path_1.default.join(ctx.root, templatesFolder);
+        const templateFolderPath = path_1.default.join(projectaPath, templatesFolder);
         await fs.ensureDir(templateFolderPath);
         await fs.ensureDir(path_1.default.join(templateFolderPath, "teamsFx"));
         await fs.ensureDir(path_1.default.join(templateFolderPath, "provision"));
         let bicepOrchestrationProvisionContent = "";
         let bicepOrchestrationConfigContent = "";
         if (!(await fs.pathExists(path_1.default.join(templateFolderPath, bicepOrchestrationProvisionFileName)))) {
-            bicepOrchestrationProvisionContent = await fs.readFile(path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "solution", "provision.bicep"), constants_1.ConstantString.UTF8Encoding);
+            bicepOrchestrationProvisionContent = await fs.readFile(path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "solution", "provision.bicep"), constants_2.ConstantString.UTF8Encoding);
         }
         if (!(await fs.pathExists(path_1.default.join(templateFolderPath, bicepOrchestrationConfigFileName)))) {
-            bicepOrchestrationConfigContent = await fs.readFile(path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "solution", "config.bicep"), constants_1.ConstantString.UTF8Encoding);
+            bicepOrchestrationConfigContent = await fs.readFile(path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "solution", "config.bicep"), constants_2.ConstantString.UTF8Encoding);
         }
         bicepOrchestrationProvisionContent +=
             os_1.default.EOL + bicepOrchestrationTemplate.getOrchestractionProvisionContent();
@@ -437,42 +647,51 @@ async function doGenerateArmTemplate(ctx, selectedPlugins) {
         if (!(await fs.pathExists(path_1.default.join(templateFolderPath, bicepOrchestrationFileName)))) {
             await fs.copyFile(path_1.default.join(templateSolitionPath, bicepOrchestrationFileName), path_1.default.join(templateFolderPath, bicepOrchestrationFileName));
         }
-        await fs.appendFile(path_1.default.join(templateFolderPath, bicepOrchestrationProvisionFileName), bicepOrchestrationProvisionContent);
-        await fs.appendFile(path_1.default.join(templateFolderPath, bicepOrchestrationConfigFileName), bicepOrchestrationConfigContent);
+        await fs.appendFile(path_1.default.join(templateFolderPath, bicepOrchestrationProvisionFileName), bicepOrchestrationProvisionContent.replace(/\r?\n/g, os_1.default.EOL));
+        await fs.appendFile(path_1.default.join(templateFolderPath, bicepOrchestrationConfigFileName), bicepOrchestrationConfigContent.replace(/\r?\n/g, os_1.default.EOL));
         // Generate module provision bicep files
         for (const module of moduleProvisionFiles) {
             const res = bicepOrchestrationTemplate.applyReference(module[1]);
-            await fs.appendFile(path_1.default.join(templateFolderPath, module[0]), res);
+            await fs.appendFile(path_1.default.join(templateFolderPath, module[0]), res.replace(/\r?\n/g, os_1.default.EOL));
         }
         // Generate module configuration bicep files
         for (const module of moduleConfigFiles) {
             const res = bicepOrchestrationTemplate.applyReference(module[1]);
-            await fs.writeFile(path_1.default.join(templateFolderPath, module[0]), res);
+            await fs.writeFile(path_1.default.join(templateFolderPath, module[0]), res.replace(/\r?\n/g, os_1.default.EOL));
         }
     }
-    return teamsfx_api_1.ok(undefined); // Nothing to return when success
 }
 async function getExpandedParameter(ctx, filePath) {
     var _a;
     try {
-        const parameterTemplate = await fs.readFile(filePath, constants_1.ConstantString.UTF8Encoding);
+        const parameterTemplate = await fs.readFile(filePath, constants_2.ConstantString.UTF8Encoding);
         const parameterJsonString = expandParameterPlaceholders(ctx, parameterTemplate);
         return JSON.parse(parameterJsonString);
     }
     catch (err) {
-        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_1.PluginDisplayName.Solution}] Failed to get expanded parameter from ${filePath}.`);
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_2.PluginDisplayName.Solution}] Failed to get expanded parameter from ${filePath}.`);
         throw err;
     }
 }
-async function getResourceManagementClientForArmDeployment(ctx) {
-    var _a, _b;
-    const azureToken = await ((_a = ctx.azureAccountProvider) === null || _a === void 0 ? void 0 : _a.getAccountCredentialAsync());
+async function getExpandedParameterV3(ctx, envInfo, filePath) {
+    var _a;
+    try {
+        const parameterTemplate = await fs.readFile(filePath, constants_2.ConstantString.UTF8Encoding);
+        const parameterJsonString = expandParameterPlaceholdersV3(ctx, envInfo, parameterTemplate);
+        return JSON.parse(parameterJsonString);
+    }
+    catch (err) {
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_2.PluginDisplayName.Solution}] Failed to get expanded parameter from ${filePath}.`);
+        throw err;
+    }
+}
+async function getResourceManagementClientForArmDeployment(azureAccountProvider, subscriptionId) {
+    const azureToken = await azureAccountProvider.getAccountCredentialAsync();
     if (!azureToken) {
-        throw teamsfx_api_1.returnSystemError(new Error("Azure Credential is invalid."), constants_1.PluginDisplayName.Solution, constants_2.SolutionError.FailedToGetAzureCredential);
+        throw teamsfx_api_1.returnSystemError(new Error("Azure Credential is invalid."), constants_2.PluginDisplayName.Solution, constants_1.SolutionError.FailedToGetAzureCredential);
     }
-    const subscriptionId = (_b = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.get(constants_2.SUBSCRIPTION_ID);
     if (!subscriptionId) {
-        throw teamsfx_api_1.returnSystemError(new Error(`Failed to get subscription id.`), constants_1.PluginDisplayName.Solution, constants_2.SolutionError.NoSubscriptionSelected);
+        throw teamsfx_api_1.returnSystemError(new Error(`Failed to get subscription id.`), constants_2.PluginDisplayName.Solution, constants_1.SolutionError.NoSubscriptionSelected);
     }
     return new arm_resources_1.ResourceManagementClient(azureToken, subscriptionId);
 }
@@ -488,32 +707,34 @@ async function compileBicepToJson(bicepCommand, bicepOrchestrationFilePath, logg
 // Context used by handlebars to render the main.bicep file
 class ArmTemplateRenderContext {
     constructor(pluginNames) {
-        this.Plugins = pluginNames;
-        this.PluginOutput = {};
+        this.Plugins = {};
+        for (const plugin of pluginNames) {
+            this.Plugins[plugin] = {};
+        }
     }
     addPluginOutput(pluginName, armResult) {
-        var _a, _b, _c;
-        const pluginOutputContext = {
+        var _a, _b;
+        const PluginContext = {
             Provision: {},
             Configuration: {},
             References: {},
         };
         const provision = (_a = armResult.Provision) === null || _a === void 0 ? void 0 : _a.Modules;
-        const references = (_b = armResult.Provision) === null || _b === void 0 ? void 0 : _b.Reference;
-        const configs = (_c = armResult.Configuration) === null || _c === void 0 ? void 0 : _c.Modules;
+        const references = armResult.Reference;
+        const configs = (_b = armResult.Configuration) === null || _b === void 0 ? void 0 : _b.Modules;
         if (provision) {
             for (const module of Object.entries(provision)) {
                 const moduleFileName = module[0];
-                pluginOutputContext.Provision[moduleFileName] = {
-                    ProvisionPath: generateBicepModuleProvisionFilePath(moduleFileName),
+                PluginContext.Provision[moduleFileName] = {
+                    path: generateBicepModuleProvisionFilePath(moduleFileName),
                 };
             }
         }
         if (configs) {
             for (const module of Object.entries(configs)) {
                 const moduleFileName = module[0];
-                pluginOutputContext.Configuration[moduleFileName] = {
-                    ConfigPath: generateBicepModuleConfigFilePath(moduleFileName),
+                PluginContext.Configuration[moduleFileName] = {
+                    path: generateBicepModuleConfigFilePath(moduleFileName),
                 };
             }
         }
@@ -521,10 +742,10 @@ class ArmTemplateRenderContext {
             for (const output of Object.entries(references)) {
                 const outputKey = output[0];
                 const outputValue = output[1];
-                pluginOutputContext.References[outputKey] = outputValue;
+                PluginContext.References[outputKey] = outputValue;
             }
         }
-        this.PluginOutput[pluginName] = pluginOutputContext;
+        this.Plugins[pluginName] = PluginContext;
     }
 }
 exports.ArmTemplateRenderContext = ArmTemplateRenderContext;
@@ -536,25 +757,25 @@ class BicepOrchestrationContent {
         this.ProvisionTemplate = "";
         this.ConfigTemplate = "";
         this.ParameterJsonTemplate[resourceBaseName] = baseName;
-        this.RenderContenxt = new ArmTemplateRenderContext(pluginNames);
+        this.RenderContext = new ArmTemplateRenderContext(pluginNames);
     }
     applyTemplate(pluginName, armResult) {
         var _a, _b;
         this.ProvisionTemplate += this.normalizeTemplateSnippet((_a = armResult.Provision) === null || _a === void 0 ? void 0 : _a.Orchestration);
         this.ConfigTemplate += this.normalizeTemplateSnippet((_b = armResult.Configuration) === null || _b === void 0 ? void 0 : _b.Orchestration);
-        this.RenderContenxt.addPluginOutput(pluginName, armResult);
+        this.RenderContext.addPluginOutput(pluginName, armResult);
         Object.assign(this.ParameterJsonTemplate, armResult.Parameters);
     }
     applyReference(configContent) {
-        return common_1.compileHandlebarsTemplateString(configContent, this.RenderContenxt);
+        return common_1.compileHandlebarsTemplateString(configContent, this.RenderContext.Plugins);
     }
     getOrchestractionProvisionContent() {
-        const orchestrationTemplate = this.normalizeTemplateSnippet(this.ProvisionTemplate, false) + "\n";
-        return common_1.compileHandlebarsTemplateString(orchestrationTemplate, this.RenderContenxt).trim();
+        const orchestrationTemplate = this.normalizeTemplateSnippet(this.ProvisionTemplate, false) + os_1.default.EOL;
+        return common_1.compileHandlebarsTemplateString(orchestrationTemplate, this.RenderContext.Plugins).trim();
     }
     getOrchestractionConfigContent() {
-        const orchestrationTemplate = this.normalizeTemplateSnippet(this.ConfigTemplate, false) + "\n";
-        return common_1.compileHandlebarsTemplateString(orchestrationTemplate, this.RenderContenxt).trim();
+        const orchestrationTemplate = this.normalizeTemplateSnippet(this.ConfigTemplate, false) + os_1.default.EOL;
+        return common_1.compileHandlebarsTemplateString(orchestrationTemplate, this.RenderContext.Plugins).trim();
     }
     getParameterFileContent() {
         const parameterObject = {
@@ -579,7 +800,7 @@ class BicepOrchestrationContent {
             if (updateTemplateChangeFlag) {
                 this.TemplateAdded = true;
             }
-            return snippet.trim() + "\n";
+            return snippet.trim() + os_1.default.EOL;
         }
         return "";
     }
@@ -593,14 +814,12 @@ function generateBicepModuleConfigFilePath(moduleFileName) {
 function expandParameterPlaceholders(ctx, parameterContent) {
     var _a;
     const azureSolutionSettings = (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
-    const plugins = __1.isV2()
-        ? ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p))
-        : ResourcePluginContainer_1.getActivatedResourcePlugins(azureSolutionSettings); // This function ensures return result won't be empty
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p)); // This function ensures return result won't be empty
     const stateVariables = {};
     const availableVariables = { state: stateVariables };
     // Add plugin contexts to available variables
     for (const plugin of plugins) {
-        const pluginContext = util_1.getPluginContext(ctx, plugin.name);
+        const pluginContext = util_2.getPluginContext(ctx, plugin.name);
         const pluginVariables = {};
         for (const configItem of pluginContext.config) {
             if (typeof configItem[1] === "string") {
@@ -611,7 +830,7 @@ function expandParameterPlaceholders(ctx, parameterContent) {
         stateVariables[plugin.name] = pluginVariables;
     }
     // Add solution config to available variables
-    const solutionConfig = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG);
+    const solutionConfig = ctx.envInfo.state.get(constants_1.GLOBAL_CONFIG);
     if (solutionConfig) {
         const solutionVariables = {};
         for (const configItem of solutionConfig) {
@@ -630,6 +849,45 @@ function expandParameterPlaceholders(ctx, parameterContent) {
     availableVariables["$env"] = processVariables;
     return common_1.compileHandlebarsTemplateString(parameterContent, availableVariables);
 }
+function expandParameterPlaceholdersV3(ctx, envInfo, parameterContent) {
+    const azureSolutionSettings = ctx.projectSetting.solutionSettings;
+    const plugins = azureSolutionSettings.activeResourcePlugins.map((p) => typedi_1.Container.get(p));
+    const stateVariables = {};
+    const availableVariables = { state: stateVariables };
+    const envState = envInfo.state;
+    // Add plugin contexts to available variables
+    for (const plugin of plugins) {
+        const resourceState = envState[plugin.name] || {};
+        // const pluginContext = getPluginContext(ctx, plugin.name);
+        const pluginVariables = {};
+        for (const key of Object.keys(resourceState)) {
+            if (typeof resourceState[key] === "string") {
+                // Currently we only config with string type
+                pluginVariables[key] = resourceState[key];
+            }
+        }
+        stateVariables[plugin.name] = pluginVariables;
+    }
+    // Add solution config to available variables
+    const solutionConfig = envState.solution;
+    if (solutionConfig) {
+        const solutionVariables = {};
+        for (const key of Object.keys(solutionConfig)) {
+            if (typeof solutionConfig[key] === "string") {
+                // Currently we only config with string type
+                solutionVariables[key] = solutionConfig[key];
+            }
+        }
+        stateVariables[solutionName] = solutionVariables;
+    }
+    // Add environment variable to available variables
+    const processVariables = Object.keys(process.env).reduce((obj, key) => {
+        obj[key] = process.env[key];
+        return obj;
+    }, {});
+    availableVariables["$env"] = processVariables;
+    return common_1.compileHandlebarsTemplateString(parameterContent, availableVariables);
+}
 function generateResourceBaseName(appName, envName) {
     const maxAppNameLength = 10;
     const maxEnvNameLength = 4;
@@ -646,9 +904,9 @@ async function wrapGetDeploymentError(deployCtx, resourceGroupName, deploymentNa
         return teamsfx_api_1.ok(deploymentError);
     }
     catch (error) {
-        (_a = deployCtx.ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_1.PluginDisplayName.Solution}] Failed to get deployment error for ${error.message}.`);
+        (_a = deployCtx.ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(`[${constants_2.PluginDisplayName.Solution}] Failed to get deployment error for ${error.message}.`);
         const returnError = new Error(`resource deployments (${deployCtx.deploymentName} module) for your project failed and get the error message failed. Please refer to the resource group ${deployCtx.resourceGroupName} in portal for deployment error.`);
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(returnError, constants_2.SolutionSource, "GetDeploymentErrorFailed"));
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(returnError, constants_1.SolutionSource, "GetDeploymentErrorFailed"));
     }
 }
 async function getDeploymentError(deployCtx, resourceGroupName, deploymentName) {
@@ -659,7 +917,7 @@ async function getDeploymentError(deployCtx, resourceGroupName, deploymentName)
     }
     catch (error) {
         if (deploymentName !== deployCtx.deploymentName &&
-            error.code === constants_1.ConstantString.DeploymentNotFound) {
+            error.code === constants_2.ConstantString.DeploymentNotFound) {
             return undefined;
         }
         throw error;
@@ -681,7 +939,7 @@ async function getDeploymentError(deployCtx, resourceGroupName, deploymentName)
                 error: operation.properties.statusMessage.error,
             };
             if (((_g = operation.properties.targetResource) === null || _g === void 0 ? void 0 : _g.resourceType) ===
-                constants_1.ConstantString.DeploymentResourceType &&
+                constants_2.ConstantString.DeploymentResourceType &&
                 ((_h = operation.properties.targetResource) === null || _h === void 0 ? void 0 : _h.resourceName) &&
                 ((_j = operation.properties.targetResource) === null || _j === void 0 ? void 0 : _j.id)) {
                 const resourceGroupName = tools_1.getResourceGroupNameFromResourceId(operation.properties.targetResource.id);
@@ -694,10 +952,16 @@ async function getDeploymentError(deployCtx, resourceGroupName, deploymentName)
     }
     return deploymentError;
 }
-function formattedDeploymentName(failedDeployments) {
+function getNotificationMessage(deploymentError, deploymentName) {
+    let failedDeployments = [];
+    if (deploymentError.subErrors) {
+        failedDeployments = Object.keys(deploymentError.subErrors);
+    }
+    else {
+        failedDeployments.push(deploymentName);
+    }
     const format = failedDeployments.map((deployment) => deployment + " module");
-    const returnError = new Error(`resource deployments (${format.join(", ")}) for your project failed. Please refer to output channel for more error details.`);
-    return teamsfx_api_1.returnUserError(returnError, constants_2.SolutionSource, constants_2.SolutionError.FailedToDeployArmTemplatesToAzure, constants_1.HelpLinks.ArmHelpLink);
+    return `resource deployments (${format.join(", ")}) for your project failed. Please refer to output channel for more error details.`;
 }
 function formattedDeploymentError(deploymentError) {
     var _a, _b, _c;
@@ -723,4 +987,23 @@ function formattedDeploymentError(deploymentError) {
     }
 }
 exports.formattedDeploymentError = formattedDeploymentError;
+class ArmV2 {
+    async generateArmTemplate(ctx, selectedPlugins = []) {
+        return generateArmTemplate(ctx, selectedPlugins);
+    }
+    async deployArmTemplates(ctx) {
+        return deployArmTemplates(ctx);
+    }
+}
+class Arm {
+    async generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins) {
+        return generateArmTemplateV3(ctx, inputs, activatedPlugins, addedPlugins);
+    }
+    async deployArmTemplates(ctx, inputs, envInfo, azureAccountProvider) {
+        return deployArmTemplatesV3(ctx, inputs, envInfo, azureAccountProvider);
+    }
+}
+const arm = new Arm();
+exports.armV2 = new ArmV2();
+exports.default = arm;
 //# sourceMappingURL=arm.js.map