@microsoft/teamsfx-core 1.2.0 → 1.2.2-alpha.29989668.0

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

@@ -41,8 +41,7 @@ async function executeCheckPermissionV1(ctx, userInfo) {
     return [permissions, errors];
 }
 async function executeCheckPermissionV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
-    var _a;
-    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins((_a = ctx.projectSetting) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !!plugin.checkPermission)
         .map((plugin) => {
@@ -79,17 +78,20 @@ async function checkPermissionImpl(param, envState, envName, telemetryReporter,
     if (platform === teamsfx_api_1.Platform.CLI) {
         const aadAppTenantId = (_a = envState.get(constants_1.PluginNames.SOLUTION)) === null || _a === void 0 ? void 0 : _a.get(constants_1.REMOTE_TEAMS_APP_TENANT_ID);
         if (!envName) {
-            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
+            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnSystemError(new Error(common_1.getStrings().solution.Collaboration.FailedToGetEnvName), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
         }
         const message = [
-            { content: `Account used to check: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            {
+                content: common_1.getStrings().solution.Collaboration.AccountUsedToCheck,
+                color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+            },
             { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
             {
-                content: `Starting check permission for environment: `,
+                content: common_1.getStrings().solution.Collaboration.StaringCheckPermission,
                 color: teamsfx_api_1.Colors.BRIGHT_WHITE,
             },
             { content: `${envName}\n`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-            { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            { content: common_1.getStrings().solution.Collaboration.TenantId, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
             { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
         ];
         ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
@@ -99,7 +101,7 @@ async function checkPermissionImpl(param, envState, envName, telemetryReporter,
         : await executeCheckPermissionV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
     let errorMsg = "";
     if (errors.length > 0) {
-        errorMsg += `Failed to check permission for the below resources.\n Resource details: \n`;
+        errorMsg += common_1.getStrings().solution.Collaboration.FailedToCheckPermission;
         for (const fxError of errors) {
             errorMsg += fxError.error.message + "\n";
         }
@@ -107,13 +109,21 @@ async function checkPermissionImpl(param, envState, envName, telemetryReporter,
     if (platform === teamsfx_api_1.Platform.CLI) {
         for (const permission of permissions) {
             const message = [
-                { content: `Resource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                { content: (_b = permission.resourceId) !== null && _b !== void 0 ? _b : "undefined", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-                { content: `, Resource Name: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                {
+                    content: common_1.getStrings().solution.Collaboration.CheckPermissionResourceId,
+                    color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                },
+                {
+                    content: (_b = permission.resourceId) !== null && _b !== void 0 ? _b : common_1.getStrings().solution.Collaboration.Undefined,
+                    color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
+                },
+                { content: common_1.getStrings().solution.Collaboration.ResourceName, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
                 { content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-                { content: `, Permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                { content: common_1.getStrings().solution.Collaboration.Permission, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
                 {
-                    content: permission.roles ? permission.roles.toString() : "undefined" + "\n",
+                    content: permission.roles
+                        ? permission.roles.toString()
+                        : common_1.getStrings().solution.Collaboration.Undefined + "\n",
                     color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
                 },
             ];
@@ -130,10 +140,10 @@ async function checkPermissionImpl(param, envState, envName, telemetryReporter,
         [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
         [constants_1.SolutionTelemetryProperty.AadPermission]: (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
             ? aadPermission.roles.join(";")
-            : "undefined",
+            : common_1.getStrings().solution.Collaboration.Undefined,
         [constants_1.SolutionTelemetryProperty.TeamsAppPermission]: (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
             ? teamsAppPermission.roles.join(";")
-            : "undefined",
+            : common_1.getStrings().solution.Collaboration.Undefined,
     });
     return teamsfx_api_1.ok({
         state: common_1.CollaborationState.OK,
@@ -155,7 +165,8 @@ async function checkPermission(param) {
     else {
         const configMap = teamsfx_api_1.ConfigMap.fromJSON(param.envInfo.state);
         if (!configMap) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`failed to convert profile ${JSON.stringify(param.envInfo.state)}`), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(common_1.getStrings().solution.Collaboration.FailedToConvertProfile +
+                JSON.stringify(param.envInfo.state)), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
         }
         const envState = utils4v2_1.flattenConfigMap(configMap);
         const envName = param.envInfo.envName;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgC/F"}
+{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6B/F"}

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

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEnv = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../../../common/tools");
 const core_1 = require("../../../../core");
 const arm_1 = require("../arm");
 const utils_1 = require("./utils");
 async function createEnv(ctx, inputs) {
-    if (tools_1.isArmSupportEnabled() &&
-        utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
+    if (utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
         const solutionContext = {
             root: inputs.projectPath || "",
             envInfo: core_1.newEnvInfo(inputs.targetEnvName),

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

@@ -1 +1 @@
-{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,oDAA+D;AAC/D,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IACE,2BAAmB,EAAE;QACrB,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAC5E;QACA,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAhCD,8BAgCC"}
+{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IAAI,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAAE;QAChF,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7BD,8BA6BC"}

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

@@ -22,7 +22,7 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
     if (optionsToDeploy === undefined || optionsToDeploy.length === 0) {
         return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`No plugin selected`), constants_2.SolutionSource, constants_2.SolutionError.NoResourcePluginSelected));
     }
-    const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.deploy) && optionsToDeploy.includes(plugin.name))
         .map((plugin) => {

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

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

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

@@ -1,7 +1,7 @@
-import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json, ProjectSettings } from "@microsoft/teamsfx-api";
 export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
 export declare function canAddCapability(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
-export declare function canAddResource(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
+export declare function canAddResource(projectSetting: ProjectSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
 export declare function addCapability(ctx: v2.Context, inputs: Inputs, localSettings: Json): Promise<Result<{
     solutionSettings?: SolutionSettings;
     solutionConfig?: Record<string, unknown>;

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

@@ -1 +1 @@
-{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAkChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAkCD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAmKnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EAMJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAwBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2MA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AA4BD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+JnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}