npm - @microsoft/teamsfx-core - Versions diffs - 2.0.1 → 2.0.2-alpha.bd1241522.0 - Mend

@microsoft/teamsfx-core 2.0.1 → 2.0.2-alpha.bd1241522.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1003) hide show

package/build/component/deployUtils.js CHANGED Viewed

@@ -4,105 +4,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployUtils = exports.DeployUtils = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const lodash_1 = require("lodash");
-const typedi_1 = require("typedi");
-const constants_1 = require("../common/constants");
 const localizeUtils_1 = require("../common/localizeUtils");
-const constants_2 = require("./constants");
-const constants_3 = require("./constants");
-const utils_1 = require("./utils");
-const executor_1 = require("./utils/executor");
+const constants_1 = require("./constants");
 class DeployUtils {
-    /**
-     * make sure subscription is correct before deployment
-     *
-     */
-    async checkDeployAzureSubscription(ctx, envInfo, azureAccountProvider) {
-        var _a;
-        const subscriptionIdInConfig = ((_a = envInfo.config.azure) === null || _a === void 0 ? void 0 : _a.subscriptionId) || envInfo.state.solution.subscriptionId;
-        const subscriptionInAccount = await azureAccountProvider.getSelectedSubscription(true);
-        if (!subscriptionIdInConfig) {
-            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.SolutionSource, constants_2.SolutionError.SubscriptionNotFound, "Failed to select subscription"));
-            }
-        }
-        // make sure the user is logged in
-        await azureAccountProvider.getIdentityCredentialAsync(true);
-        // verify valid subscription (permission)
-        const subscriptions = await azureAccountProvider.listSubscriptions();
-        const targetSubInfo = subscriptions.find((item) => item.subscriptionId === subscriptionIdInConfig);
-        if (!targetSubInfo) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, 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.`));
-        }
-        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);
-    }
-    async deployAadFromVscode(context, inputs) {
-        const thunks = [];
-        // 1. collect resources to deploy
-        const deployComponent = typedi_1.Container.get(constants_3.ComponentNames.AadApp);
-        thunks.push({
-            pluginName: `${deployComponent.name}`,
-            taskName: `deploy`,
-            thunk: async () => {
-                const clonedInputs = lodash_1.cloneDeep(inputs);
-                clonedInputs.componentId = deployComponent.name;
-                return await deployComponent.deploy(context, clonedInputs);
-            },
-        });
-        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")));
-        }
-        context.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.selectedPluginsToDeployNotice", constants_1.PluginDisplayName.Solution, JSON.stringify(thunks.map((p) => p.pluginName))));
-        // 2. start deploy
-        context.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.startNotice", constants_1.PluginDisplayName.Solution));
-        const result = await executor_1.executeConcurrently(thunks, context.logProvider);
-        if (result.kind === "success") {
-            const msg = localizeUtils_1.getLocalizedString("core.deploy.aadManifestSuccessNotice");
-            context.logProvider.info(msg);
-            context.userInteraction
-                .showMessage("info", msg, false, localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore"))
-                .then((result) => {
-                var _a;
-                const userSelected = result.isOk() ? result.value : undefined;
-                if (userSelected === localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore")) {
-                    (_a = context.userInteraction) === null || _a === void 0 ? void 0 : _a.openUrl(constants_2.ViewAadAppHelpLink);
-                }
-            });
-            return teamsfx_api_1.ok(undefined);
-        }
-        else {
-            const msg = localizeUtils_1.getLocalizedString("core.deploy.failNotice", context.projectSetting.appName);
-            context.logProvider.info(msg);
-            return teamsfx_api_1.err(utils_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.Deploy, result.error, context.telemetryReporter));
-        }
-    }
-    async askForDeployConsent(ctx, azureAccountProvider, envInfo) {
-        var _a, _b;
-        const azureTokenJson = await azureAccountProvider.getJsonObject();
-        // Only Azure project requires this confirm dialog
-        const username = azureTokenJson.unique_name || "";
-        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 msg = localizeUtils_1.getLocalizedString("core.deploy.confirmEnvNotice", envInfo.envName, username, subscriptionName ? subscriptionName : subscriptionId);
-        const deployOption = localizeUtils_1.getLocalizedString("core.option.deploy");
-        const result = await ctx.userInteraction.showMessage("warn", msg, true, deployOption);
-        const choice = (result === null || result === void 0 ? void 0 : result.isOk()) ? result.value : undefined;
-        if (choice === deployOption) {
-            return teamsfx_api_1.ok(teamsfx_api_1.Void);
-        }
-        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, "UserCancel", "UserCancel"));
-    }
     async askForDeployConsentV3(ctx) {
         var _a;
         const msg = localizeUtils_1.getLocalizedString("core.deploy.confirmEnvNoticeV3", process.env.TEAMSFX_ENV);
@@ -112,7 +16,7 @@ class DeployUtils {
         if (choice === deployOption) {
             return teamsfx_api_1.ok(teamsfx_api_1.Void);
         }
-        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, "UserCancel", "UserCancel"));
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, "UserCancel", "UserCancel"));
     }
 }
 exports.DeployUtils = DeployUtils;

package/build/component/deployUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deployUtils.js","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,~~wDAegC~~;~~AAChC~~,~~mCAAmC~~;~~AACnC~~,~~mCAAmC;AACnC,mDAAwD;AACxD,2DAA+E;AAC/E,2CAKqB;AACrB,~~2CAA6C;AAG7C,~~mCAA4D;AAC5D,+CAAuD;AAEvD,~~MAAa,WAAW;IACtB~~;;;OAGG;IACH~~,KAAK,CAAC,~~4BAA4B,CAChC,GAAe,EACf,OAAqB,EACrB,oBAA0C;;QAE1C,MAAM,sBAAsB,GAC1B,CAAA,MAAA,OAAO,CAAC,MAAM,CAAC,KAAK,0CAAE,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAyB,CAAC;QAC5F,MAAM,~~qBAAqB,~~GAAG,MAAM,oBAAoB,~~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~~AAnKD~~,~~kCAmKC~~;AACY,QAAA,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC"}
1	+ {"version":3,"file":"deployUtils.js","sourceRoot":"","sources":["../../src/component/deployUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmF;AACnF,2DAA6D;AAC7D,2CAA6C;AAG7C,MAAa,WAAW;IACtB,KAAK,CAAC,qBAAqB,CAAC,GAAkB;;QAC5C,MAAM,GAAG,GAAG,kCAAkB,CAAC,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1F,MAAM,YAAY,GAAG,kCAAkB,CAAC,oBAAoB,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA,CAAC;QAC1E,MAAM,MAAM,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,IAAI,MAAM,KAAK,YAAY,EAAE;YAC3B,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;SACjB;QACD,OAAO,iBAAG,CAAC,IAAI,uBAAS,CAAC,0BAAc,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,CAAC;CACF;AAXD,kCAWC;AACY,QAAA,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC"}

package/build/component/driver/aad/create.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EACL,OAAO,EAEP,MAAM,EAKP,MAAM,wBAAwB,CAAC;~~AAqBhC~~,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8H3B,OAAO,CAAC,YAAY;YA2BN,kBAAkB;CAWjC"}
1	+ {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EACL,OAAO,EAEP,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8H3B,OAAO,CAAC,YAAY;YA2BN,kBAAkB;CAWjC"}

package/build/component/driver/aad/create.js CHANGED Viewed

@@ -100,13 +100,13 @@ let CreateAadAppDriver = class CreateAadAppDriver {
                 (_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_2.logMessageKeys.failExecuteDriver, actionName, message));
                 if (error.response.status >= 400 && error.response.status < 500) {
                     return {
-                        result: teamsfx_api_1.err(new common_1.UnhandledUserError(error, actionName, helpLink)),
+                        result: teamsfx_api_1.err(new common_1.HttpClientError(actionName, message, helpLink)),
                         summaries: summaries,
                     };
                 }
                 else {
                     return {
-                        result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
+                        result: teamsfx_api_1.err(new common_1.HttpServerError(actionName, message)),
                         summaries: summaries,
                     };
                 }

package/build/component/driver/aad/create.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAEjC,yDAAsD;AACtD,uEAAgF;AAChF,wDAQgC;AAChC,iDAAoD;AACpD,+DAA4D;AAC5D,6DAA8D;AAC9D,0DAA0B;AAC1B,+CAA8C;AAC9C,mFAAgF;AAChF,iEAAmE;AACnE,mDAA6E;AAC7E,~~kDAAoG~~;~~AACpG~~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~~2BAAkB~~,CAAC,~~KAAc~~,EAAE,~~UAAU~~,EAAE,QAAQ,CAAC,CAAC;~~wBACzE~~,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH;qBAAM;oBACL,OAAO;wBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,~~uBAAc~~,CAAC,~~KAAc~~,EAAE,~~UAAU~~,CAAC,CAAC;~~wBAC3D~~,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH;aACF;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,OAAO;gBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,uBAAc,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;gBAC3D,SAAS,EAAE,SAAS;aACrB,CAAC;SACH;IACH,CAAC;IAEO,YAAY,CAAC,IAAsB;QACzC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC7F,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;SAChD;QAED,2CAA2C;QAC3C,IACE,IAAI,CAAC,cAAc;YACnB,CAAC,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ;gBACtC,CAAC,MAAM,CAAC,MAAM,CAAC,+BAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAC/D;YACA,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC1C;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;IAED,aAAa;IACb,uDAAuD;IACvD,iDAAiD;IACzC,KAAK,CAAC,kBAAkB,CAAC,aAAgC,EAAE,KAAyB;QAC1F,MAAM,mBAAmB,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,mBAAW,EAAE,CAAC,CAAC;QACvF,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;YAC/B,MAAM,mBAAmB,CAAC,KAAK,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAa,CAAC,CAAC,iCAAiC;QAC3F,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC1B,KAAK,CAAC,aAAa,GAAG,qBAAS,CAAC,oBAAoB,CAAC;QACrD,KAAK,CAAC,SAAS,GAAG,GAAG,qBAAS,CAAC,oBAAoB,IAAI,QAAQ,EAAE,CAAC;IACpE,CAAC;CACF,CAAA;AAxKC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,6CAA6C,CAAC,CAAC;KAClF,CAAC;;6DAIoB,GAAG;;iDA6HxB;AA/IU,kBAAkB;IAD9B,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,kBAAkB,CAuL9B;AAvLY,gDAAkB"}
1	+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"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"}

package/build/component/driver/aad/update.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,OAAO,EAAmC,OAAO,EAAE,MAAM,EAAY,MAAM,wBAAwB,CAAC;~~AAapG~~,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAyF9F,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,gBAAgB;CAKzB"}
1	+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,OAAO,EAAmC,OAAO,EAAE,MAAM,EAAY,MAAM,wBAAwB,CAAC;AAkBpG,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAEnD,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAyF9F,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,gBAAgB;CAKzB"}

package/build/component/driver/aad/update.js CHANGED Viewed

@@ -68,13 +68,13 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
                 (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
                 if (error.response.status >= 400 && error.response.status < 500) {
                     return {
-                        result: teamsfx_api_1.err(new common_1.UnhandledUserError(error, actionName, helpLink)),
+                        result: teamsfx_api_1.err(new common_1.HttpClientError(actionName, message, helpLink)),
                         summaries: summaries,
                     };
                 }
                 else {
                     return {
-                        result: teamsfx_api_1.err(new common_1.UnhandledError(error, actionName)),
+                        result: teamsfx_api_1.err(new common_1.HttpServerError(actionName, message)),
                         summaries: summaries,
                     };
                 }

package/build/component/driver/aad/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":";;;;AAKA,mCAAiC;AACjC,yDAAsD;AACtD,0DAA0B;AAC1B,wDAAoG;AACpG,+CAA8C;AAC9C,mFAAgF;AAChF,iEAAmE;AACnE,mDAA6E;AAC7E,iEAA8D;AAE9D,~~kDAAoG~~;~~AACpG~~,iEAA8D;AAE9D,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,yBAAyB;AAC7D,MAAM,QAAQ,GAAG,8CAA8C,CAAC;AAChE,oEAAoE;AAEpE,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,gBAAW,GAAG,kCAAkB,CAAC,kCAAsB,CAAC,MAAM,CAAC,CAAC;IA2HlE,CAAC;IAzHQ,KAAK,CAAC,GAAG,CACd,IAAsB,EACtB,OAAsB;QAEtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAMM,KAAK,CAAC,OAAO,CAAC,IAAsB,EAAE,OAAsB;;QACjE,MAAM,SAAS,GAAa,EAAE,CAAC;QAE/B,IAAI;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;YAC7F,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAEtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAEjE,MAAM,QAAQ,GAAG,MAAM,mCAAgB,CACrC,OAAO,EACP,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,cAAc,EACnB,KAAK,CACN,CAAC;YAEF,mGAAmG;YACnG,2CAA2C;YAC3C,oHAAoH;YACpH,IAAI,QAAQ,CAAC,yBAAyB,IAAI,QAAQ,CAAC,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvF,MAAM,yBAAyB,GAAG,QAAQ,CAAC,yBAAyB,CAAC;gBACrE,QAAQ,CAAC,yBAAyB,GAAG,EAAE,CAAC;gBACxC,MAAM,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC1C,QAAQ,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;aAChE;YACD,8EAA8E;YAC9E,MAAM,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,kCAAkB,CAChC,0BAAc,CAAC,2BAA2B,EAC1C,IAAI,CAAC,YAAY,EACjB,QAAQ,CAAC,EAAE,CACZ,CAAC;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAExB,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,EAAE,UAAU,CAAC,CACpE,CAAC;YAEF,OAAO;gBACL,MAAM,EAAE,gBAAE,CACR,IAAI,GAAG,CACL,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,oCAAoC;qBACvD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,uCAAuC;iBACvF,CACF;gBACD,SAAS,EAAE,SAAS;aACrB,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,OAAO;oBACL,MAAM,EAAE,iBAAG,CAAC,KAAK,CAAC;oBAClB,SAAS,EAAE,SAAS;iBACrB,CAAC;aACH;YACD,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,CAAC;gBACrD,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;gBACF,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,GAAG,GAAG,EAAE;oBACjE,OAAO;wBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,~~2BAAkB~~,CAAC,~~KAAc~~,EAAE,~~UAAU~~,EAAE,QAAQ,CAAC,CAAC;~~wBACzE~~,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH;qBAAM;oBACL,OAAO;wBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,~~uBAAc~~,CAAC,~~KAAc~~,EAAE,~~UAAU~~,CAAC,CAAC;~~wBAC3D~~,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH;aACF;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,OAAO;gBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,uBAAc,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;gBAC3D,SAAS,EAAE,SAAS;aACrB,CAAC;SACH;gBAAS;SACT;IACH,CAAC;IAEO,YAAY,CAAC,IAAsB;QACzC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAC/D,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACxC;QAED,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACnE,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC1C;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;IAEO,gBAAgB;QACtB,OAAO;YACL,oCAAoC,EAAE,OAAO,CAAC,GAAG,CAAC,oCAAoC;SACvF,CAAC;IACJ,CAAC;CACF,CAAA;AA7GC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,6CAA6C,CAAC,CAAC;KAClF,CAAC;;;;iDAwFD;AAtGU,kBAAkB;IAD9B,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,kBAAkB,CA4H9B;AA5HY,gDAAkB"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"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"}

package/build/component/driver/add/addWebPart.js CHANGED Viewed

@@ -15,13 +15,13 @@ const common_1 = require("../../utils/common");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const util = tslib_1.__importStar(require("util"));
-const constants_1 = require("../../resource/spfx/utils/constants");
-const spfxGenerator_1 = require("../../generator/spfxGenerator");
+const constants_1 = require("../../generator/spfx/utils/constants");
+const spfxGenerator_1 = require("../../generator/spfx/spfxGenerator");
 const utils_1 = require("../../utils");
 const constants_2 = require("./utility/constants");
 const noConfigurationError_1 = require("./error/noConfigurationError");
 const constants_3 = require("../../constants");
-const questions_1 = require("../../resource/spfx/utils/questions");
+const questions_1 = require("../../generator/spfx/utils/questions");
 let AddWebPartDriver = class AddWebPartDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.spfx.add.description");

package/build/component/driver/add/addWebPart.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addWebPart.js","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAoF;AACpF,+CAA8C;AAC9C,mCAAiC;AAGjC,+CAAqD;AACrD,mFAAgF;AAChF,kFAA+E;AAC/E,iEAAmE;AACnE,+CAA6C;AAE7C,wDAAwB;AACxB,qDAA+B;AAC/B,mDAA6B;AAC7B,~~mEAAuE~~;~~AACvE~~,~~iEAA8D~~;~~AAC9D~~,uCAA8C;AAC9C,mDAAgD;AAChD,uEAAoE;AACpE,+CAAoD;AACpD,~~mEAAwE~~;~~AAGxE~~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"}
1	+ {"version":3,"file":"addWebPart.js","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":"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"}

package/build/component/driver/arm/deployImpl.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { deployArgs, deploymentOutput, templateArgs } from "./interface";
 import { FxError, Result } from "@microsoft/teamsfx-api";
 import { Deployment, ResourceManagementClient } from "@azure/arm-resources";
 import { WrapDriverContext } from "../util/wrapUtil";
-import { DeployContext } from "../../arm";
+import { DeployContext } from "./util/handleError";
 export declare class ArmDeployImpl {
     args: deployArgs;
     context: WrapDriverContext;

package/build/component/driver/arm/deployImpl.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deployImpl.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzE,OAAO,EAEL,OAAO,EAEP,MAAM,EAIP,MAAM,wBAAwB,CAAC;~~AAMhC~~,OAAO,EAAE,UAAU,EAAkB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,~~EAAE~~,aAAa,~~EAA4B~~,MAAM,~~WAAW~~,CAAC;~~AAOpE~~,qBAAa,aAAa;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,wBAAwB,CAAC;gBAEtB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAK3C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAkBlC,YAAY;IAQb,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;YAIhC,YAAY;IAQpB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAuB/D,cAAc,CAClB,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA2BnD,iBAAiB,CACrB,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,EAChC,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,sBAAsB,CAC1B,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,GAC/B,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YAU9C,iBAAiB;IAazB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAczD~~,OAAO,CAAC,cAAc;CAgBvB"}
1	+ {"version":3,"file":"deployImpl.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzE,OAAO,EAEL,OAAO,EAEP,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,UAAU,EAAkB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAkB,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAQnE,qBAAa,aAAa;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,wBAAwB,CAAC;gBAEtB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB;IAK3C,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAkBlC,YAAY;IAQb,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;YAIhC,YAAY;IAQpB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;IAuB/D,cAAc,CAClB,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA2BnD,iBAAiB,CACrB,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,EAChC,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,sBAAsB,CAC1B,WAAW,EAAE,YAAY,EACzB,oBAAoB,EAAE,UAAU,GAC/B,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASnD,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YAU9C,iBAAiB;IAazB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAezD,OAAO,CAAC,cAAc;CAgBvB"}

package/build/component/driver/arm/deployImpl.js CHANGED Viewed

@@ -14,14 +14,14 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../../../common/constants");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const common_1 = require("../../utils/common");
-const cpUtils_1 = require("../../../common/cpUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const arm_resources_1 = require("@azure/arm-resources");
-const bicepChecker_1 = require("../../utils/depsChecker/bicepChecker");
-const arm_1 = require("../../arm");
+const bicepChecker_1 = require("./util/bicepChecker");
+const handleError_1 = require("./util/handleError");
 const common_2 = require("../../../error/common");
 const azure_1 = require("../../../error/azure");
-const arm_2 = require("../../../error/arm");
+const arm_1 = require("../../../error/arm");
+const cpUtils_1 = require("../../utils/depsChecker/cpUtils");
 const helpLink = "https://aka.ms/teamsfx-actions/arm-deploy";
 class ArmDeployImpl {
     constructor(args, context) {
@@ -103,7 +103,7 @@ class ArmDeployImpl {
         catch (error) {
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError)
                 return teamsfx_api_1.err(error);
-            return teamsfx_api_1.err(new arm_2.DeployArmError(deployCtx.deploymentName, deployCtx.resourceGroupName, error));
+            return teamsfx_api_1.err(new arm_1.DeployArmError(deployCtx.deploymentName, deployCtx.resourceGroupName, error));
         }
     }
     async executeDeployment(templateArg, deploymentParameters, deployCtx) {
@@ -111,7 +111,7 @@ class ArmDeployImpl {
             return await this.innerExecuteDeployment(templateArg, deploymentParameters);
         }
         catch (error) {
-            const errRes = arm_1.handleArmDeploymentError(error, deployCtx);
+            const errRes = handleError_1.ArmErrorHandle.handleArmDeploymentError(error, deployCtx);
             return errRes;
         }
     }
@@ -144,11 +144,11 @@ class ArmDeployImpl {
     }
     async compileBicepToJson(filePath) {
         try {
-            const result = await cpUtils_1.executeCommand(this.bicepCommand, ["build", filePath, "--stdout"], this.context.logProvider, { shell: false });
+            const result = await cpUtils_1.cpUtils.executeCommand(undefined, this.context.logProvider, { shell: false }, this.bicepCommand, ...["build", filePath, "--stdout"]);
             return JSON.parse(result);
         }
         catch (err) {
-            throw new arm_2.CompileBicepError(filePath, err);
+            throw new arm_1.CompileBicepError(filePath, err);
         }
     }
     setTelemetries() {

package/build/component/driver/arm/deployImpl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,yCAA0E;AAE1E,2CAA2C;AAC3C,sCAAiF;AACjF,wDAQgC;AAChC,yDAA2D;AAC3D,qDAA+B;AAC/B,+CAAgF;AAChF,~~qDAAyD;AACzD,~~iEAAmE;AACnE,wDAA4F;AAC5F,~~uEAA4E~~;~~AAE5E~~,~~mCAAoE~~;~~AACpE~~,kDAAgE;AAChE,gDAAmE;AACnE,4CAAuE;~~AAEvE~~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~~8BAAwB~~,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;~~YAC1D~~,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,WAAyB,EACzB,oBAAgC;;QAEhC,MAAM,MAAM,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAC,0BAA0B,CACtE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAC3B,WAAW,CAAC,cAAc,EAC1B,oBAAoB,CACrB,CAAA,CAAC;QACF,OAAO,gBAAE,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,UAAmB;QAC3C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,MAAM,QAAQ,GAAG,wBAAe,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,0BAAc,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,mBAAmB,GAAG,kCAAyB,CAAC,QAAQ,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,YAAoB;QAClD,MAAM,YAAY,GAAG,uBAAgB,CAAC,YAAY,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,wBAAe,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACzE,IAAI,kBAAkB,CAAC;QACvB,IAAI,YAAY,KAAK,uBAAY,CAAC,KAAK,EAAE;YACvC,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;SAC9D;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,0BAAc,CAAC,YAAY,CAAC,CAAC;YAC1E,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC3C;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAgB;QACvC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,~~wBAAc~~,~~CACjC~~,~~IAAI~~,~~CAAC~~,~~YAAa~~,~~EAClB~~,CAAC,OAAO,EAAE,~~QAAQ~~,EAAE,~~UAAU~~,~~CAAC~~,~~EAC/B~~,IAAI,CAAC,~~OAAO~~,CAAC,~~WAAW~~,~~EACxB,~~EAAE,~~KAAK~~,EAAE,~~KAAK~~,~~EAAE~~,~~CACjB~~,CAAC;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,uBAAiB,CAAC,QAAQ,EAAE,GAAY,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,cAAc;QACpB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAC1C,MAAM,YAAY,GAAG,uBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,YAAY,KAAK,uBAAY,CAAC,KAAK,EAAE;gBACvC,UAAU,EAAE,CAAC;aACd;iBAAM;gBACL,SAAS,EAAE,CAAC;aACb;SACF;QACD,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC;YAClC,CAAC,8BAAmB,CAAC,kBAAkB,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE;YAC/D,CAAC,8BAAmB,CAAC,iBAAiB,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE;SAC9D,CAAC,CAAC;IACL,CAAC;CACF;~~AAnLD~~,~~sCAmLC~~"}
1	+ {"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"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"}

package/build/component/driver/arm/util/bicepChecker.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { DriverContext } from "../../interface/commonArgs";
+export declare const BicepName = "Bicep";
+export declare function ensureBicepForDriver(ctx: DriverContext, version: string): Promise<string>;
+//# sourceMappingURL=bicepChecker.d.ts.map

package/build/component/driver/arm/util/bicepChecker.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"bicepChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/bicepChecker.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI3D,eAAO,MAAM,SAAS,UAAU,CAAC;AAMjC,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW/F"}

package/build/component/{utils/depsChecker → driver/arm/util}/bicepChecker.js RENAMED Viewed

@@ -1,57 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureBicepForDriver = exports.getAvailableBicepVersions = exports.ensureBicep = exports.supportedVersions = exports.fallbackInstallVersion = exports.installVersionPattern = exports.installVersion = exports.BicepName = void 0;
+exports.ensureBicepForDriver = exports.BicepName = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const path = tslib_1.__importStar(require("path"));
 const os = tslib_1.__importStar(require("os"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs = tslib_1.__importStar(require("fs-extra"));
-const semver = tslib_1.__importStar(require("semver"));
-const cpUtils_1 = require("./cpUtils");
+const cpUtils_1 = require("../../../utils/depsChecker/cpUtils");
 const stream_1 = require("stream");
-const common_1 = require("./common");
-const constants_1 = require("../../constants");
+const common_1 = require("../../../utils/depsChecker/common");
+const constants_1 = require("../../../constants");
 const perf_hooks_1 = require("perf_hooks");
-const utils_1 = require("../../utils");
-const tools_1 = require("../../../common/tools");
-const localizeUtils_1 = require("../../../common/localizeUtils");
-const common_2 = require("../../../error/common");
-const arm_1 = require("../../../error/arm");
+const utils_1 = require("../../../utils");
+const common_2 = require("../../../../error/common");
+const arm_1 = require("../../../../error/arm");
 exports.BicepName = "Bicep";
-exports.installVersion = "v0.4";
-exports.installVersionPattern = "^v0.4";
-exports.fallbackInstallVersion = "v0.4.1008";
-exports.supportedVersions = [exports.installVersion];
 const timeout = 5 * 60 * 1000;
 const source = "bicep-envchecker";
 const bicepReleaseApiUrl = "https://api.github.com/repos/Azure/bicep/releases";
-async function ensureBicep(ctx, inputs) {
-    var _a;
-    const bicepChecker = new BicepChecker(ctx.logProvider, ctx.telemetryReporter);
-    try {
-        if ((await bicepChecker.isEnabled()) && !(await bicepChecker.isInstalled())) {
-            await bicepChecker.install();
-        }
-    }
-    catch (err) {
-        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`Failed to check or install bicep, error = '${err}'`);
-        if (!(await bicepChecker.isGlobalBicepInstalled())) {
-            await displayLearnMore(localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", bicepChecker.getBicepDisplayBicepName()), common_1.bicepHelpLink, ctx.ui || ctx.userInteraction, ctx.telemetryReporter);
-            outputErrorMessage(ctx, bicepChecker, inputs);
-            throw err;
-        }
-    }
-    return bicepChecker.getBicepCommand();
-}
-exports.ensureBicep = ensureBicep;
-async function getAvailableBicepVersions() {
-    const bicepChecker = new BicepChecker();
-    return await bicepChecker.getVersions();
-}
-exports.getAvailableBicepVersions = getAvailableBicepVersions;
-async function ensureBicepForDriver(ctx, version, platform) {
-    const bicepChecker = new BicepChecker(ctx.logProvider, ctx.telemetryReporter, version);
+async function ensureBicepForDriver(ctx, version) {
+    const bicepChecker = new BicepChecker(version, ctx.logProvider, ctx.telemetryReporter);
     try {
         const isPrivateBicepInstalled = await bicepChecker.isPrivateBicepInstalled();
         if (!isPrivateBicepInstalled) {
@@ -61,47 +30,20 @@ async function ensureBicepForDriver(ctx, version, platform) {
     catch (err) {
         throw err;
     }
-    return bicepChecker.getBicepCommand();
+    return bicepChecker.getBicepExecPath();
 }
 exports.ensureBicepForDriver = ensureBicepForDriver;
-function outputErrorMessage(ctx, bicepChecker, inputs) {
-    var _a;
-    const message = localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", bicepChecker.getBicepDisplayBicepName());
-    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.warning(message);
-}
 class BicepChecker {
-    constructor(logger, telemetry, version) {
+    constructor(version, logger, telemetry) {
         this._logger = logger;
         this._telemetry = telemetry;
-        this._version = version;
+        this.version = version;
         this._axios = axios_1.default.create({
             headers: { "content-type": "application/json" },
             timeout: timeout,
             timeoutErrorMessage: "Failed to download bicep by http request timeout",
         });
     }
-    async isEnabled() {
-        var _a;
-        const isBicepEnabled = tools_1.isBicepEnvCheckerEnabled();
-        if (!isBicepEnabled) {
-            (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepCheckSkipped, getCommonProps());
-        }
-        return isBicepEnabled;
-    }
-    async isInstalled() {
-        var _a, _b;
-        const isGlobalBicepInstalled = await this.isGlobalBicepInstalled();
-        const isPrivateBicepInstalled = await this.isPrivateBicepInstalled();
-        if (isGlobalBicepInstalled) {
-            (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepAlreadyInstalled, getCommonProps());
-        }
-        if (isPrivateBicepInstalled) {
-            // always install private bicep even if global bicep exists.
-            (_b = this._telemetry) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepInstallCompleted, getCommonProps());
-            return true;
-        }
-        return false;
-    }
     async install() {
         await this.cleanup();
         await this.installBicep();
@@ -141,35 +83,15 @@ class BicepChecker {
         }
     }
     getBicepDisplayBicepName() {
-        return `${exports.BicepName} (${this._version || exports.installVersion})`;
+        return `${exports.BicepName} (${this.version})`;
     }
     async doInstallBicep() {
-        var _a, _b;
-        let selectedVersion;
-        if (this._version) {
-            selectedVersion = this._version;
-        }
-        else {
-            try {
-                const response = await this._axios.get(bicepReleaseApiUrl, {
-                    headers: { Accept: "application/vnd.github.v3+json" },
-                });
-                const versions = response.data.map((item) => item.tag_name);
-                const maxSatisfying = semver.maxSatisfying(versions, exports.installVersionPattern);
-                selectedVersion = maxSatisfying || exports.fallbackInstallVersion;
-            }
-            catch (e) {
-                // GitHub public API has a limit of 60 requests per hour per IP
-                // If it fails to retrieve the latest version, just use a known version.
-                selectedVersion = exports.fallbackInstallVersion;
-                (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepFailedToRetrieveGithubReleaseVersions, { [common_1.TelemetryMeasurement.ErrorMessage]: `${e}` });
-            }
-        }
+        var _a;
         const installDir = this.getBicepExecPath();
-        await ((_b = this._logger) === null || _b === void 0 ? void 0 : _b.info(common_1.Messages.downloadBicep()
-            .replace("@NameVersion", `Bicep ${selectedVersion}`)
+        await ((_a = this._logger) === null || _a === void 0 ? void 0 : _a.info(common_1.Messages.downloadBicep()
+            .replace("@NameVersion", `Bicep ${this.version}`)
             .replace("@InstallDir", installDir)));
-        const axiosResponse = await this._axios.get(`https://github.com/Azure/bicep/releases/download/${selectedVersion}/${this.getBicepBitSuffixName()}`, {
+        const axiosResponse = await this._axios.get(`https://github.com/Azure/bicep/releases/download/${this.version}/${this.getBicepBitSuffixName()}`, {
             responseType: "stream",
         });
         const bicepReader = axiosResponse.data;
