@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.01e159e5.0

package/build/plugins/solution/fx-solution/v2/executeUserTask.js

@@ -15,6 +15,10 @@ const typedi_1 = require("typedi");
 const scaffolding_1 = require("./scaffolding");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
 const scaffolding_2 = require("../debug/scaffolding");
+const constants_2 = require("../v3/constants");
+const core_1 = require("../../../../core");
+const constants_3 = require("./constants");
+const constants_4 = require("../constants");
 async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
     const namespace = func.namespace;
     const method = func.method;
@@ -73,34 +77,53 @@ async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenP
 }
 exports.executeUserTask = executeUserTask;
 function canAddCapability(settings, telemetryReporter) {
-    if (!(settings.hostType === question_1.HostTypeOptionAzure.id)) {
-        const e = teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
+    if (settings && !(settings.hostType === question_1.HostTypeOptionAzure.id)) {
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddCapabilityNotSupport, tools_1.getStrings().solution.addCapability.OnlySupportAzure, constants_1.SolutionSource);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, telemetryReporter));
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.canAddCapability = canAddCapability;
-function canAddResource(settings, telemetryReporter) {
-    if (!(settings.hostType === question_1.HostTypeOptionAzure.id &&
-        settings.capabilities &&
-        settings.capabilities.includes(question_1.TabOptionItem.id))) {
-        const e = teamsfx_api_1.returnUserError(new Error("Add resource is only supported for Tab app hosted in Azure."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
+function canAddResource(projectSetting, telemetryReporter) {
+    const isVS = core_1.isVSProject(projectSetting);
+    if (isVS) {
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.NotSupportForVSProject, constants_1.SolutionSource);
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
+    }
+    const solutionSettings = projectSetting.solutionSettings;
+    if (!(solutionSettings.hostType === question_1.HostTypeOptionAzure.id)) {
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.OnlySupportAzure, constants_1.SolutionSource);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.canAddResource = canAddResource;
 async function addCapability(ctx, inputs, localSettings) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b;
     ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapabilityStart, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
-    const settings = utils_1.getAzureSolutionSettings(ctx);
-    const originalSettings = lodash_1.cloneDeep(settings);
-    const canProceed = canAddCapability(settings, ctx.telemetryReporter);
+    // 1. checking addable
+    let solutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    if (!solutionSettings) {
+        // pure existing app
+        solutionSettings = {
+            name: constants_3.TeamsAppSolutionNameV2,
+            version: "1.0.0",
+            hostType: "Azure",
+            capabilities: [],
+            azureResources: [],
+            activeResourcePlugins: [],
+        };
+        ctx.projectSetting.solutionSettings = solutionSettings;
+    }
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins, existingCapabilities: originalSettings.capabilities });
+    const canProceed = canAddCapability(solutionSettings, ctx.telemetryReporter);
     if (canProceed.isErr()) {
         return teamsfx_api_1.err(canProceed.error);
     }
+    // 2. check answer
     const capabilitiesAnswer = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
     if (!capabilitiesAnswer || capabilitiesAnswer.length === 0) {
         (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
@@ -110,77 +133,132 @@ async function addCapability(ctx, inputs, localSettings) {
         });
         return teamsfx_api_1.ok({});
     }
-    const alreadyHaveBotAndAddBot = (((_b = settings.capabilities) === null || _b === void 0 ? void 0 : _b.includes(question_1.BotOptionItem.id)) ||
-        ((_c = settings.capabilities) === null || _c === void 0 ? void 0 : _c.includes(question_1.MessageExtensionItem.id))) &&
-        (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
-            capabilitiesAnswer.includes(question_1.MessageExtensionItem.id));
-    const alreadyHaveTabAndAddTab = ((_d = settings.capabilities) === null || _d === void 0 ? void 0 : _d.includes(question_1.TabOptionItem.id)) &&
-        capabilitiesAnswer.includes(question_1.TabOptionItem.id);
-    if (alreadyHaveBotAndAddBot || alreadyHaveTabAndAddTab) {
-        const e = teamsfx_api_1.returnUserError(new Error("There are no additional capabilities you can add to your project."), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
-        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, ctx.telemetryReporter));
-    }
-    let change = false;
-    const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
-    const frontendPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
-    const botPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
-    const pluginsToScaffold = [appStudioPlugin];
-    const capabilities = Array.from(settings.capabilities);
-    for (const cap of capabilitiesAnswer) {
-        if (!capabilities.includes(cap)) {
-            capabilities.push(cap);
-            change = true;
-            if (cap === question_1.TabOptionItem.id) {
-                pluginsToScaffold.push(frontendPlugin);
-                pluginsToScaffold.push(typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin));
+    // 3. check capability limit
+    const alreadyHasTab = solutionSettings.capabilities.includes(question_1.TabOptionItem.id);
+    const alreadyHasBot = solutionSettings.capabilities.includes(question_1.BotOptionItem.id);
+    const alreadyHasME = solutionSettings.capabilities.includes(question_1.MessageExtensionItem.id);
+    const toAddTab = capabilitiesAnswer.includes(question_1.TabOptionItem.id);
+    const toAddBot = capabilitiesAnswer.includes(question_1.BotOptionItem.id);
+    const toAddME = capabilitiesAnswer.includes(question_1.MessageExtensionItem.id);
+    const appStudioPlugin = typedi_1.Container.get(constants_2.BuiltInResourcePluginNames.appStudio);
+    const inputsWithProjectPath = inputs;
+    const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
+    if (tabExceedRes.isErr()) {
+        return teamsfx_api_1.err(tabExceedRes.error);
+    }
+    const isTabAddable = !tabExceedRes.value;
+    const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
+    if (botExceedRes.isErr()) {
+        return teamsfx_api_1.err(botExceedRes.error);
+    }
+    const isBotAddable = !botExceedRes.value;
+    const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
+    if (meExceedRes.isErr()) {
+        return teamsfx_api_1.err(meExceedRes.error);
+    }
+    const isMEAddable = !meExceedRes.value;
+    if ((toAddTab && !isTabAddable) || (toAddBot && !isBotAddable) || (toAddME && !isMEAddable)) {
+        const error = new teamsfx_api_1.UserError(constants_1.SolutionError.FailedToAddCapability, tools_1.getStrings().solution.addCapability.ExceedMaxLimit, constants_1.SolutionSource);
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, error, ctx.telemetryReporter));
+    }
+    const capabilitiesToAddManifest = [];
+    const pluginNamesToScaffold = new Set();
+    const pluginNamesToArm = new Set();
+    const newCapabilitySet = new Set();
+    solutionSettings.capabilities.forEach((c) => newCapabilitySet.add(c));
+    const vsProject = core_1.isVSProject(ctx.projectSetting);
+    // 4. check Tab
+    if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasTab) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin);
+            }
+        }
+        else {
+            if (!alreadyHasTab) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin);
+            }
+        }
+        capabilitiesToAddManifest.push({ name: "staticTab" });
+        newCapabilitySet.add(question_1.TabOptionItem.id);
+    }
+    // 5. check Bot
+    if (capabilitiesAnswer.includes(question_1.BotOptionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
             }
-            else if ((cap === question_1.BotOptionItem.id || cap === question_1.MessageExtensionItem.id) &&
-                !pluginsToScaffold.includes(botPlugin)) {
-                pluginsToScaffold.push(botPlugin);
+        }
+        else {
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
             }
         }
