@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.07c43242.0

package/build/plugins/solution/fx-solution/v3/deploy.js

@@ -11,51 +11,58 @@ const constants_1 = require("../../../../common/constants");
 const tools_1 = require("../../../../common/tools");
 const executor_1 = require("../v2/executor");
 const questions_1 = require("../../utils/questions");
-const utils_1 = require("./utils");
 async function getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
-    const root = questions_1.createSelectModulesToDeployQuestionNode(solutionSetting.modules);
-    let i = 0;
-    for (const module of solutionSetting.modules) {
-        const pluginName = module.hostingPlugin;
+    const pluginNames = solutionSetting ? solutionSetting.activeResourcePlugins : [];
+    if (pluginNames.length === 0)
+        return teamsfx_api_1.ok(undefined);
+    const rootNode = new teamsfx_api_1.QTreeNode(questions_1.selectMultiPluginsQuestion);
+    const deployOptions = [];
+    const pluginPrefix = "fx-resource-";
+    for (const pluginName of pluginNames) {
         if (pluginName) {
             const plugin = typedi_1.Container.get(pluginName);
-            if (plugin.deploy && plugin.getQuestionsForDeploy) {
-                const res = await plugin.getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider);
-                if (res.isErr()) {
-                    return res;
-                }
-                if (res.value) {
-                    const node = res.value;
-                    if (node && node.data) {
-                        node.condition = { contains: i + "" };
-                        root.addChild(node);
+            if (plugin.deploy) {
+                deployOptions.push({
+                    id: pluginName,
+                    label: plugin.displayName || pluginName,
+                    cliName: plugin.name.replace(pluginPrefix, ""),
+                });
+                if (plugin.getQuestionsForDeploy) {
+                    const res = await plugin.getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider);
+                    if (res.isErr()) {
+                        return res;
+                    }
+                    if (res.value) {
+                        const node = res.value;
+                        if (node && node.data) {
+                            node.condition = { contains: pluginName };
+                            rootNode.addChild(node);
+                        }
                     }
                 }
             }
         }
-        ++i;
     }
-    return teamsfx_api_1.ok(root);
+    questions_1.selectMultiPluginsQuestion.staticOptions = deployOptions;
+    return teamsfx_api_1.ok(rootNode);
 }
 exports.getQuestionsForDeploy = getQuestionsForDeploy;
-async function deploy(ctx, inputs, envInfo, tokenProvider) {
+async function deploy(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
-    const plugins = [];
-    for (const moduleIndex of inputs.modules) {
-        const module = utils_1.getModule(solutionSetting, moduleIndex);
-        if (module && module.hostingPlugin) {
-            const plugin = typedi_1.Container.get(module.hostingPlugin);
-            plugins.push(plugin);
-        }
-    }
+    const pluginNames = solutionSetting ? solutionSetting.activeResourcePlugins : [];
+    const plugins = pluginNames
+        .map((name) => typedi_1.Container.get(name))
+        .filter((p) => p.deploy !== undefined);
+    if (plugins.length === 0)
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     const thunks = plugins.map((plugin) => {
         return {
             pluginName: `${plugin.name}`,
             taskName: "deploy",
             thunk: () => {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                return plugin.deploy(ctx, inputs, envInfo, tokenProvider.azureAccountProvider);
+                return plugin.deploy(ctx, inputs, envInfo, tokenProvider);
             },
         };
     });

package/build/plugins/solution/fx-solution/v3/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/error.d.ts

@@ -1,8 +1,2 @@
-import { UserError } from "@microsoft/teamsfx-api";
-export declare class CapabilityAlreadyAddedError extends UserError {
-    constructor(capability: string);
-}
-export declare class ResourceAlreadyAddedError extends UserError {
-    constructor(pluginName: string);
-}
+export {};
 //# sourceMappingURL=error.d.ts.map

package/build/plugins/solution/fx-solution/v3/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAE3D,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,UAAU,EAAE,MAAM;CAG/B"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/error.ts"],"names":[],"mappings":""}

package/build/plugins/solution/fx-solution/v3/error.js

@@ -1,17 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceAlreadyAddedError = exports.CapabilityAlreadyAddedError = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-class CapabilityAlreadyAddedError extends teamsfx_api_1.UserError {
-    constructor(capability) {
-        super(new.target.name, `Capability ${capability} is already added in the project`, "Solution");
-    }
-}
-exports.CapabilityAlreadyAddedError = CapabilityAlreadyAddedError;
-class ResourceAlreadyAddedError extends teamsfx_api_1.UserError {
-    constructor(pluginName) {
-        super(new.target.name, `Resource ${pluginName} is already added in the project`, "Solution");
-    }
-}
-exports.ResourceAlreadyAddedError = ResourceAlreadyAddedError;
 //# sourceMappingURL=error.js.map

package/build/plugins/solution/fx-solution/v3/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/error.ts"],"names":[],"mappings":";;;AAAA,wDAA2D;AAE3D,MAAa,2BAA4B,SAAQ,uBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,UAAU,kCAAkC,EAAE,UAAU,CAAC,CAAC;IACjG,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,yBAA0B,SAAQ,uBAAS;IACtD,YAAY,UAAkB;QAC5B,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,UAAU,kCAAkC,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;CACF;AAJD,8DAIC"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/error.ts"],"names":[],"mappings":""}