@@ -230,21 +152,7 @@ class BicepChecker {
         throw new common_2.InstallSoftwareError(source, this.getBicepDisplayBicepName());
     }
     isVersionSupported(version) {
-        if (this._version) {
-            return this._version === version;
-        }
-        return exports.supportedVersions.some((supported) => version.includes(supported));
-    }
-    async isGlobalBicepInstalled() {
-        try {
-            const version = await this.queryVersion("bicep");
-            // not limit bicep versions of user
-            return version.includes("v");
-        }
-        catch (e) {
-            // do nothing
-            return false;
-        }
+        return this.version === version;
     }
     async isPrivateBicepInstalled() {
         try {
@@ -256,12 +164,6 @@ class BicepChecker {
             return false;
         }
     }
-    async getBicepCommand() {
-        if (await this.isInstalled()) {
-            return this.getBicepExecPath();
-        }
-        return "bicep";
-    }
     getBicepExecPath() {
         return path.join(this.getBicepInstallDir(), this.getBicepFileName());
     }
@@ -284,7 +186,7 @@ class BicepChecker {
         return "bicep-linux-x64";
     }
     getBicepInstallDir() {
-        return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "bicep", this._version || "");
+        return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "bicep", this.version);
     }
     async queryVersion(path) {
         var _a, _b, _c;
@@ -310,19 +212,4 @@ function getCommonProps() {
     properties[constants_1.SolutionTelemetryProperty.Success] = constants_1.SolutionTelemetrySuccess.Yes;
     return properties;
 }
-async function displayLearnMore(message, link, ui, telemetryReporter) {
-    if (!ui) {
-        // no dialog, always continue
-        return true;
-    }
-    const res = await (ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, true, common_1.Messages.learnMoreButtonText()));
-    const userSelected = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
-    if (userSelected === common_1.Messages.learnMoreButtonText()) {
-        telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(common_1.DepsCheckerEvent.clickLearnMore, getCommonProps());
-        ui === null || ui === void 0 ? void 0 : ui.openUrl(link);
-        return true;
-    }
-    telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(common_1.DepsCheckerEvent.clickCancel);
-    return false;
-}
 //# sourceMappingURL=bicepChecker.js.map

package/build/component/driver/arm/util/bicepChecker.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"bicepChecker.js","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/bicepChecker.ts"],"names":[],"mappings":"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"}