+        capabilitiesToAddManifest.push({ name: "Bot" });
+        newCapabilitySet.add(question_1.BotOptionItem.id);
     }
-    if (change) {
-        if (tools_1.isArmSupportEnabled()) {
-            showUpdateArmTemplateNotice(ctx.userInteraction);
+    // 6. check MessageExtension
+    if (capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+            }
+        }
+        else {
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+            }
         }
-        settings.capabilities = capabilities;
-        utils_1.reloadV2Plugins(settings);
-        const pluginNames = pluginsToScaffold.map((p) => p.name).join(",");
-        (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(`start scaffolding ${pluginNames}.....`);
-        const scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, true);
+        capabilitiesToAddManifest.push({ name: "MessageExtension" });
+        newCapabilitySet.add(question_1.MessageExtensionItem.id);
+    }
+    // 7. update solution settings
+    solutionSettings.capabilities = Array.from(newCapabilitySet);
+    utils_1.setActivatedResourcePluginsV2(ctx.projectSetting);
+    // 8. scaffold and update arm
+    const pluginsToScaffold = Array.from(pluginNamesToScaffold).map((name) => typedi_1.Container.get(name));
+    const pluginsToArm = Array.from(pluginNamesToArm).map((name) => typedi_1.Container.get(name));
+    if (pluginsToScaffold.length > 0) {
+        const scaffoldRes = await scaffoldCodeAndResourceTemplate(Object.assign(Object.assign({}, ctx), { appManifest: { local: {}, remote: {} } }), inputsNew, localSettings, pluginsToScaffold, pluginsToArm);
         if (scaffoldRes.isErr()) {
-            (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`failed to scaffold ${pluginNames}!`);
             ctx.projectSetting.solutionSettings = originalSettings;
             return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, scaffoldRes.error, ctx.telemetryReporter));
         }