package/build/plugins/solution/fx-solution/v3/provision.d.ts

@@ -1,11 +1,16 @@
-import { AppStudioTokenProvider, AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare function getQuestionsForProvision(ctx: v2.Context, inputs: v2.InputsWithProjectPath, tokenProvider: TokenProvider, envInfo?: v2.DeepReadonly<v3.EnvInfoV3>): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function provisionResources(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider): Promise<Result<v3.EnvInfoV3, FxError>>;
+import { AppStudioTokenProvider, AzureAccountProvider, FxError, Json, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
+export declare function getQuestionsForProvision(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
+export declare function provisionResources(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider, telemetryProps?: Json): Promise<Result<v3.EnvInfoV3, FxError>>;
 /**
  * make sure subscription is correct
  *
  */
 export declare function checkAzureSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
+/**
+ * Asks common questions and puts the answers in the global namespace of SolutionConfig
+ *
+ */
+export declare function fillInAzureConfigs(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
 export declare function askForProvisionConsent(ctx: v2.Context, azureAccountProvider: AzureAccountProvider, envInfo: v3.EnvInfoV3): Promise<Result<Void, FxError>>;
 export declare function getM365TenantId(appStudioTokenProvider: AppStudioTokenProvider): Promise<Result<string, FxError>>;
 //# sourceMappingURL=provision.d.ts.map

package/build/plugins/solution/fx-solution/v3/provision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAIpB,OAAO,EAEP,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAmBhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAkKxC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4ChC;AA6JD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6BhC;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAKpB,OAAO,EACP,IAAI,EAEJ,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAsBhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CA4MxC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgJhC;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6BhC;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}

package/build/plugins/solution/fx-solution/v3/provision.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getM365TenantId = exports.askForProvisionConsent = exports.checkAzureSubscription = exports.provisionResources = exports.getQuestionsForProvision = void 0;
+exports.getM365TenantId = exports.askForProvisionConsent = exports.fillInAzureConfigs = exports.checkAzureSubscription = exports.provisionResources = exports.getQuestionsForProvision = void 0;
 const tslib_1 = require("tslib");
 const arm_resources_1 = require("@azure/arm-resources");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
@@ -15,16 +15,18 @@ const telemetry_1 = require("../../../../common/telemetry");
 const tools_1 = require("../../../../common/tools");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_2 = require("../constants");
+const provisionLocal_1 = require("../debug/provisionLocal");
 const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
 const executor_1 = require("../v2/executor");
 const constants_3 = require("./constants");
-async function getQuestionsForProvision(ctx, inputs, tokenProvider, envInfo) {
+const solutionGlobalVars_1 = require("./solutionGlobalVars");
+async function getQuestionsForProvision(ctx, inputs, envInfo, tokenProvider) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
     const root = new teamsfx_api_1.QTreeNode({ type: "group" });
     for (const pluginName of solutionSetting.activeResourcePlugins) {
         const plugin = typedi_1.Container.get(pluginName);
         if (plugin.getQuestionsForProvision) {
-            const res = await plugin.getQuestionsForProvision(ctx, inputs, tokenProvider, envInfo);
+            const res = await plugin.getQuestionsForProvision(ctx, inputs, envInfo, tokenProvider);
             if (res.isErr()) {
                 return res;
             }
@@ -39,11 +41,16 @@ async function getQuestionsForProvision(ctx, inputs, tokenProvider, envInfo) {
     return teamsfx_api_1.ok(root);
 }
 exports.getQuestionsForProvision = getQuestionsForProvision;
-async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
+async function provisionResources(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
     // check M365 tenant match
-    const appResource = envInfo.state[constants_3.BuiltInResourcePluginNames.appStudio];
-    const tenantIdInConfig = appResource.tenantId;
+    if (!envInfo.state[constants_3.BuiltInFeaturePluginNames.appStudio])
+        envInfo.state[constants_3.BuiltInFeaturePluginNames.appStudio] = {};
+    const teamsAppResource = envInfo.state[constants_3.BuiltInFeaturePluginNames.appStudio];
+    if (!envInfo.state.solution)
+        envInfo.state.solution = {};
+    const solutionConfig = envInfo.state.solution;
+    const tenantIdInConfig = teamsAppResource.tenantId;
     const tenantIdInTokenRes = await getM365TenantId(tokenProvider.appStudioToken);
     if (tenantIdInTokenRes.isErr()) {
         return teamsfx_api_1.err(tenantIdInTokenRes.error);
@@ -53,96 +60,126 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
         return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.TeamsAppTenantIdNotRight, `The signed in M365 account does not match the M365 tenant in config file for '${envInfo.envName}' environment. Please sign out and sign in with the correct M365 account.`, "Solution"));
     }
     if (!tenantIdInConfig) {
-        appResource.tenantId = tenantIdInToken;
-    }
-    // ask common question and fill in solution config
-    const solutionConfigRes = await fillInAzureSolutionConfigs(ctx, inputs, envInfo, tokenProvider);
-    if (solutionConfigRes.isErr()) {
-        return teamsfx_api_1.err(solutionConfigRes.error);
-    }
-    // ask for provision consent
-    const consentResult = await askForProvisionConsent(ctx, tokenProvider.azureAccountProvider, envInfo);
-    if (consentResult.isErr()) {
-        return teamsfx_api_1.err(consentResult.error);
+        teamsAppResource.tenantId = tenantIdInToken;
+        solutionConfig.teamsAppTenantId = tenantIdInToken;
     }
-    // create resource group if needed
-    const solutionConfig = envInfo.state.solution;
-    if (solutionConfig.needCreateResourceGroup) {
-        const createRgRes = await ResourceGroupHelper_1.resourceGroupHelper.createNewResourceGroup(solutionConfig.resourceGroupName, tokenProvider.azureAccountProvider, solutionConfig.subscriptionId, solutionConfig.location);
-        if (createRgRes.isErr()) {
-            return teamsfx_api_1.err(createRgRes.error);
+    // register teams app
+    const appStudioV3 = typedi_1.Container.get(constants_3.BuiltInFeaturePluginNames.appStudio);
+    const registerTeamsAppRes = await appStudioV3.registerTeamsApp(ctx, inputs, envInfo, tokenProvider);
+    if (registerTeamsAppRes.isErr())
+        return teamsfx_api_1.err(registerTeamsAppRes.error);
+    const teamsAppId = registerTeamsAppRes.value;
+    teamsAppResource.teamsAppId = teamsAppId;
+    solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = teamsAppId;
+    if (solutionSetting) {
+        if (envInfo.envName === "local") {
+            // TODO for local debug
+            const debugProvisionResult = await provisionLocal_1.setupLocalDebugSettings(ctx, inputs, envInfo);
+            if (debugProvisionResult.isErr()) {
+                return teamsfx_api_1.err(debugProvisionResult.error);
+            }
         }
-    }
-    // collect plugins and provisionResources
-    const plugins = solutionSetting.activeResourcePlugins.map((p) => typedi_1.Container.get(p));
-    const provisionThunks = plugins
-        .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
-        .map((plugin) => {
-        return {
-            pluginName: `${plugin.name}`,
-            taskName: "provisionResource",
-            thunk: () => {
-                if (!envInfo.state[plugin.name]) {
-                    envInfo.state[plugin.name] = {};
+        else {
+            // ask common question and fill in solution config
+            const solutionConfigRes = await fillInAzureConfigs(ctx, inputs, envInfo, tokenProvider);
+            if (solutionConfigRes.isErr()) {
+                return teamsfx_api_1.err(solutionConfigRes.error);
+            }
+            // ask for provision consent
+            const consentResult = await askForProvisionConsent(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, tokenProvider.azureAccountProvider, solutionConfig.subscriptionId, solutionConfig.location);
+                if (createRgRes.isErr()) {
+                    return teamsfx_api_1.err(createRgRes.error);
                 }
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                return plugin.provisionResource(ctx, inputs, envInfo, tokenProvider);
-            },
-        };
-    });
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_1.PluginDisplayName.Solution));
-    const provisionResult = await executor_1.executeConcurrently(provisionThunks, ctx.logProvider);
-    if (provisionResult.kind === "failure" || provisionResult.kind === "partialSuccess") {
-        return teamsfx_api_1.err(provisionResult.error);
-    }
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_1.PluginDisplayName.Solution));
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_1.PluginDisplayName.Solution));
-    const armRes = await arm_1.default.deployArmTemplates(ctx, inputs, envInfo, tokenProvider.azureAccountProvider);
-    if (armRes.isErr()) {
-        return teamsfx_api_1.err(armRes.error);
-    }
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_1.PluginDisplayName.Solution));
-    // TODO call aad.setApplicationInContext
-    ctx.logProvider.info(util.format("AAD.setApplicationInContext", constants_1.PluginDisplayName.Solution));
-    // collect plugins and call configureResource
-    const configureResourceThunks = plugins
-        .filter((plugin) => !lodash_1.isUndefined(plugin.configureResource))
-        .map((plugin) => {
-        if (!envInfo.state[plugin.name]) {
-            envInfo.state[plugin.name] = {};
+            }
         }
-        return {
-            pluginName: `${plugin.name}`,
-            taskName: "configureResource",
-            thunk: () => 
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            plugin.configureResource(ctx, inputs, envInfo, tokenProvider),
-        };
-    });
-    const configureResourceResult = await executor_1.executeConcurrently(configureResourceThunks, ctx.logProvider);
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.ConfigurationFinishNotice, constants_1.PluginDisplayName.Solution));
-    const envStates = envInfo.state;
-    if (configureResourceResult.kind === "failure" ||
-        configureResourceResult.kind === "partialSuccess") {
-        const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, ctx.projectSetting.appName);
-        ctx.logProvider.error(msg);
-        envStates.solution.provisionSucceeded = false;
-        return teamsfx_api_1.err(configureResourceResult.error);
-    }
-    const url = tools_1.getResourceGroupInPortal(envStates.solution.subscriptionId, envStates.solution.tenantId, envStates.solution.resourceGroupName);
-    const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
-    ctx.logProvider.info(msg);
-    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);
+        // collect plugins and provisionResources
+        const plugins = solutionSetting.activeResourcePlugins.map((p) => typedi_1.Container.get(p));
+        const provisionThunks = plugins
+            .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
+            .map((plugin) => {
+            return {
+                pluginName: `${plugin.name}`,
+                taskName: "provisionResource",
+                thunk: () => {
+                    if (!envInfo.state[plugin.name]) {
+                        envInfo.state[plugin.name] = {};
+                    }
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    return plugin.provisionResource(ctx, inputs, envInfo, tokenProvider);
+                },
+            };
+        });
+        ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_1.PluginDisplayName.Solution));
+        const provisionResult = await executor_1.executeConcurrently(provisionThunks, ctx.logProvider);
+        if (provisionResult.kind !== "success") {
+            return teamsfx_api_1.err(provisionResult.error);
+        }
+        ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_1.PluginDisplayName.Solution));
+        ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_1.PluginDisplayName.Solution));
+        const armRes = await arm_1.default.deployArmTemplates(ctx, inputs, envInfo, tokenProvider.azureAccountProvider);
+        if (armRes.isErr()) {
+            return teamsfx_api_1.err(armRes.error);
+        }
+        ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_1.PluginDisplayName.Solution));
+        // collect plugins and call configureResource
+        const configureResourceThunks = plugins
+            .filter((plugin) => !lodash_1.isUndefined(plugin.configureResource))
+            .map((plugin) => {
+            if (!envInfo.state[plugin.name]) {
+                envInfo.state[plugin.name] = {};
             }
+            return {
+                pluginName: `${plugin.name}`,
+                taskName: "configureResource",
+                thunk: () => 
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                plugin.configureResource(ctx, inputs, envInfo, tokenProvider),
+            };
         });
