@microsoft/teamsfx-core 1.13.0 → 1.13.1-alpha.ae549cb45.0

package/build/component/core.js

@@ -9,57 +9,59 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 require("reflect-metadata");
 const typedi_1 = require("typedi");
-const projectSettingsLoader_1 = require("../core/middleware/projectSettingsLoader");
 const question_1 = require("../core/question");
 const projectSettingsHelper_1 = require("./../common/projectSettingsHelper");
 require("./bicep");
-require("./debug");
-require("./envManager");
-require("./resource/appManifest/appManifest");
-require("./resource/azureSql");
+require("./code/apiCode");
+require("./code/botCode");
+require("./code/spfxTabCode");
+require("./code/tabCode");
+require("./connection/apimConfig");
+require("./connection/azureFunctionConfig");
+require("./connection/azureWebAppConfig");
+const debug_1 = require("./debug");
+const envManager_1 = require("./envManager");
+require("./feature/api");
+require("./feature/apiConnector");
+require("./feature/apim");
+require("./feature/bot");
+require("./feature/cicd");
+require("./feature/keyVault");
+require("./feature/spfx");
+require("./feature/sql");
+require("./feature/sso");
+require("./feature/tab");
 require("./resource/aadApp/aadApp");
+require("./resource/apim");
 require("./resource/azureAppService/azureFunction");
-require("./resource/azureStorage");
 require("./resource/azureAppService/azureWebApp");
+require("./resource/azureSql");
+require("./resource/azureStorage");
 require("./resource/botService");
 require("./resource/keyVault");
-require("./feature/apim");
-require("./resource/apim");
-require("./feature/spfx");
 require("./resource/spfx");
-require("./feature/api");
-require("./feature/bot");
-require("./feature/sql");
-require("./feature/tab");
-require("./feature/cicd");
-require("./feature/keyVault");
-require("./feature/sso");
-require("./feature/apiConnector");
-require("./code/botCode");
-require("./code/tabCode");
-require("./code/apiCode");
-require("./code/spfxTabCode");
-require("./connection/azureWebAppConfig");
-require("./connection/azureFunctionConfig");
-require("./connection/apimConfig");
-const constants_1 = require("./constants");
+const jsonschema = tslib_1.__importStar(require("jsonschema"));
+const lodash_1 = require("lodash");
+const constants_1 = require("../common/constants");
+const globalState_1 = require("../common/globalState");
 const localizeUtils_1 = require("../common/localizeUtils");
-const tools_1 = require("../common/tools");
-const workflow_1 = require("./workflow");
-const preDeployAction_1 = require("./fx/preDeployAction");
-const preProvisionAction_1 = require("./fx/preProvisionAction");
-const migrate_1 = require("./migrate");
-const constants_2 = require("../common/constants");
 const projectSettingsHelperV3_1 = require("../common/projectSettingsHelperV3");
-const utils_1 = require("../plugins/solution/fx-solution/v2/utils");
-const questionModel_1 = require("../core/middleware/questionModel");
-const error_1 = require("../core/error");
-const globalState_1 = require("../common/globalState");
+const tools_1 = require("../common/tools");
 const downloadSample_1 = require("../core/downloadSample");
-const jsonschema = tslib_1.__importStar(require("jsonschema"));
+const error_1 = require("../core/error");
 const globalVars_1 = require("../core/globalVars");
+const questionModel_1 = require("../core/middleware/questionModel");
+const arm_1 = tslib_1.__importStar(require("../plugins/solution/fx-solution/arm"));
 const question_2 = require("../plugins/solution/fx-solution/question");
+const ResourceGroupHelper_1 = require("../plugins/solution/fx-solution/utils/ResourceGroupHelper");
+const executor_1 = require("../plugins/solution/fx-solution/v2/executor");
+const utils_1 = require("../plugins/solution/fx-solution/v2/utils");
+const deploy_1 = require("../plugins/solution/fx-solution/v3/deploy");
+const provision_1 = require("../plugins/solution/fx-solution/v3/provision");
+const constants_2 = require("./constants");
+const migrate_1 = require("./migrate");
 const questionV3_1 = require("./questionV3");