-        (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`finish scaffolding ${pluginNames}!`);
+    }
+    // 4. update manifest
+    if (capabilitiesToAddManifest.length > 0 || pluginsToScaffold.length > 0) {
+        await appStudioPlugin.addCapabilities(ctx, inputsWithProjectPath, capabilitiesToAddManifest);
+    }
+    if (capabilitiesAnswer.length > 0) {
         const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
         const single = capabilitiesAnswer.length === 1;
         const template = inputs.platform === teamsfx_api_1.Platform.CLI
             ? single
-                ? tools_1.getStrings().solution.AddCapabilityNoticeForCli
-                : tools_1.getStrings().solution.AddCapabilitiesNoticeForCli
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
             : single
-                ? tools_1.getStrings().solution.AddCapabilityNotice
-                : tools_1.getStrings().solution.AddCapabilitiesNotice;
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
         const msg = util.format(template, addNames);
         ctx.userInteraction.showMessage("info", msg, false);
-        (_h = ctx.telemetryReporter) === null || _h === void 0 ? void 0 : _h.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
+        (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
             [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
             [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
             [constants_1.SolutionTelemetryProperty.Capabilities]: capabilitiesAnswer.join(";"),
         });
-        return teamsfx_api_1.ok({ solutionSettings: settings, solutionConfig: { provisionSucceeded: false } });
     }
-    const cannotAddCapWarnMsg = "Add nothing";
-    ctx.userInteraction.showMessage("warn", cannotAddCapWarnMsg, false);
-    ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
-        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-        [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-        [constants_1.SolutionTelemetryProperty.Capabilities]: [].join(";"),
+    return teamsfx_api_1.ok({
+        solutionSettings: solutionSettings,
+        solutionConfig: { provisionSucceeded: false },
     });
-    return teamsfx_api_1.ok({});
 }
 exports.addCapability = addCapability;
 function showUpdateArmTemplateNotice(ui) {
@@ -188,101 +266,113 @@ function showUpdateArmTemplateNotice(ui) {
     ui === null || ui === void 0 ? void 0 : ui.showMessage("info", msg, false);
 }
 exports.showUpdateArmTemplateNotice = showUpdateArmTemplateNotice;
-async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, generateTemplate, pluginsToDoArm) {
+async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, pluginsToDoArm) {
     const result = await scaffolding_1.scaffoldByPlugins(ctx, inputs, localSettings, pluginsToScaffold);
     if (result.isErr()) {
         return result;
     }
-    if (!generateTemplate || !tools_1.isArmSupportEnabled()) {
-        return result;
-    }
     const scaffoldLocalDebugSettingsResult = await scaffolding_2.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
     if (scaffoldLocalDebugSettingsResult.isErr()) {
         return scaffoldLocalDebugSettingsResult;
     }
-    return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold);
+    const pluginsToUpdateArm = pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold;
+    if (pluginsToUpdateArm.length > 0) {
+        return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToUpdateArm);
+    }
+    return teamsfx_api_1.ok(undefined);
 }
 async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvider) {
     var _a, _b, _c, _d, _e;
     (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResourceStart, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
-    const settings = utils_1.getAzureSolutionSettings(ctx);
-    const canProceed = canAddResource(settings, ctx.telemetryReporter);
+    // 1. checking addable
+    const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    if (!solutionSettings) {
+        return teamsfx_api_1.err(new core_1.OperationNotSupportedForExistingAppError("addResource"));
+    }
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins });
+    const canProceed = canAddResource(ctx.projectSetting, ctx.telemetryReporter);
     if (canProceed.isErr()) {
-        return canProceed;
+        return teamsfx_api_1.err(canProceed.error);
     }