+        const configureResourceResult = await executor_1.executeConcurrently(configureResourceThunks, ctx.logProvider);
+        ctx.logProvider.info(util.format(tools_1.getStrings().solution.ConfigurationFinishNotice, constants_1.PluginDisplayName.Solution));
+        const envStates = envInfo.state;
+        if (configureResourceResult.kind !== "success") {
+            const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, ctx.projectSetting.appName);
+            ctx.logProvider.error(msg);
+            envStates.solution.provisionSucceeded = false;
+            return teamsfx_api_1.err(configureResourceResult.error);
+        }
+        if (envInfo.envName === "local") {
+            // TODO config local debug settings
+            const configLocalDebugSettingsRes = await provisionLocal_1.configLocalDebugSettings(ctx, inputs, envInfo);
+            if (configLocalDebugSettingsRes.isErr()) {
+                return teamsfx_api_1.err(configLocalDebugSettingsRes.error);
+            }
+        }
+        else {
+            const url = tools_1.getResourceGroupInPortal(envStates.solution.subscriptionId, envStates.solution.tenantId, envStates.solution.resourceGroupName);
+            const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
+            ctx.logProvider.info(msg);
+            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);
+            }
+        }
     }
-    else {
-        ctx.userInteraction.showMessage("info", msg, false);
+    //update Teams App
+    const updateTeamsAppRes = await appStudioV3.updateTeamsApp(ctx, inputs, envInfo);
+    if (updateTeamsAppRes.isErr()) {
+        return teamsfx_api_1.err(updateTeamsAppRes.error);
     }
     return teamsfx_api_1.ok(envInfo);
 }