+const workflow_1 = require("./workflow");
 let TeamsfxCore = class TeamsfxCore {
     constructor() {
         this.name = "fx";
@@ -68,378 +70,288 @@ let TeamsfxCore = class TeamsfxCore {
      * create project
      */
     create(context, inputs) {
-        const createFromSample = {
-            type: "function",
-            name: "fx.createFromSample",
-            condition: (context, inputs) => {
-                const scratch = inputs[question_1.CoreQuestionNames.CreateFromScratch];
-                return teamsfx_api_1.ok(scratch === question_1.ScratchOptionNo.id);
-            },
-            execute: async (context, inputs) => {
-                const downloadRes = await downloadSample_1.downloadSample(inputs);
-                if (downloadRes.isErr()) {
-                    return teamsfx_api_1.err(downloadRes.error);
-                }
-                context.projectPath = downloadRes.value; // used as output for the action
-                inputs.projectPath = downloadRes.value; // used as inputs for sub-actions
-                return teamsfx_api_1.ok(["create app from sample"]);
-            },
-        };
-        const createFromNew = {
-            type: "group",
-            name: "fx.createFromNew",
-            condition: (context, inputs) => {
-                const scratch = inputs[question_1.CoreQuestionNames.CreateFromScratch];
-                return teamsfx_api_1.ok(scratch === question_1.ScratchOptionYes.id);
-            },
-            pre: async (context, inputs) => {
-                const appName = inputs[question_1.CoreQuestionNames.AppName];
-                if (undefined === appName)
-                    return teamsfx_api_1.err(error_1.InvalidInputError(`App Name is empty`, inputs));
-                const validateResult = jsonschema.validate(appName, {
-                    pattern: question_1.ProjectNamePattern,
-                });
-                if (validateResult.errors && validateResult.errors.length > 0) {
-                    return teamsfx_api_1.err(error_1.InvalidInputError(`${validateResult.errors[0].message}`, inputs));
-                }
-                const folder = inputs[question_1.CoreQuestionNames.Folder];
-                inputs.projectPath = path_1.default.join(folder, appName);
-                context.projectPath = path_1.default.join(folder, appName);
-                delete inputs.folder;
-                globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(context.projectSetting);
-                const features = inputs.capabilities;
-                if (features === question_2.M365SsoLaunchPageOptionItem.id ||
-                    features === question_2.M365SearchAppOptionItem.id) {
-                    context.projectSetting.isM365 = true;
-                    inputs.isM365 = true;
-                }
-                inputs[question_2.AzureSolutionQuestionNames.Features] = features;
-                return teamsfx_api_1.ok(undefined);
-            },
-            actions: [
-                {
-                    type: "call",
-                    targetAction: "fx.init",
-                    required: true,
-                },
-                {
-                    type: "call",
-                    targetAction: "teams-bot.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(question_2.BotFeatureIds.includes(inputs[question_2.AzureSolutionQuestionNames.Features]));
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "teams-tab.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(question_2.TabFeatureIds.includes(inputs[question_2.AzureSolutionQuestionNames.Features]));
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "spfx-tab.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(question_2.TabSPFxItem.id === inputs[question_2.AzureSolutionQuestionNames.Features]);
-                    },
-                },
-            ],
-        };
-        const action = {
-            type: "group",
+        const createAction = {
             name: "fx.create",
+            type: "function",
             question: async (context, inputs) => {
                 return await questionModel_1.getQuestionsForCreateProjectV2(inputs);
             },
-            pre: async (context, inputs) => {
-                const folder = inputs[question_1.CoreQuestionNames.Folder];
+            execute: async (context, inputs) => {
+                const folder = inputs[question_1.QuestionRootFolder.name];
                 if (!folder) {
                     return teamsfx_api_1.err(error_1.InvalidInputError("folder is undefined"));
                 }
-                return teamsfx_api_1.ok(undefined);
-            },
-            post: async (context, inputs) => {
+                inputs.folder = folder;
+                const scratch = inputs[question_1.CoreQuestionNames.CreateFromScratch];
+                let projectPath;
+                const automaticNpmInstall = "automaticNpmInstall";
+                if (scratch === question_1.ScratchOptionNo.id) {
+                    // create from sample
+                    const downloadRes = await downloadSample_1.downloadSample(inputs);
+                    if (downloadRes.isErr()) {
+                        return teamsfx_api_1.err(downloadRes.error);
+                    }
+                    projectPath = downloadRes.value;
+                }
+                else {
+                    // create from new
+                    const appName = inputs[question_1.CoreQuestionNames.AppName];
+                    if (undefined === appName)
+                        return teamsfx_api_1.err(error_1.InvalidInputError(`App Name is empty`, inputs));
+                    const validateResult = jsonschema.validate(appName, {
+                        pattern: question_1.ProjectNamePattern,
+                    });
+                    if (validateResult.errors && validateResult.errors.length > 0) {
+                        return teamsfx_api_1.err(error_1.InvalidInputError(`${validateResult.errors[0].message}`, inputs));
+                    }
+                    projectPath = path_1.default.join(folder, appName);
+                    inputs.projectPath = projectPath;
+                    const initRes = await this.init(context, inputs);
+                    if (initRes.isErr())
+                        return teamsfx_api_1.err(initRes.error);
+                    const features = inputs.capabilities;
+                    delete inputs.folder;
+                    if (features === question_2.M365SsoLaunchPageOptionItem.id ||
+                        features === question_2.M365SearchAppOptionItem.id) {
+                        context.projectSetting.isM365 = true;
+                        inputs.isM365 = true;
+                    }
+                    if (question_2.BotFeatureIds.includes(features)) {
+                        inputs[question_2.AzureSolutionQuestionNames.Features] = features;
+                        const res = await workflow_1.runActionByName("teams-bot.add", context, inputs);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                    }
+                    if (question_2.TabFeatureIds.includes(features)) {
+                        inputs[question_2.AzureSolutionQuestionNames.Features] = features;
+                        const res = await workflow_1.runActionByName("teams-tab.add", context, inputs);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                    }
+                    if (features === question_2.TabSPFxItem.id) {
+                        inputs[question_2.AzureSolutionQuestionNames.Features] = features;
+                        const res = await workflow_1.runActionByName("spfx-tab.add", context, inputs);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                    }
+                }
                 if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-                    await globalState_1.globalStateUpdate("automaticNpmInstall", true);
+                    await globalState_1.globalStateUpdate(automaticNpmInstall, true);
                 }
-                return teamsfx_api_1.ok(undefined);
+                context.projectPath = projectPath;
+                return teamsfx_api_1.ok(["create a new project with capability:" + inputs.capabilities]);
             },
-            actions: [createFromSample, createFromNew],
         };
-        return teamsfx_api_1.ok(action);
+        return teamsfx_api_1.ok(createAction);
     }
     /**
      * add feature
      */
     addFeature(context, inputs) {
         const action = {
-            type: "group",
+            type: "function",
             name: "fx.addFeature",
             question: async (context, inputs) => {
                 return await questionV3_1.getQuestionsForAddFeatureV3(context, inputs);
             },
-            actions: [
-                {
-                    type: "call",
-                    targetAction: "sql.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.AzureResourceSQLNewUI.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "teams-bot.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(question_2.BotFeatureIds.includes(inputs[question_2.AzureSolutionQuestionNames.Features]));
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "teams-tab.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(question_2.TabFeatureIds.includes(inputs[question_2.AzureSolutionQuestionNames.Features]));
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "teams-api.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.AzureResourceFunctionNewUI.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "cicd.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.CicdOptionItem.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "api-connector.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.ApiConnectionOptionItem.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "sso.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.SingleSignOnOptionItem.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "apim-feature.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.AzureResourceApim.id);
-                    },
-                },
-                {
-                    type: "call",
-                    targetAction: "key-vault-feature.add",
-                    required: true,
-                    condition: (context, inputs) => {
-                        return teamsfx_api_1.ok(inputs[question_2.AzureSolutionQuestionNames.Features] === question_2.AzureResourceKeyVaultNewUI.id);
-                    },
-                },
-            ],
-        };
-        return teamsfx_api_1.ok(action);
-    }
-    init(context, inputs) {
-        const initProjectSettings = {
-            type: "function",
-            name: "fx.initConfig",
-            plan: (context, inputs) => {
-                return teamsfx_api_1.ok([
-                    {
-                        type: "file",
-                        operate: "create",
-                        filePath: projectSettingsLoader_1.getProjectSettingsPath(inputs.projectPath),
-                    },
-                ]);
-            },
-            question: (context, inputs) => {
-                const root = new teamsfx_api_1.QTreeNode({ type: "group" });
-                root.addChild(new teamsfx_api_1.QTreeNode(question_1.QuestionRootFolder));
-                root.addChild(new teamsfx_api_1.QTreeNode(question_1.createAppNameQuestion()));
-                return teamsfx_api_1.ok(root);
-            },
             execute: async (context, inputs) => {
-                const projectSettings = projectSettingsHelper_1.newProjectSettings();
-                projectSettings.appName = inputs["app-name"];
-                projectSettings.components = [];
-                context.projectSetting = projectSettings;
-                await fs_extra_1.default.ensureDir(inputs.projectPath);
-                await fs_extra_1.default.ensureDir(path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
-                await fs_extra_1.default.ensureDir(path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`, "configs"));
-                return teamsfx_api_1.ok([
-                    {
-                        type: "file",
-                        operate: "create",
-                        filePath: projectSettingsLoader_1.getProjectSettingsPath(inputs.projectPath),
-                    },
-                ]);
+                const features = inputs[question_2.AzureSolutionQuestionNames.Features];
+                let actionName;
+                if (question_2.BotFeatureIds.includes(features)) {
+                    actionName = "teams-bot.add";
+                }
+                else if (question_2.TabFeatureIds.includes(features)) {
+                    actionName = "teams-tab.add";
+                }
+                else if (features === question_2.AzureResourceSQLNewUI.id) {
+                    actionName = "sql.add";
+                }
+                else if (features === question_2.AzureResourceFunctionNewUI.id) {
+                    actionName = "teams-api.add";
+                }
+                else if (features === question_2.AzureResourceApim.id) {
+                    actionName = "apim-feature.add";
+                }
+                else if (features === question_2.AzureResourceKeyVaultNewUI.id) {
+                    actionName = "key-vault-feature.add";
+                }
+                else if (features === question_2.CicdOptionItem.id) {
+                    actionName = "cicd.add";
+                }
+                else if (features === question_2.ApiConnectionOptionItem.id) {
+                    actionName = "api-connector.add";
+                }
+                else if (features === question_2.SingleSignOnOptionItem.id) {
+                    actionName = "sso.add";
+                }
+                if (actionName) {
+                    const res = await workflow_1.runActionByName(actionName, context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                return teamsfx_api_1.ok([]);
             },
         };
-        const action = {
-            type: "group",
-            name: "fx.init",
-            actions: [
-                initProjectSettings,
-                {
-                    type: "call",
-                    name: "call:app-manifest.init",
-                    targetAction: "app-manifest.init",
-                    required: true,
-                },
-                {
-                    type: "call",
-                    name: "call:env-manager.create",
-                    targetAction: "env-manager.create",
-                    required: true,
-                },
-            ],
-        };
         return teamsfx_api_1.ok(action);
     }
-    async provision(context, inputs) {
-        const ctx = context;
-        const resourcesToProvision = ctx.projectSetting.components.filter((r) => r.provision);
-        const provisionActions = resourcesToProvision.map((r) => {
-            return {
-                type: "call",
-                name: `call:${r.name}.provision`,
-                required: false,
-                targetAction: `${r.name}.provision`,
-            };
-        });
-        const configureActions = resourcesToProvision.map((r) => {
-            return {
-                type: "call",
-                name: `call:${r.name}.configure`,
-                required: false,
-                targetAction: `${r.name}.configure`,
-            };
-        });
-        const setupLocalEnvironmentStep = {
-            type: "call",
-            name: "call debug.setupLocalEnvInfo",
-            targetAction: "debug.setupLocalEnvInfo",
-            required: true,
-            condition: (context, inputs) => {
-                return teamsfx_api_1.ok(ctx.envInfo && ctx.envInfo.envName === "local");
-            },
-        };
-        const configLocalEnvironmentStep = {
-            type: "call",
-            name: "call debug.configLocalEnvInfo",
-            targetAction: "debug.configLocalEnvInfo",
-            required: true,
-            condition: (context, inputs) => {
-                return teamsfx_api_1.ok(ctx.envInfo && ctx.envInfo.envName === "local");
-            },
-        };
-        const preProvisionStep = new preProvisionAction_1.FxPreProvisionAction();
-        const createTeamsAppStep = {
-            type: "call",
-            name: "call app-manifest.provision",
-            targetAction: "app-manifest.provision",
-            required: true,
-        };
-        const updateTeamsAppStep = {
-            type: "call",
-            name: "call app-manifest.configure",
-            targetAction: "app-manifest.configure",
-            required: true,
-        };
-        const provisionResourcesStep = {
-            type: "group",
-            name: "resources.provision",
-            mode: "parallel",
-            actions: provisionActions,
-        };
-        const configureResourcesStep = {
-            type: "group",
-            name: "resources.configure",
-            mode: "parallel",
-            actions: configureActions,
-        };
-        const deployBicepStep = {
-            type: "call",
-            name: "call:bicep.deploy",
-            required: true,
-            targetAction: "bicep.deploy",
-            condition: (context, inputs) => {
-                return teamsfx_api_1.ok(ctx.envInfo && ctx.envInfo.envName !== "local");
-            },
-        };
-        const postProvisionStep = {
+    async init(context, inputs) {
+        const projectSettings = projectSettingsHelper_1.newProjectSettings();
+        projectSettings.appName = inputs["app-name"];
+        projectSettings.components = [];
+        context.projectSetting = projectSettings;
+        await fs_extra_1.default.ensureDir(inputs.projectPath);
+        await fs_extra_1.default.ensureDir(path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
+        await fs_extra_1.default.ensureDir(path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`, "configs"));
+        {
+            const appManifest = typedi_1.Container.get(constants_2.ComponentNames.AppManifest);
+            const res = await appManifest.init(context, inputs);
+            if (res.isErr())
+                return res;
+        }
+        {
+            const res = await envManager_1.createNewEnv(context, inputs);
+            if (res.isErr())
+                return res;
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
+    provision(ctx, inputs) {
+        const action = {
+            name: "fx.provision",
             type: "function",
-            name: "fx.postProvision",
-            condition: (context, inputs) => {
-                return teamsfx_api_1.ok(ctx.envInfo && ctx.envInfo.envName !== "local");
-            },
-            plan: (context, inputs) => {
-                return teamsfx_api_1.ok([]);
+            question: async (context, inputs) => {
+                return await questionV3_1.getQuestionsForDeployV3(context, context.envInfo, inputs);
             },
-            execute: (context, inputs) => {
+            execute: async (context, inputs) => {
                 const ctx = context;
-                ctx.envInfo.state.solution.provisionSucceeded = true;
-                const url = tools_1.getResourceGroupInPortal(ctx.envInfo.state.solution.subscriptionId, ctx.envInfo.state.solution.tenantId, ctx.envInfo.state.solution.resourceGroupName);
-                const msg = localizeUtils_1.getLocalizedString("core.provision.successAzure");
-                if (url) {
-                    const title = "View Provisioned Resources";
-                    ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
-                        const userSelected = result.isOk() ? result.value : undefined;
-                        if (userSelected === title) {
-                            ctx.userInteraction.openUrl(url);
+                ctx.envInfo.state.solution = ctx.envInfo.state.solution || {};
+                ctx.envInfo.state.solution.provisionSucceeded = false;
+                // 1. pre provision
+                {
+                    const res = await preProvision(ctx, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 2. create a teams app
+                const appManifest = typedi_1.Container.get(constants_2.ComponentNames.AppManifest);
+                {
+                    const res = await appManifest.provision(ctx, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 3. call resources provision api
+                const componentsToProvision = ctx.projectSetting.components.filter((r) => r.provision);
+                {
+                    const thunks = [];
+                    for (const componentConfig of componentsToProvision) {
+                        const componentInstance = typedi_1.Container.get(componentConfig.name);
+                        if (componentInstance.provision) {
+                            thunks.push({
+                                pluginName: `${componentConfig.name}`,
+                                taskName: "provision",
+                                thunk: () => {
+                                    ctx.envInfo.state[componentConfig.name] =
+                                        ctx.envInfo.state[componentConfig.name] || [];
+                                    return componentInstance.provision(ctx, inputs);
+                                },
+                            });
                         }
-                    });
+                    }
+                    const provisionResult = await executor_1.executeConcurrently(thunks, ctx.logProvider);
+                    if (provisionResult.kind !== "success") {
+                        return teamsfx_api_1.err(provisionResult.error);
+                    }
+                    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.provision.ProvisionFinishNotice", constants_1.PluginDisplayName.Solution));
+                }
+                // 4
+                if (ctx.envInfo.envName === "local") {
+                    //4.1 setup local env
+                    const localEnvSetupResult = await debug_1.setupLocalEnvironment(ctx, inputs, ctx.envInfo);
+                    if (localEnvSetupResult.isErr()) {
+                        return teamsfx_api_1.err(localEnvSetupResult.error);
+                    }
                 }
                 else {
+                    //4.2 deploy arm templates for remote
+                    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deployArmTemplates.StartNotice", constants_1.PluginDisplayName.Solution));
+                    const armRes = await arm_1.default.deployArmTemplates(ctx, inputs, ctx.envInfo, ctx.tokenProvider.azureAccountProvider);
+                    if (armRes.isErr()) {
+                        return teamsfx_api_1.err(armRes.error);
+                    }
+                    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deployArmTemplates.SuccessNotice", constants_1.PluginDisplayName.Solution));
+                }
+                // 5.0 "aad-app.setApplicationInContext"
+                const aadApp = typedi_1.Container.get(constants_2.ComponentNames.AadApp);
+                if (projectSettingsHelperV3_1.hasAAD(ctx.projectSetting)) {
+                    const res = await aadApp.setApplicationInContext(ctx, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 5. call resources configure api
+                {
+                    const thunks = [];
+                    for (const componentConfig of componentsToProvision) {
+                        const componentInstance = typedi_1.Container.get(componentConfig.name);
+                        if (componentInstance.configure) {
+                            thunks.push({
+                                pluginName: `${componentConfig.name}`,
+                                taskName: "configure",
+                                thunk: () => {
+                                    ctx.envInfo.state[componentConfig.name] =
+                                        ctx.envInfo.state[componentConfig.name] || [];
+                                    return componentInstance.configure(ctx, inputs);
+                                },
+                            });
+                        }
+                    }
+                    const configResult = await executor_1.executeConcurrently(thunks, ctx.logProvider);
+                    if (configResult.kind !== "success") {
+                        return teamsfx_api_1.err(configResult.error);
+                    }
+                    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.provision.configurationFinishNotice", constants_1.PluginDisplayName.Solution));
+                }
+                // 6.
+                if (ctx.envInfo.envName === "local") {
+                    // 6.1 config local env
+                    const localConfigResult = await debug_1.configLocalEnvironment(ctx, inputs, ctx.envInfo);
+                    if (localConfigResult.isErr()) {
+                        return teamsfx_api_1.err(localConfigResult.error);
+                    }
+                }
+                else {
+                    // 6.2 show message for remote azure provision
+                    const url = tools_1.getResourceGroupInPortal(ctx.envInfo.state.solution.subscriptionId, ctx.envInfo.state.solution.tenantId, ctx.envInfo.state.solution.resourceGroupName);
+                    const msg = localizeUtils_1.getLocalizedString("core.provision.successAzure");
+                    if (url) {
+                        const title = "View Provisioned Resources";
+                        ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
+                            const userSelected = result.isOk() ? result.value : undefined;
+                            if (userSelected === title) {
+                                ctx.userInteraction.openUrl(url);
+                            }
+                        });
+                    }
+                    else {
+                        ctx.userInteraction.showMessage("info", msg, false);
+                    }
+                }
+                // 7. update teams app
+                {
+                    const res = await appManifest.configure(ctx, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 8. show and set state
+                if (ctx.envInfo.envName !== "local") {
+                    const msg = localizeUtils_1.getLocalizedString("core.provision.successNotice", ctx.projectSetting.appName);
                     ctx.userInteraction.showMessage("info", msg, false);
+                    ctx.logProvider.info(msg);
                 }
+                ctx.envInfo.state.solution.provisionSucceeded = true;
                 return teamsfx_api_1.ok([]);
             },
         };
-        const aadComponent = workflow_1.getComponent(context.projectSetting, constants_1.ComponentNames.AadApp);
-        const preConfigureStep = {
-            type: "call",
-            name: "call:aad-app.setApplicationInContext",
-            required: true,
-            targetAction: "aad-app.setApplicationInContext",
-        };
-        const provisionSequences = [
-            preProvisionStep,
-            createTeamsAppStep,
-            provisionResourcesStep,
-            deployBicepStep,
-            setupLocalEnvironmentStep,
-            ...(aadComponent ? [preConfigureStep] : []),
-            configureResourcesStep,
-            postProvisionStep,
-            configLocalEnvironmentStep,
-            updateTeamsAppStep,
-        ];
-        const result = {
-            name: "fx.provision",
-            type: "group",
-            actions: provisionSequences,
-        };
-        return teamsfx_api_1.ok(result);
+        return teamsfx_api_1.ok(action);
     }
     build(context, inputs) {
         const projectSettings = context.projectSetting;
@@ -463,95 +375,176 @@ let TeamsfxCore = class TeamsfxCore {
         return teamsfx_api_1.ok(group);
     }
     deploy(context, inputs) {
-        const projectSettings = context.projectSetting;
-        const buildAction = {
-            name: "call:fx.build",
-            type: "call",
-            targetAction: "fx.build",
-            required: true,
-        };
-        const actions = [];
-        // if is vs project, no selection question, deploy all deployable components
-        // if is none vs project, only deploy selected components
-        const inputPlugins = inputs[question_2.AzureSolutionQuestionNames.PluginSelectionDeploy] || [];
-        const components = projectSettingsHelper_1.isVSProject(projectSettings)
-            ? projectSettings.components.filter((component) => component.deploy).map((c) => c.name)
-            : inputPlugins.map((plugin) => migrate_1.pluginName2ComponentName(plugin));
-        let hasAzureResource = false;
-        const callDeployActions = [];
-        components.forEach((componentName) => {
-            const componentConfig = workflow_1.getComponent(projectSettings, componentName);
-            if (componentConfig) {
-                if (componentConfig.hosting && constants_1.AzureResources.includes(componentConfig.hosting)) {
-                    hasAzureResource = true;
-                }
-                callDeployActions.push({
-                    type: "call",
-                    targetAction: componentName === constants_1.ComponentNames.AppManifest
-                        ? `${constants_1.ComponentNames.AppManifest}.configure`
-                        : `${componentConfig.hosting}.deploy`,
-                    required: false,
-                    inputs: {
-                        scenario: constants_1.componentToScenario.get(componentName),
-                    },
-                });
-            }
-        });
-        if (inputs.platform !== teamsfx_api_1.Platform.CLI_HELP && callDeployActions.length === 0) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError("fx", "NoResourcePluginSelected", localizeUtils_1.getDefaultString("core.NoPluginSelected"), localizeUtils_1.getLocalizedString("core.NoPluginSelected")));
-        }
-        if (hasAzureResource) {
-            actions.push(new preDeployAction_1.FxPreDeployForAzureAction());
-        }
-        actions.push(buildAction);
-        context.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.selectedPluginsToDeployNotice", constants_2.PluginDisplayName.Solution, JSON.stringify(components)));
-        const callDeployGroup = {
-            type: "group",
-            name: "fx.callComponentDeploy",
-            mode: "parallel",
-            pre: (context, inputs) => {
-                context.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.startNotice", constants_2.PluginDisplayName.Solution));
-                return teamsfx_api_1.ok(undefined);
+        const action = {
+            name: "fx.deploy",
+            type: "function",
+            question: async (context, inputs) => {
+                return await questionV3_1.getQuestionsForDeployV3(context, context.envInfo, inputs);
             },
-            post: (context, inputs) => {
-                if (hasAzureResource) {
-                    const botTroubleShootMsg = utils_1.getBotTroubleShootMessage(projectSettingsHelperV3_1.hasBot(context.projectSetting));
-                    const msg = localizeUtils_1.getLocalizedString("core.deploy.successNotice", context.projectSetting.appName) +
-                        botTroubleShootMsg.textForLogging;
-                    context.logProvider.info(msg);
-                    if (botTroubleShootMsg.textForLogging) {
-                        // Show a `Learn more` action button for bot trouble shooting.
-                        context.userInteraction
-                            .showMessage("info", `${localizeUtils_1.getLocalizedString("core.deploy.successNotice", context.projectSetting.appName)} ${botTroubleShootMsg.textForMsgBox}`, false, botTroubleShootMsg.textForActionButton)
-                            .then((result) => {
-                            const userSelected = result.isOk() ? result.value : undefined;
-                            if (userSelected === botTroubleShootMsg.textForActionButton) {
-                                context.userInteraction.openUrl(botTroubleShootMsg.troubleShootLink);
-                            }
+            execute: async (context, inputs) => {
+                const ctx = context;
+                const projectSettings = ctx.projectSetting;
+                const inputPlugins = inputs[question_2.AzureSolutionQuestionNames.PluginSelectionDeploy] || [];
+                const inputComponentNames = inputPlugins.map(migrate_1.pluginName2ComponentName);
+                const thunks = [];
+                let hasAzureResource = false;
+                // 1. collect resources to deploy
+                const isVS = projectSettingsHelper_1.isVSProject(projectSettings);
+                for (const component of projectSettings.components) {
+                    if (component.deploy &&
+                        component.hosting !== undefined &&
+                        (isVS || inputComponentNames.includes(component.name))) {
+                        const componentInstance = typedi_1.Container.get(component.hosting);
+                        // const actionName = `${component.hosting}.deploy`;
+                        // const action = await getAction(actionName, ctx, inputs, true);
+                        thunks.push({
+                            pluginName: `${component.name}`,
+                            taskName: "deploy",
+                            thunk: () => {
+                                const clonedInputs = lodash_1.cloneDeep(inputs);
+                                clonedInputs.folder = component.folder;
+                                clonedInputs.artifactFolder = component.artifactFolder;
+                                clonedInputs.componentId = component.name;
+                                return componentInstance.deploy(ctx, clonedInputs);
+                            },
                         });
+                        if (constants_2.AzureResources.includes(component.hosting)) {
+                            hasAzureResource = true;
+                        }
                     }
-                    else {
-                        context.userInteraction.showMessage("info", msg, false);
+                }
+                if (inputComponentNames.includes(constants_2.ComponentNames.AppManifest)) {
+                    const appManifest = typedi_1.Container.get(constants_2.ComponentNames.AppManifest);
+                    thunks.push({
+                        pluginName: constants_2.ComponentNames.AppManifest,
+                        taskName: "deploy",
+                        thunk: () => {
+                            return appManifest.configure(ctx, inputs);
+                        },
+                    });
+                }
+                if (thunks.length === 0) {
+                    return teamsfx_api_1.err(new teamsfx_api_1.UserError("fx", "NoResourcePluginSelected", localizeUtils_1.getDefaultString("core.NoPluginSelected"), localizeUtils_1.getLocalizedString("core.NoPluginSelected")));
+                }
+                ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.selectedPluginsToDeployNotice", constants_1.PluginDisplayName.Solution, JSON.stringify(thunks.map((p) => p.pluginName))));
+                // 2. check azure account
+                if (hasAzureResource) {
+                    const subscriptionResult = await deploy_1.checkDeployAzureSubscription(ctx, ctx.envInfo, ctx.tokenProvider.azureAccountProvider);
+                    if (subscriptionResult.isErr()) {
+                        return teamsfx_api_1.err(subscriptionResult.error);
+                    }
+                    const consent = await provision_1.askForDeployConsent(ctx, ctx.tokenProvider.azureAccountProvider, ctx.envInfo);
+                    if (consent.isErr()) {
+                        return teamsfx_api_1.err(consent.error);
                     }
                 }
-                return teamsfx_api_1.ok(undefined);
-            },
-            actions: callDeployActions,
-        };
-        actions.push(callDeployGroup);
-        const finalAction = {
-            type: "group",
-            name: "fx.deploy",
-            question: async (context, inputs) => {
-                return await questionV3_1.getQuestionsForDeployV3(context, context.envInfo, inputs);
+                // 3. build
+                {
+                    const res = await workflow_1.runActionByName("fx.build", context, inputs);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                // 4. start deploy
+                ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.startNotice", constants_1.PluginDisplayName.Solution));
+                const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
+                if (result.kind === "success") {
+                    if (hasAzureResource) {
+                        const botTroubleShootMsg = utils_1.getBotTroubleShootMessage(projectSettingsHelperV3_1.hasBot(context.projectSetting));
+                        const msg = localizeUtils_1.getLocalizedString("core.deploy.successNotice", context.projectSetting.appName) +
+                            botTroubleShootMsg.textForLogging;
+                        context.logProvider.info(msg);
+                        if (botTroubleShootMsg.textForLogging) {
+                            // Show a `Learn more` action button for bot trouble shooting.
+                            context.userInteraction
+                                .showMessage("info", `${localizeUtils_1.getLocalizedString("core.deploy.successNotice", context.projectSetting.appName)} ${botTroubleShootMsg.textForMsgBox}`, false, botTroubleShootMsg.textForActionButton)
+                                .then((result) => {
+                                const userSelected = result.isOk() ? result.value : undefined;
+                                if (userSelected === botTroubleShootMsg.textForActionButton) {
+                                    context.userInteraction.openUrl(botTroubleShootMsg.troubleShootLink);
+                                }
+                            });
+                        }
+                        else {
+                            context.userInteraction.showMessage("info", msg, false);
+                        }
+                    }
+                    return teamsfx_api_1.ok([]);
+                }
+                else {
+                    const msg = localizeUtils_1.getLocalizedString("core.deploy.failNotice", ctx.projectSetting.appName);
+                    ctx.logProvider.info(msg);
+                    return teamsfx_api_1.err(result.error);
+                }
             },
-            actions: actions,
         };
-        return teamsfx_api_1.ok(finalAction);
+        return teamsfx_api_1.ok(action);
     }
 };
 TeamsfxCore = tslib_1.__decorate([
     typedi_1.Service("fx")
 ], TeamsfxCore);
 exports.TeamsfxCore = TeamsfxCore;
+async function preProvision(context, inputs) {
+    const ctx = context;
+    const envInfo = ctx.envInfo;
+    // 1. check M365 tenant
+    envInfo.state[constants_2.ComponentNames.AppManifest] = envInfo.state[constants_2.ComponentNames.AppManifest] || {};
+    envInfo.state.solution = envInfo.state.solution || {};
+    const appManifest = envInfo.state[constants_2.ComponentNames.AppManifest];
+    const solutionConfig = envInfo.state.solution;
+    solutionConfig.provisionSucceeded = false;
+    const tenantIdInConfig = appManifest.tenantId;
+    const isLocalDebug = envInfo.envName === "local";
+    const tenantIdInTokenRes = await provision_1.getM365TenantId(ctx.tokenProvider.m365TokenProvider);
+    if (tenantIdInTokenRes.isErr()) {
+        return teamsfx_api_1.err(tenantIdInTokenRes.error);
+    }
+    const tenantIdInToken = tenantIdInTokenRes.value;
+    if (!isLocalDebug) {
+        if (tenantIdInConfig && tenantIdInToken && tenantIdInToken !== tenantIdInConfig) {
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError("Solution", "TeamsAppTenantIdNotRight", localizeUtils_1.getLocalizedString("error.M365AccountNotMatch", envInfo.envName)));
+        }
+        if (!tenantIdInConfig) {
+            appManifest.tenantId = tenantIdInToken;
+            solutionConfig.teamsAppTenantId = tenantIdInToken;
+            globalVars_1.globalVars.m365TenantId = tenantIdInToken;
+        }
+    }
+    else {
+        const res = await utils_1.checkWhetherLocalDebugM365TenantMatches(envInfo, tenantIdInConfig, ctx.tokenProvider.m365TokenProvider, inputs.projectPath);
+        if (res.isErr()) {
+            return teamsfx_api_1.err(res.error);
+        }
+        envInfo.state[constants_2.ComponentNames.AppManifest] = envInfo.state[constants_2.ComponentNames.AppManifest] || {};
+        envInfo.state[constants_2.ComponentNames.AppManifest].tenantId = tenantIdInToken;
+        envInfo.state.solution.teamsAppTenantId = tenantIdInToken;
+        globalVars_1.globalVars.m365TenantId = tenantIdInToken;
+    }
+    // 3. check Azure configs
+    if (projectSettingsHelperV3_1.hasAzureResourceV3(ctx.projectSetting) && envInfo.envName !== "local") {
+        // ask common question and fill in solution config
+        const solutionConfigRes = await provision_1.fillInAzureConfigs(ctx, inputs, envInfo, ctx.tokenProvider);
+        if (solutionConfigRes.isErr()) {
+            return teamsfx_api_1.err(solutionConfigRes.error);
+        }
+        if (!solutionConfigRes.value.hasSwitchedSubscription) {
+            // ask for provision consent
+            const consentResult = await provision_1.askForProvisionConsent(ctx, ctx.tokenProvider.azureAccountProvider, envInfo);
+            if (consentResult.isErr()) {
+                return teamsfx_api_1.err(consentResult.error);
+            }
+        }
+        // create resource group if needed
+        if (solutionConfig.needCreateResourceGroup) {
+            const createRgRes = await ResourceGroupHelper_1.resourceGroupHelper.createNewResourceGroup(solutionConfig.resourceGroupName, ctx.tokenProvider.azureAccountProvider, solutionConfig.subscriptionId, solutionConfig.location);
+            if (createRgRes.isErr()) {
+                return teamsfx_api_1.err(createRgRes.error);
+            }
+        }
+        if (solutionConfigRes.value.hasSwitchedSubscription) {
+            arm_1.updateResourceBaseName(inputs.projectPath, ctx.projectSetting.appName, envInfo.envName);
+        }
+    }
+    return teamsfx_api_1.ok(undefined);
+}
 //# sourceMappingURL=core.js.map