-    const selectedPlugins = settings.activeResourcePlugins;
-    const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
-    const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
-    const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
-    const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
-    const alreadyHaveFunction = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(functionPlugin.name);
-    const alreadyHaveSql = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(sqlPlugin.name);
-    const alreadyHaveApim = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(apimPlugin.name);
-    const alreadyHaveKeyVault = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(keyVaultPlugin.name);
+    // 2. check answer
     const addResourcesAnswer = inputs[question_1.AzureSolutionQuestionNames.AddResources];
-    if (!addResourcesAnswer) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer of ${question_1.AzureSolutionQuestionNames.AddResources} is empty!`), constants_1.SolutionSource, constants_1.SolutionError.InvalidInput));
+    if (!addResourcesAnswer || addResourcesAnswer.length === 0) {
+        (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
+            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+            [constants_1.SolutionTelemetryProperty.Resources]: [].join(";"),
+        });
+        return teamsfx_api_1.ok({});
     }
+    const alreadyHaveFunction = solutionSettings.azureResources.includes(question_1.AzureResourceFunction.id);
+    const alreadyHaveApim = solutionSettings.azureResources.includes(question_1.AzureResourceApim.id);
+    const alreadyHaveKeyVault = solutionSettings.azureResources.includes(question_1.AzureResourceKeyVault.id);
     const addSQL = addResourcesAnswer.includes(question_1.AzureResourceSQL.id);
-    const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id);
     const addApim = addResourcesAnswer.includes(question_1.AzureResourceApim.id);
     const addKeyVault = addResourcesAnswer.includes(question_1.AzureResourceKeyVault.id);
-    if ((alreadyHaveSql && addSQL) ||
-        (alreadyHaveApim && addApim) ||
-        (alreadyHaveKeyVault && addKeyVault)) {
-        const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
+    const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id) || (addApim && !alreadyHaveFunction);
+    // 3. check APIM and KeyVault addable
+    if ((alreadyHaveApim && addApim) || (alreadyHaveKeyVault && addKeyVault)) {
+        const e = new teamsfx_api_1.UserError(new Error("APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
     }
-    let addNewResourceToProvision = false;
-    const notifications = [];
+    const newResourceSet = new Set();
+    solutionSettings.azureResources.forEach((r) => newResourceSet.add(r));
+    const addedResources = [];
     const pluginsToScaffold = [];
     const pluginsToDoArm = [];
-    const azureResource = Array.from(settings.azureResources || []);
     let scaffoldApim = false;
-    if (addFunc || ((addSQL || addApim) && !alreadyHaveFunction)) {
+    // 4. check Function
+    if (addFunc) {
+        // AAD plugin needs to be activated when adding function.
+        // Since APIM also have dependency on Function, will only add depenedency here.
+        if (!((_c = solutionSettings.activeResourcePlugins) === null || _c === void 0 ? void 0 : _c.includes(constants_4.PluginNames.AAD))) {
+            (_d = solutionSettings.activeResourcePlugins) === null || _d === void 0 ? void 0 : _d.push(constants_4.PluginNames.AAD);
+        }
+        const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
         pluginsToScaffold.push(functionPlugin);
-        if (!azureResource.includes(question_1.AzureResourceFunction.id)) {
-            azureResource.push(question_1.AzureResourceFunction.id);
-            addNewResourceToProvision = true;
+        if (!alreadyHaveFunction) {
             pluginsToDoArm.push(functionPlugin);
         }
-        notifications.push(question_1.AzureResourceFunction.label);
+        addedResources.push(question_1.AzureResourceFunction.id);
     }
-    if (addSQL && !alreadyHaveSql) {
-        pluginsToScaffold.push(sqlPlugin);
+    // 5. check SQL
+    if (addSQL) {
+        const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
+        const identityPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.IdentityPlugin);
         pluginsToDoArm.push(sqlPlugin);
-        azureResource.push(question_1.AzureResourceSQL.id);
-        notifications.push(question_1.AzureResourceSQL.label);
-        addNewResourceToProvision = true;
+        if (!solutionSettings.activeResourcePlugins.includes(identityPlugin.name)) {
+            // add identity for first time
+            pluginsToDoArm.push(identityPlugin);
+        }
+        addedResources.push(question_1.AzureResourceSQL.id);
     }
-    if (addApim && !alreadyHaveApim) {
+    // 6. check APIM
+    const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
+    if (addApim) {
         // We don't add apimPlugin into pluginsToScaffold because
         // apim plugin needs to modify config output during scaffolding,
         // which is not supported by the scaffoldSourceCode API.
-        // The scaffolding will run later as a usertask as a work around.
-        azureResource.push(question_1.AzureResourceApim.id);
-        notifications.push(question_1.AzureResourceApim.label);
-        addNewResourceToProvision = true;
+        // The scaffolding will run later as a userTask as a work around.
+        addedResources.push(question_1.AzureResourceApim.id);
         pluginsToDoArm.push(apimPlugin);
         scaffoldApim = true;
     }
-    if (addKeyVault && !alreadyHaveKeyVault) {
-        pluginsToScaffold.push(keyVaultPlugin);
+    if (addKeyVault) {
+        const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
         pluginsToDoArm.push(keyVaultPlugin);
-        azureResource.push(question_1.AzureResourceKeyVault.id);
-        notifications.push(question_1.AzureResourceKeyVault.label);
-        addNewResourceToProvision = true;
+        addedResources.push(question_1.AzureResourceKeyVault.id);
     }
-    if (notifications.length > 0) {
-        if (tools_1.isArmSupportEnabled() && addNewResourceToProvision) {
-            showUpdateArmTemplateNotice(ctx.userInteraction);
-        }
-        settings.azureResources = azureResource;
-        utils_1.reloadV2Plugins(settings);
-        (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`start scaffolding ${notifications.join(",")}.....`);
-        let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, addNewResourceToProvision, pluginsToDoArm);
+    // 7. update solution settings
+    addedResources.forEach((r) => newResourceSet.add(r));
+    solutionSettings.azureResources = Array.from(newResourceSet);
+    utils_1.setActivatedResourcePluginsV2(ctx.projectSetting);
+    // 8. scaffold and update arm
+    if (pluginsToScaffold.length > 0 || pluginsToDoArm.length > 0) {
+        let scaffoldRes = await scaffoldCodeAndResourceTemplate(Object.assign(Object.assign({}, ctx), { appManifest: { local: {}, remote: {} } }), inputsNew, localSettings, pluginsToScaffold, pluginsToDoArm);
         if (scaffoldApim) {
             if (apimPlugin && apimPlugin.executeUserTask) {
                 const result = await apimPlugin.executeUserTask(ctx, inputs, func, {}, envInfo, tokenProvider);
@@ -292,21 +382,27 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
             }
         }
         if (scaffoldRes.isErr()) {
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${notifications.join(",")}!`);
+            ctx.projectSetting.solutionSettings = originalSettings;
             return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
         }
