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

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

@@ -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

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":";;;;AAKA,mCAAiC;AACjC,yDAAsD;AACtD,0DAA0B;AAC1B,wDAA0F;AAC1F,+CAA8C;AAC9C,mFAAgF;AAChF,iEAAmE;AACnE,mDAA6E;AAC7E,iEAA8D;AAE9D,kDAK+B;AAC/B,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,wBAAe,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC/D,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH;qBAAM;oBACL,OAAO;wBACL,MAAM,EAAE,iBAAG,CAAC,IAAI,wBAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;wBACrD,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"}

package/build/component/driver/aad/utility/buildAadManifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAW9E,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,CAAC,CAuBtB"}
+{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAQ9E,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,CAAC,CAuBtB"}

package/build/component/driver/aad/utility/buildAadManifest.js

@@ -14,9 +14,6 @@ const tools_1 = require("../../../../common/tools");
 const common_2 = require("../../../../error/common");
 const actionName = "aadApp/update"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/aadapp-update";
-const driverConstants = {
-    generateManifestFailedMessageKey: "driver.aadApp.error.generateManifestFailed",
-};
 async function buildAadManifest(context, manifestPath, outputFilePath, state) {
     var _a;
     const manifestAbsolutePath = getAbsolutePath(manifestPath, context.projectPath);

package/build/component/driver/aad/utility/buildAadManifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"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"}

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

@@ -9,19 +9,19 @@ const lib_1 = require("@feathersjs/hooks/lib");
 const typedi_1 = require("typedi");
 const wrapUtil_1 = require("../util/wrapUtil");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const ManifestUtils_1 = require("../../resource/appManifest/utils/ManifestUtils");
+const ManifestUtils_1 = require("../teamsApp/utils/ManifestUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 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

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

@@ -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

@@ -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"}
+{"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

@@ -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

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

@@ -0,0 +1,3 @@
+import { DriverContext } from "../../interface/commonArgs";
+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

@@ -0,0 +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;AAU3D,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW/F"}

package/build/component/driver/arm/util/bicepChecker.js

@@ -0,0 +1,215 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureBicepForDriver = 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 cpUtils_1 = require("../../../utils/depsChecker/cpUtils");
+const stream_1 = require("stream");
+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 common_2 = require("../../../../error/common");
+const arm_1 = require("../../../../error/arm");
+const BicepName = "Bicep";
+const timeout = 5 * 60 * 1000;
+const source = "bicep-envchecker";
+const bicepReleaseApiUrl = "https://api.github.com/repos/Azure/bicep/releases";
+async function ensureBicepForDriver(ctx, version) {
+    const bicepChecker = new BicepChecker(version, ctx.logProvider, ctx.telemetryReporter);
+    try {
+        const isPrivateBicepInstalled = await bicepChecker.isPrivateBicepInstalled();
+        if (!isPrivateBicepInstalled) {
+            await bicepChecker.install();
+        }
+    }
+    catch (err) {
+        throw err;
+    }
+    return bicepChecker.getBicepExecPath();
+}
+exports.ensureBicepForDriver = ensureBicepForDriver;
+class BicepChecker {
+    constructor(version, logger, telemetry) {
+        this._logger = logger;
+        this._telemetry = telemetry;
+        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 install() {
+        await this.cleanup();
+        await this.installBicep();
+        if (!(await this.validate())) {
+            await this.handleInstallFailed();
+        }
+        await this.handleInstallCompleted();
+    }
+    async getVersions() {
+        const response = await this._axios.get(bicepReleaseApiUrl, {
+            headers: { Accept: "application/vnd.github.v3+json" },
+        });
+        const versions = response.data.map((item) => item.tag_name);
+        return versions;
+    }
+    async cleanup() {
+        var _a;
+        try {
+            await fs.emptyDir(this.getBicepInstallDir());
+        }
+        catch (err) {
+            await ((_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug(`Failed to clean up path: ${this.getBicepInstallDir()}, error: ${err}`));
+        }
+    }
+    async installBicep() {
+        var _a;
+        try {
+            const start = perf_hooks_1.performance.now();
+            await this.doInstallBicep();
+            (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepInstallScriptCompleted, getCommonProps(), {
+                [common_1.TelemetryMeasurement.completionTime]: Number(((perf_hooks_1.performance.now() - start) / 1000).toFixed(2)),
+            });
+        }
+        catch (err) {
+            sendSystemErrorEvent(common_1.DepsCheckerEvent.bicepInstallScriptError, common_1.TelemtryMessages.failedToInstallBicep, err, this._telemetry);
+            throw new arm_1.DownloadBicepCliError(bicepReleaseApiUrl, err);
+        }
+    }
+    getBicepDisplayBicepName() {
+        return `${BicepName} (${this.version})`;
+    }
+    async doInstallBicep() {
+        var _a;
+        const installDir = this.getBicepExecPath();
+        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/${this.version}/${this.getBicepBitSuffixName()}`, {
+            responseType: "stream",
+        });
+        const bicepReader = axiosResponse.data;
+        const bicepWriter = fs.createWriteStream(installDir);
+        // https://nodejs.org/api/fs.html#fscreatewritestreampath-options
+        // on 'error' or 'finish' the file descriptor will be closed automatically
+        // calling writer.end() again will hang
+        await this.writeBicepBits(bicepWriter, bicepReader);
+        fs.chmodSync(installDir, 0o755);
+    }
+    async writeBicepBits(writer, reader) {
+        return new Promise((resolve, reject) => {
+            reader.on("error", (err) => {
+                // Handles reader error.
+                writer.end();
+                reject(err);
+            });
+            // https://nodejs.org/api/stream.html#readablepipedestination-options
+            // If the Readable stream emits an error during processing, the Writable destination is **NOT** closed.
+            reader.pipe(writer);
+            stream_1.finished(writer, (err) => {
+                // Handles writer end and writer error.
+                // By handling writer end, it implicitly handles reader end because of reader.pipe(writer).
+                // But reader error is not handled here.
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        });
+    }
+    async validate() {
+        var _a, _b;
+        let isVersionSupported = false;
+        let privateVersion = "";
+        try {
+            privateVersion = await this.queryVersion(this.getBicepExecPath());
+            isVersionSupported = this.isVersionSupported(privateVersion);
+        }
+        catch (err) {
+            sendSystemErrorEvent(common_1.DepsCheckerEvent.bicepValidationError, common_1.TelemtryMessages.failedToValidateBicep, err, this._telemetry);
+            await ((_a = this._logger) === null || _a === void 0 ? void 0 : _a.error(`${common_1.TelemtryMessages.failedToValidateBicep}, error = ${err}`));
+        }
+        if (!isVersionSupported) {
+            (_b = this._telemetry) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepValidationError, Object.assign({ "bicep-private-version": privateVersion }, getCommonProps()));
+        }
+        return isVersionSupported;
+    }
+    async handleInstallCompleted() {
+        var _a, _b;
+        (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(common_1.DepsCheckerEvent.bicepInstallCompleted);
+        await ((_b = this._logger) === null || _b === void 0 ? void 0 : _b.info(common_1.Messages.finishInstallBicep().replace("@NameVersion", this.getBicepDisplayBicepName())));
+    }
+    async handleInstallFailed() {
+        var _a;
+        await this.cleanup();
+        (_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(common_1.DepsCheckerEvent.bicepInstallError);
+        throw new common_2.InstallSoftwareError(source, this.getBicepDisplayBicepName());
+    }
+    isVersionSupported(version) {
+        return this.version === version;
+    }
+    async isPrivateBicepInstalled() {
+        try {
+            const version = await this.queryVersion(this.getBicepExecPath());
+            return this.isVersionSupported(version);
+        }
+        catch (e) {
+            // do nothing
+            return false;
+        }
+    }
+    getBicepExecPath() {
+        return path.join(this.getBicepInstallDir(), this.getBicepFileName());
+    }
+    getBicepFileName() {
+        if (common_1.isWindows()) {
+            return "bicep.exe";
+        }
+        return "bicep";
+    }
+    getBicepBitSuffixName() {
+        if (common_1.isWindows()) {
+            return "bicep-win-x64.exe";
+        }
+        if (common_1.isMacOS()) {
+            return "bicep-osx-x64";
+        }
+        if (fs.pathExistsSync("/lib/ld-musl-x86_64.so.1")) {
+            return "bicep-linux-musl-x64";
+        }
+        return "bicep-linux-x64";
+    }
+    getBicepInstallDir() {
+        return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "bicep", this.version);
+    }
+    async queryVersion(path) {
+        var _a, _b, _c;
+        const output = await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { shell: false }, path, "--version");
+        const regex = /(?<major_version>\d+)\.(?<minor_version>\d+)\.(?<patch_version>\d+)/gm;
+        const match = regex.exec(output);
+        if (!match) {
+            return "";
+        }
+        return `v${(_a = match.groups) === null || _a === void 0 ? void 0 : _a.major_version}.${(_b = match.groups) === null || _b === void 0 ? void 0 : _b.minor_version}.${(_c = match.groups) === null || _c === void 0 ? void 0 : _c.patch_version}`;
+    }
+}
+function sendSystemErrorEvent(eventName, errorMessage, errorStack, telemetry) {
+    const error = new teamsfx_api_1.SystemError(source, eventName, `errorMsg=${errorMessage},errorStack=${errorStack}`);
+    error.stack = errorStack;
+    utils_1.sendErrorTelemetryThenReturnError(eventName, error, telemetry, getCommonProps());
+}
+function getCommonProps() {
+    const properties = {};
+    properties[common_1.TelemetryMeasurement.OSArch] = os.arch();
+    properties[common_1.TelemetryMeasurement.OSRelease] = os.release();
+    properties[constants_1.SolutionTelemetryProperty.Component] = constants_1.SolutionTelemetryComponentName;
+    properties[constants_1.SolutionTelemetryProperty.Success] = constants_1.SolutionTelemetrySuccess.Yes;
+    return properties;
+}
+//# sourceMappingURL=bicepChecker.js.map

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

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

package/build/component/driver/arm/util/handleError.d.ts

@@ -0,0 +1,18 @@
+import { ResourceManagementClient } from "@azure/arm-resources";
+import { FxError, Result, SolutionContext } from "@microsoft/teamsfx-api";
+export declare type DeployContext = {
+    ctx: SolutionContext;
+    finished: boolean;
+    client: ResourceManagementClient;
+    resourceGroupName: string;
+    deploymentStartTime: number;
+    deploymentName: string;
+};
+export declare namespace ArmErrorHandle {
+    function fetchInnerError(error: any): any;
+    function handleArmDeploymentError(error: any, deployCtx: DeployContext): Promise<Result<undefined, FxError>>;
+    function wrapGetDeploymentError(deployCtx: DeployContext, resourceGroupName: string, deploymentName: string, rawError: any): Promise<Result<any, FxError>>;
+    function getDeploymentError(deployCtx: DeployContext, resourceGroupName: string, deploymentName: string): Promise<any>;
+    function formattedDeploymentError(deploymentError: any): any;
+}
+//# sourceMappingURL=handleError.d.ts.map

package/build/component/driver/arm/util/handleError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/handleError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAgBnF,oBAAY,aAAa,GAAG;IAC1B,GAAG,EAAE,eAAe,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,wBAAwB,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAGF,yBAAiB,cAAc,CAAC;IAC9B,SAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAU/C;IAED,SAAsB,wBAAwB,CAC5C,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAwDrC;IAED,SAAsB,sBAAsB,CAC1C,SAAS,EAAE,aAAa,EACxB,iBAAiB,EAAE,MAAM,EACzB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAkB/B;IAED,SAAsB,kBAAkB,CACtC,SAAS,EAAE,aAAa,EACxB,iBAAiB,EAAE,MAAM,EACzB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,GAAG,CAAC,CAyEd;IAED,SAAgB,wBAAwB,CAAC,eAAe,EAAE,GAAG,GAAG,GAAG,CAoBlE;CACF"}