@@ -153,30 +190,32 @@ exports.provisionResources = provisionResources;
  */
 async function checkAzureSubscription(ctx, envInfo, azureAccountProvider) {
     var _a;
-    const state = envInfo.state;
-    const subscriptionId = ((_a = envInfo.config.azure) === null || _a === void 0 ? void 0 : _a.subscriptionId) || state.solution.subscriptionId;
-    if (!subscriptionId) {
-        const askSubRes = await azureAccountProvider.getSelectedSubscription(true);
-        if (askSubRes)
-            return teamsfx_api_1.ok(askSubRes);
-        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, "Failed to select subscription", constants_2.SolutionSource));
-    }
-    let subscriptionName = state.solution.subscriptionName;
-    if (subscriptionName.length > 0) {
-        subscriptionName = `(${subscriptionName})`;
+    const subscriptionIdInConfig = ((_a = envInfo.config.azure) === null || _a === void 0 ? void 0 : _a.subscriptionId) || envInfo.state.solution.subscriptionId;
+    if (!subscriptionIdInConfig) {
+        const subscriptionInAccount = await azureAccountProvider.getSelectedSubscription(true);
+        if (subscriptionInAccount) {
+            envInfo.state.solution.subscriptionId = subscriptionInAccount.subscriptionId;
+            envInfo.state.solution.subscriptionName = subscriptionInAccount.subscriptionName;
+            envInfo.state.solution.tenantId = subscriptionInAccount.tenantId;
+            ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
+            return teamsfx_api_1.ok(teamsfx_api_1.Void);
+        }
+        else {
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, "Failed to select subscription", constants_2.SolutionSource));
+        }
     }
     // make sure the user is logged in
     await azureAccountProvider.getAccountCredentialAsync(true);
     // verify valid subscription (permission)
     const subscriptions = await azureAccountProvider.listSubscriptions();