-        (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`finish scaffolding ${notifications.join(",")}!`);
-        ctx.userInteraction.showMessage("info", util.format(inputs.platform === teamsfx_api_1.Platform.CLI
-            ? tools_1.getStrings().solution.AddResourceNoticeForCli
-            : tools_1.getStrings().solution.AddResourceNotice, notifications.join(",")), false);
+        const addNames = addedResources.map((c) => `'${c}'`).join(" and ");
+        const single = addedResources.length === 1;
+        const template = inputs.platform === teamsfx_api_1.Platform.CLI
+            ? single
+                ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
+                : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
+            : single
+                ? tools_1.getStrings().solution.addResource.AddResourceNotice
+                : tools_1.getStrings().solution.addResource.AddResourcesNotice;
+        ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
     }
     (_e = ctx.telemetryReporter) === null || _e === void 0 ? void 0 : _e.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
         [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
         [constants_1.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
     });
-    return teamsfx_api_1.ok(addNewResourceToProvision
-        ? { solutionSettings: settings, solutionConfig: { provisionSucceeded: false } }
+    return teamsfx_api_1.ok(pluginsToDoArm.length > 0
+        ? { solutionSettings: solutionSettings, solutionConfig: { provisionSucceeded: false } }
         : teamsfx_api_1.Void);
 }
 exports.addResource = addResource;

package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map

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

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts

@@ -1,4 +1,4 @@
-import { v2, Inputs, FxError, Result, Json } from "@microsoft/teamsfx-api";
+import { FxError, Inputs, Json, Result, v2, v3 } from "@microsoft/teamsfx-api";
 export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<Json, FxError>>;