-    const targetSubInfo = subscriptions.find((item) => item.subscriptionId === subscriptionId);
+    const targetSubInfo = subscriptions.find((item) => item.subscriptionId === subscriptionIdInConfig);
     if (!targetSubInfo) {
-        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, `The subscription '${subscriptionId}'${subscriptionName} for '${envInfo.envName}' environment is not found in the current account, please use the right Azure account or check the '${teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, envInfo.envName)}' file.`, constants_2.SolutionSource));
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, `The subscription '${subscriptionIdInConfig}'(${envInfo.state.solution.subscriptionName}) for '${envInfo.envName}' environment is not found in the current account, please use the right Azure account or check the '${teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, envInfo.envName)}' file.`, constants_2.SolutionSource));
     }
-    state.solution.subscriptionId = targetSubInfo.subscriptionId;
-    state.solution.subscriptionName = targetSubInfo.subscriptionName;
-    state.solution.tenantId = targetSubInfo.tenantId;
-    ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] check subscriptionId pass!`);
+    envInfo.state.solution.subscriptionId = targetSubInfo.subscriptionId;
+    envInfo.state.solution.subscriptionName = targetSubInfo.subscriptionName;
+    envInfo.state.solution.tenantId = targetSubInfo.tenantId;
+    ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] checkAzureSubscription pass!`);
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.checkAzureSubscription = checkAzureSubscription;
@@ -184,7 +223,7 @@ exports.checkAzureSubscription = checkAzureSubscription;
  * Asks common questions and puts the answers in the global namespace of SolutionConfig
  *
  */
-async function fillInAzureSolutionConfigs(ctx, inputs, envInfo, tokenProvider) {
+async function fillInAzureConfigs(ctx, inputs, envInfo, tokenProvider) {
     var _a, _b, _c, _d, _e, _f, _g;
     //1. check subscriptionId
     const subscriptionResult = await checkAzureSubscription(ctx, envInfo, tokenProvider.azureAccountProvider);
@@ -290,12 +329,14 @@ async function fillInAzureSolutionConfigs(ctx, inputs, envInfo, tokenProvider) {
     (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`[${constants_1.PluginDisplayName.Solution}] check resourceNameSuffix pass!`);
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
+exports.fillInAzureConfigs = fillInAzureConfigs;
 async function askForProvisionConsent(ctx, azureAccountProvider, envInfo) {
+    var _a, _b;
     const azureToken = await azureAccountProvider.getAccountCredentialAsync();
     // Only Azure project requires this confirm dialog
     const username = azureToken.username || "";
-    const subscriptionId = envInfo.state.solution.subscriptionId;
-    const subscriptionName = envInfo.state.solution.subscriptionName;
+    const subscriptionId = ((_a = envInfo.state.solution) === null || _a === void 0 ? void 0 : _a.subscriptionId) || "";
+    const subscriptionName = ((_b = envInfo.state.solution) === null || _b === void 0 ? void 0 : _b.subscriptionName) || "";
     const msgNew = util.format(tools_1.getStrings().solution.ProvisionConfirmEnvNotice, envInfo.envName, username, subscriptionName ? subscriptionName : subscriptionId);
     const confirmRes = await ctx.userInteraction.showMessage("warn", msgNew, true, "Provision");
     const confirm = (confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) ? confirmRes.value : undefined;
@@ -318,7 +359,7 @@ async function getM365TenantId(appStudioTokenProvider) {
         return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionError.NoAppStudioToken, "Graph token json is undefined", constants_2.SolutionSource));
     }
     const tenantIdInToken = appstudioTokenJson.tid;
-    if (!tenantIdInToken) {
+    if (!tenantIdInToken || !(typeof tenantIdInToken === "string")) {
         return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionError.NoTeamsAppTenantId, "Cannot find Teams app tenant id", constants_2.SolutionSource));
     }
     return teamsfx_api_1.ok(tenantIdInToken);

package/build/plugins/solution/fx-solution/v3/provision.js.map

@@ -1 +1 @@
-{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/publish.d.ts

@@ -1,4 +1,4 @@
-import { AppStudioTokenProvider, FxError, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, FxError, Json, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForPublish(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AppStudioTokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function publishApplication(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
+export declare function publishApplication(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AppStudioTokenProvider, telemetryProps?: Json): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=publish.d.ts.map

package/build/plugins/solution/fx-solution/v3/publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/publish.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EAGP,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAEhC,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/publish.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAEhC,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,sBAAsB,EACrC,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}