-export declare function generateResourceTemplateForPlugins(ctx: v2.Context, inputs: Inputs, plugins: v2.ResourcePlugin[]): Promise<Result<Json, FxError>>;
+export declare function generateResourceTemplateForPlugins(ctx: v3.ContextWithManifest, inputs: v3.PluginAddResourceInputs, plugins: v2.ResourcePlugin[]): Promise<Result<Json, FxError>>;
 //# sourceMappingURL=generateResourceTemplate.d.ts.map

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAM,MAAM,wBAAwB,CAAC;AAM/E,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAWhC;AAED,wBAAsB,kCAAkC,CACtD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAWhC"}
+{"version":3,"file":"generateResourceTemplate.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAO/E,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAOhC;AAED,wBAAsB,kCAAkC,CACtD,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,uBAAuB,EAClC,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAKhC"}

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js

@@ -1,30 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateResourceTemplateForPlugins = exports.generateResourceTemplate = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../../../common/tools");
-const arm_1 = require("../arm");
+const tslib_1 = require("tslib");
+const arm_1 = tslib_1.__importStar(require("../arm"));
+const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const adaptor_1 = require("./adaptor");
+const executeUserTask_1 = require("./executeUserTask");
 const utils_1 = require("./utils");
 async function generateResourceTemplate(ctx, inputs) {
-    if (!tools_1.isArmSupportEnabled()) {
-        return teamsfx_api_1.ok({});
-    }
     const legacyContext = new adaptor_1.ScaffoldingContextAdapter([ctx, inputs]);
-    const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
-    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings).map((plugin) => new adaptor_1.NamedArmResourcePluginAdaptor(plugin));
-    const armResult = await arm_1.generateArmTemplate(legacyContext, plugins);
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting).map((plugin) => new adaptor_1.NamedArmResourcePluginAdaptor(plugin));
+    const armResult = await arm_1.armV2.generateArmTemplate(legacyContext, plugins);
     return armResult;
 }
 exports.generateResourceTemplate = generateResourceTemplate;
 async function generateResourceTemplateForPlugins(ctx, inputs, plugins) {
-    if (!tools_1.isArmSupportEnabled()) {
-        return teamsfx_api_1.ok({});
-    }
-    const legacyContext = new adaptor_1.ScaffoldingContextAdapter([ctx, inputs]);
-    // todo(yefuwang): replace generateArmTemplate when v2 implementation is ready.
-    const namedArmResourcePlugins = plugins.map((plugin) => new adaptor_1.NamedArmResourcePluginAdaptor(plugin));
-    const armResult = await arm_1.generateArmTemplate(legacyContext, namedArmResourcePlugins);
+    executeUserTask_1.showUpdateArmTemplateNotice(ctx.userInteraction);
+    const allPlugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSetting);
+    const armResult = await arm_1.default.generateArmTemplate(ctx, inputs, allPlugins, plugins);
     return armResult;
 }
 exports.generateResourceTemplateForPlugins = generateResourceTemplateForPlugins;

package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;AAAA,wDAA+E;AAC/E,oDAA+D;AAC/D,gCAA6C;AAC7C,uCAAqF;AACrF,mCAAuE;AAEhE,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IACD,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,0BAAkB,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAC3D,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,MAAM,CAAC,CACtD,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,yBAAmB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpE,OAAO,SAAS,CAAC;AACnB,CAAC;AAdD,4DAcC;AAEM,KAAK,UAAU,kCAAkC,CACtD,GAAe,EACf,MAAc,EACd,OAA4B;IAE5B,IAAI,CAAC,2BAAmB,EAAE,EAAE;QAC1B,OAAO,gBAAE,CAAC,EAAE,CAAC,CAAC;KACf;IACD,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,+EAA+E;IAC/E,MAAM,uBAAuB,GAAG,OAAO,CAAC,GAAG,CACzC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,MAAM,CAAC,CACtD,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,yBAAmB,CAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC;IACpF,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,gFAeC"}
+{"version":3,"file":"generateResourceTemplate.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/generateResourceTemplate.ts"],"names":[],"mappings":";;;;AACA,sDAAoC;AACpC,wEAA2E;AAC3E,uCAAqF;AACrF,uDAAgE;AAChE,mCAAuE;AAEhE,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAc;IAEd,MAAM,aAAa,GAAG,IAAI,mCAAyB,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,GAAG,CACxD,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,MAAM,CAAC,CACtD,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,WAAK,CAAC,mBAAmB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1E,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,4DAUC;AAEM,KAAK,UAAU,kCAAkC,CACtD,GAA2B,EAC3B,MAAkC,EAClC,OAA4B;IAE5B,6CAA2B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,uDAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClF,OAAO,SAAS,CAAC;AACnB,CAAC;AATD,gFASC"}