npm - @microsoft/teamsfx-core - Versions diffs - 2.0.4-alpha.ceeb9e1b9.0 → 2.0.4-alpha.d5b684cf7.0 - Mend

@microsoft/teamsfx-core 2.0.4-alpha.ceeb9e1b9.0 → 2.0.4-alpha.d5b684cf7.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 (286) hide show

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

@@ -19,6 +19,7 @@ const common_2 = require("../../../error/common");
 const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
 const aadAppClient_1 = require("../aad/utility/aadAppClient");
 const signInAudience_1 = require("../aad/interface/signInAudience");
+const aadAppNameTooLongError_1 = require("../aad/error/aadAppNameTooLongError");
 const actionName = "botAadApp/create"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
 const successRegisterBotAad = `${actionName}/success`;
@@ -100,14 +101,14 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
                 const message = JSON.stringify((_h = error.response) === null || _h === void 0 ? void 0 : _h.data);
                 (_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
                 if (error.response.status >= 400 && error.response.status < 500) {
-                    throw new common_2.HttpClientError(actionName, message, helpLink);
+                    throw new common_2.HttpClientError(error, actionName, message, helpLink);
                 }
                 else {
-                    throw new common_2.HttpServerError(actionName, message);
+                    throw new common_2.HttpServerError(error, actionName, message);
                 }
             }
             if (error.name === "AadCreateAppError") {
-                throw new common_2.UnhandledUserError(new Error(error.details[0]), actionName);
+                throw new common_2.UnhandledUserError(error, actionName);
             }
             const message = JSON.stringify(error);
             (_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
@@ -122,6 +123,9 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
         if (invalidParameters.length > 0) {
             throw new common_2.InvalidActionInputError(actionName, invalidParameters, helpLink);
         }
+        if (args.name.length > 120) {
+            throw new aadAppNameTooLongError_1.AadAppNameTooLongError(actionName);
+        }
     }
 };
 tslib_1.__decorate([

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

	@@ -1 +1 @@
1	- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAGjC,wDAAiF;AACjF,2CAAyC;AACzC,0DAA0B;AAC1B,+CAA6C;AAC7C,+CAA8C;AAC9C,mFAAgF;AAChF,mDAAsE;AACtE,iEAAmE;AACnE,yCAAgE;AAChE,6FAA0F;AAC1F,kDAM+B;AAC/B,8GAA2G;AAC3G,8DAA2D;AAC3D,oEAAiE;~~AAEjE~~,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,yBAAyB;AAChE,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAEnE,MAAM,qBAAqB,GAAG,GAAG,UAAU,UAAU,CAAC;AACtD,MAAM,YAAY,GAAG;IACnB,qBAAqB,EAAE,wBAAwB;IAC/C,kBAAkB,EAAE,uBAAuB;CAC5C,CAAC;AAGF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACW,gBAAW,GAAwB,kCAAkB,CAC5D,qCAAqC,CACtC,CAAC;QACO,kBAAa,GAAG,kCAAkB,CAAC,2BAAe,CAAC,iBAAiB,CAAC,CAAC;~~IAuIjF~~,CAAC;~~IApIQ~~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~~iBAC1D~~;qBAAM;oBACL,MAAM,IAAI,wBAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;~~iBAChD~~;aACF;YAED,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACtC,MAAM,IAAI,2BAAkB,CAAC,~~IAAI,~~KAAK,~~CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,~~EAAE,UAAU,CAAC,CAAC;~~aACvE~~;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,MAAM,IAAI,uBAAc,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;SACtD;IACH,CAAC;~~IAEO~~,YAAY,CAAC,IAAyB;~~QAC5C~~,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,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;CACF,CAAA;~~AApIC~~;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;gDASxD;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;6DAInC,GAAG;;oDAYxB;AAjCU,qBAAqB;IADjC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,qBAAqB,~~CA2IjC~~;~~AA3IY~~,sDAAqB"}
1	+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAGjC,wDAAiF;AACjF,2CAAyC;AACzC,0DAA0B;AAC1B,+CAA6C;AAC7C,+CAA8C;AAC9C,mFAAgF;AAChF,mDAAsE;AACtE,iEAAmE;AACnE,yCAAgE;AAChE,6FAA0F;AAC1F,kDAM+B;AAC/B,8GAA2G;AAC3G,8DAA2D;AAC3D,oEAAiE;AACjE,gFAA6E;AAE7E,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,yBAAyB;AAChE,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAEnE,MAAM,qBAAqB,GAAG,GAAG,UAAU,UAAU,CAAC;AACtD,MAAM,YAAY,GAAG;IACnB,qBAAqB,EAAE,wBAAwB;IAC/C,kBAAkB,EAAE,uBAAuB;CAC5C,CAAC;AAGF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACW,gBAAW,GAAwB,kCAAkB,CAC5D,qCAAqC,CACtC,CAAC;QACO,kBAAa,GAAG,kCAAkB,CAAC,2BAAe,CAAC,iBAAiB,CAAC,CAAC;IA2IjF,CAAC;IAxIQ,KAAK,CAAC,GAAG,CACd,IAAyB,EACzB,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;IACjB,CAAC;IAGM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,GAAkB,EAClB,iBAAuC;QAEvC,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAChE,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;QACf,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,OAAsB,EACtB,iBAAuC;;QAKvC,IAAI;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;YAE7F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,iBAAiB,EAAE;gBACtB,MAAM,IAAI,iFAAuC,CAAC,UAAU,CAAC,CAAC;aAC/D;YACD,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACjE,MAAM,cAAc,GAA0B,wBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAClF,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAElF,qFAAqF;YACrF,IAAI,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE;gBACvD,MAAM,IAAI,iEAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;aACjE;YAED,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;gBACzB,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBACnF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,YAAY,CAC5C,IAAI,CAAC,IAAI,EACT,+BAAc,CAAC,mBAAmB,CACnC,CAAC;gBACF,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,KAAM,CAAC;gBACrC,cAAc,CAAC,WAAW,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAG,CAAC,CAAC;gBACjF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,sBAAsB,CAAC,CAAC,CAAC;aACtF;iBAAM;gBACL,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC;aACnF;YACD,MAAM,oBAAoB,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAE3D,MAAM,OAAO,GAAG,qBAAa,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;YAEjE,MAAM,sBAAsB,GAAG,kCAAkB,CAC/C,0BAAc,CAAC,mBAAmB,EAClC,cAAc,CAAC,KAAK,CACrB,CAAC;YACF,MAAM,oBAAoB,GAAG,kCAAkB,CAC7C,0BAAc,CAAC,iBAAiB,EAChC,cAAc,CAAC,KAAK,CACrB,CAAC;YACF,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YAClF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,EAAE,UAAU,CAAC,CACpE,CAAC;YACF,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,qBAAqB,EAAE;gBAClE,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;gBAClE,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,oBAAoB,CAAC,QAAQ,EAAE;aACnE,CAAC,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC;SACH;QAAC,OAAO,KAAU,EAAE;YACnB,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,MAAM,KAAK,CAAC;aACb;YAED,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,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,MAAM,IAAI,wBAAe,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;iBACjE;qBAAM;oBACL,MAAM,IAAI,wBAAe,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;iBACvD;aACF;YAED,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACtC,MAAM,IAAI,2BAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;aACjD;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,MAAM,IAAI,uBAAc,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;SACtD;IACH,CAAC;IAEM,YAAY,CAAC,IAAyB;QAC3C,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,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE;YAC1B,MAAM,IAAI,+CAAsB,CAAC,UAAU,CAAC,CAAC;SAC9C;IACH,CAAC;CACF,CAAA;AAxIC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;gDASxD;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;6DAInC,GAAG;;oDAYxB;AAjCU,qBAAqB;IADjC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,qBAAqB,CA+IjC;AA/IY,sDAAqB"}

package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;~~AAWlD~~,8BAAsB,eAAgB,SAAQ,cAAc;IAC1D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAa;IAElE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;~~IACU~~,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;~~IAkEpC~~;;;;OAIG;IACG,uBAAuB,CAC3B,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cA0Fb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}
1	+ {"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAalD,8BAAsB,eAAgB,SAAQ,cAAc;IAC1D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAa;IAElE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IAEU,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAiEpC;;;;OAIG;IACG,uBAAuB,CAC3B,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cA0Fb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}

package/build/component/driver/deploy/azure/impl/azureDeployImpl.js CHANGED Viewed

@@ -18,6 +18,8 @@ const componentError_1 = require("../../../../error/componentError");
 const azureSdkErrorHandler_1 = require("../../../../utils/azureSdkErrorHandler");
 const localizeUtils_1 = require("../../../../../common/localizeUtils");
 const error_1 = require("../../../../../error");
+const hooks_1 = require("@feathersjs/hooks");
+const globalVars_1 = require("../../../../../core/globalVars");
 class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
     constructor() {
         super(...arguments);
@@ -72,7 +74,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
                 this.logger.verbose(`Check deploy status failed with error: ${JSON.stringify(e, Object.getOwnPropertyNames(e), 2)}`);
                 if (axios_1.default.isAxiosError(e)) {
                     logger.error(`Check deploy status failed with response status code: ${(_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : "NA"}, message: ${JSON.stringify((_c = e.response) === null || _c === void 0 ? void 0 : _c.data)}`);
-                    throw new error_1.CheckDeploymentStatusError(location, new Error(`status code: ${(_e = (_d = e.response) === null || _d === void 0 ? void 0 : _d.status) !== null && _e !== void 0 ? _e : "NA"}, message: ${JSON.stringify((_f = e.response) === null || _f === void 0 ? void 0 : _f.data)}`), this.helpLink);
+                    throw new error_1.CheckDeploymentStatusError(location, e, this.helpLink, `status code: ${(_e = (_d = e.response) === null || _d === void 0 ? void 0 : _d.status) !== null && _e !== void 0 ? _e : "NA"}, message: ${JSON.stringify((_f = e.response) === null || _f === void 0 ? void 0 : _f.data)}`);
                 }
                 throw new error_1.CheckDeploymentStatusError(location, e, this.helpLink);
             }
@@ -164,6 +166,12 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
         }
     }
 }
-exports.AzureDeployImpl = AzureDeployImpl;
 AzureDeployImpl.AXIOS_INSTANCE = axios_1.default.create();
+tslib_1.__decorate([
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureZipDeployImpl" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AzureDeployImpl.prototype, "checkDeployStatus", null);
+exports.AzureDeployImpl = AzureDeployImpl;
 //# sourceMappingURL=azureDeployImpl.js.map

package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AASlC,qDAA4D;AAE5D,qDAAkD;AAClD,yCAAmC;AACnC,0EAAoD;AACpD,wEAAmF;AACnF,0DAAyC;AACzC,uDAA0D;AAC1D,wEAAqE;AACrE,qFAGkD;AAGlD,qDAA+B;AAC/B,qEAAqE;AACrE,iFAA4E;AAC5E,uEAA2F;AAC3F,gDAI8B;~~AAE9B~~,MAAsB,eAAgB,SAAQ,+BAAc;IAA5D;;QAUY,YAAO,GAA6C,SAAS,CAAC;IAgP1E,CAAC;IA9OC,KAAK,CAAC,MAAM,CAAC,IAAgB;QAC3B,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE;YACjD,MAAM,kCAAiB,CAAC,eAAe,CACrC,+BAAc,CAAC,iBAAiB,EAChC,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,QAAQ,CACd,CAAC;SACH;QACD,mCAAmC;QACnC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE;YAC9C,MAAM,kCAAiB,CAAC,eAAe,CACrC,+BAAc,CAAC,iBAAiB,EAChC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,QAAQ,CACd,CAAC;SACH;QACD,MAAM,UAAU,GAAG,yBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,MAAM,kDAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC3F,MAAM,MAAM,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QAE/C,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,KAAK,CAAC;SACd;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IAcD;;;;OAIG;IACO,eAAe,CAAC,UAAkB;QAC1C,OAAO,6CAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED;;;;;;;OAOG;~~IACI~~,KAAK,CAAC,iBAAiB,CAC5B,QAAgB,EAChB,MAAyB,EACzB,MAAmB;;QAEnB,IAAI,GAA2B,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,+BAAc,CAAC,wBAAwB,EAAE,EAAE,CAAC,EAAE;YAChE,IAAI;gBACF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;gBACtE,GAAG,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,iCAAiC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,EAAE,CACxF,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,0CAA0C,IAAI,CAAC,SAAS,CACtD,CAAC,EACD,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAC7B,CAAC,CACF,EAAE,CACJ,CAAC;gBACF,IAAI,eAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;oBACzB,MAAM,CAAC,KAAK,CACV,yDACE,MAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,mCAAI,IACxB,cAAc,IAAI,CAAC,SAAS,CAAC,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,EAAE,CACjD,CAAC;oBACF,MAAM,IAAI,kCAA0B,CAClC,QAAQ,EACR,IAAI,~~KAAK~~,~~CACP~~,gBAAgB,MAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,mCAAI,IAAI,cAAc,IAAI,CAAC,SAAS,CACpE,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,CACjB,EAAE,CACJ,~~EACD,IAAI,~~CAAC~~,QAAQ,CACd,CAAC~~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~~AAzPH~~,~~0CA0PC;AAvPwB,~~8BAAc,GAAG,eAAK,CAAC,MAAM,EAAE,CAAC"}
1	+ {"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}

package/build/component/driver/devTool/constant.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export declare const TelemetryProperties: Readonly<{
     devCertStatus: string;
     funcStatus: string;
     dotnetStatus: string;
+    testToolStatus: string;
 }>;
 export declare enum TelemetryDepsCheckStatus {
     success = "success",
@@ -21,5 +22,6 @@ export declare const Summaries: Readonly<{
     devCertSkipped: () => string;
     funcSuccess: (binFolders?: string[] | undefined) => string;
     dotnetSuccess: (binFolders?: string[] | undefined) => string;
+    testToolSuccess: (binFolders?: string[] | undefined) => string;
 }>;
 //# sourceMappingURL=constant.d.ts.map

package/build/component/driver/devTool/constant.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/constant.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB~~;;;;;EAK9B~~,CAAC;AAEH,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,sBAAsB;IAChC,QAAQ,aAAa;IACrB,cAAc,oBAAoB;IAClC,OAAO,YAAY;IACnB,UAAU,gBAAgB;CAC3B;AAED,eAAO,MAAM,uBAAuB,QAAO,MACY,CAAC;AAExD,eAAO,MAAM,SAAS;mCACW,OAAO,KAAG,MAAM;0BAI3B,MAAM;wDACY,MAAM;0DAIJ,MAAM;~~EAI9C~~,CAAC"}
1	+ {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/constant.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;;;;EAM9B,CAAC;AAEH,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,sBAAsB;IAChC,QAAQ,aAAa;IACrB,cAAc,oBAAoB;IAClC,OAAO,YAAY;IACnB,UAAU,gBAAgB;CAC3B;AAED,eAAO,MAAM,uBAAuB,QAAO,MACY,CAAC;AAExD,eAAO,MAAM,SAAS;mCACW,OAAO,KAAG,MAAM;0BAI3B,MAAM;wDACY,MAAM;0DAIJ,MAAM;4DAIJ,MAAM;EAOhD,CAAC"}

package/build/component/driver/devTool/constant.js CHANGED Viewed

@@ -9,6 +9,7 @@ exports.TelemetryProperties = Object.freeze({
     devCertStatus: "dev-cert-status",
     funcStatus: "func-status",
     dotnetStatus: "dotnet-status",
+    testToolStatus: "test-tool-status",
 });
 var TelemetryDepsCheckStatus;
 (function (TelemetryDepsCheckStatus) {
@@ -36,5 +37,8 @@ exports.Summaries = Object.freeze({
     dotnetSuccess: (binFolders) => binFolders && binFolders.length > 0
         ? localizeUtils_1.getLocalizedString("driver.prerequisite.summary.dotnet.installedWithPath", binFolders[0])
         : localizeUtils_1.getLocalizedString("driver.prerequisite.summary.dotnet.installed"),
+    testToolSuccess: (binFolders) => binFolders && (binFolders === null || binFolders === void 0 ? void 0 : binFolders.length) > 0
+        ? localizeUtils_1.getLocalizedString("driver.prerequisite.summary.testTool.installedWithPath", binFolders === null || binFolders === void 0 ? void 0 : binFolders[0])
+        : localizeUtils_1.getLocalizedString("driver.prerequisite.summary.testTool.installed"),
 });
 //# sourceMappingURL=constant.js.map

package/build/component/driver/devTool/constant.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/constant.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEtD,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,eAAe;~~CAC9B~~,CAAC,CAAC;AAEH,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,yCAAa,CAAA;IACb,6CAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAED,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,+CAAqB,CAAA;IACrB,4DAAkC,CAAA;IAClC,6CAAmB,CAAA;IACnB,oDAA0B,CAAA;AAC5B,CAAC,EALW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAKjC;AAEM,MAAM,uBAAuB,GAAG,GAAW,EAAE,CAClD,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;AAD3C,QAAA,uBAAuB,2BACoB;AAE3C,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,YAAqB,EAAU,EAAE,CAChD,YAAY;QACV,CAAC,CAAC,kCAAkB,CAAC,qDAAqD,CAAC;QAC3E,CAAC,CAAC,kCAAkB,CAAC,wDAAwD,CAAC;IAClF,cAAc,EAAE,GAAW,EAAE,CAAC,kCAAkB,CAAC,6CAA6C,CAAC;IAC/F,WAAW,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC7C,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAAC,oDAAoD,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,4CAA4C,CAAC;IACtE,aAAa,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC/C,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QACjC,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,8CAA8C,CAAC;~~CACzE~~,CAAC,CAAC"}
1	+ {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/constant.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEtD,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,eAAe;IAC7B,cAAc,EAAE,kBAAkB;CACnC,CAAC,CAAC;AAEH,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,yCAAa,CAAA;IACb,6CAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAED,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,+CAAqB,CAAA;IACrB,4DAAkC,CAAA;IAClC,6CAAmB,CAAA;IACnB,oDAA0B,CAAA;AAC5B,CAAC,EALW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAKjC;AAEM,MAAM,uBAAuB,GAAG,GAAW,EAAE,CAClD,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;AAD3C,QAAA,uBAAuB,2BACoB;AAE3C,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,YAAqB,EAAU,EAAE,CAChD,YAAY;QACV,CAAC,CAAC,kCAAkB,CAAC,qDAAqD,CAAC;QAC3E,CAAC,CAAC,kCAAkB,CAAC,wDAAwD,CAAC;IAClF,cAAc,EAAE,GAAW,EAAE,CAAC,kCAAkB,CAAC,6CAA6C,CAAC;IAC/F,WAAW,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC7C,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAAC,oDAAoD,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,4CAA4C,CAAC;IACtE,aAAa,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC/C,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QACjC,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,8CAA8C,CAAC;IACxE,eAAe,EAAE,CAAC,UAAqB,EAAU,EAAE,CACjD,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAChB,wDAAwD,EACxD,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAChB;QACH,CAAC,CAAC,kCAAkB,CAAC,gDAAgD,CAAC;CAC3E,CAAC,CAAC"}

package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import { UserError } from "@microsoft/teamsfx-api";
+export declare class TestToolInstallationUserError extends UserError {
+    constructor(actionName: string, error: any, helpLink?: string);
+}
+//# sourceMappingURL=testToolInstallationUserError.d.ts.map

package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"testToolInstallationUserError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/devTool/error/testToolInstallationUserError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAQnD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;CAU9D"}

package/build/component/driver/devTool/error/testToolInstallationUserError.js ADDED Viewed

@@ -0,0 +1,24 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestToolInstallationUserError = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
+const depsError_1 = require("../../../../common/deps-checker/depsError");
+const localizeUtils_1 = require("../../../../common/localizeUtils");
+const errorCode = "TestToolInstallationError";
+const messageKey = "driver.prerequisite.error.testToolInstallationError";
+class TestToolInstallationUserError extends teamsfx_api_1.UserError {
+    constructor(actionName, error, helpLink) {
+        super({
+            source: lodash_1.camelCase(actionName),
+            name: errorCode,
+            message: error instanceof depsError_1.DepsCheckerError ? error.message : localizeUtils_1.getDefaultString(messageKey),
+            displayMessage: error instanceof depsError_1.DepsCheckerError ? error.message : localizeUtils_1.getLocalizedString(messageKey),
+            helpLink: helpLink,
+        });
+    }
+}
+exports.TestToolInstallationUserError = TestToolInstallationUserError;
+//# sourceMappingURL=testToolInstallationUserError.js.map

package/build/component/driver/devTool/error/testToolInstallationUserError.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"testToolInstallationUserError.js","sourceRoot":"","sources":["../../../../../src/component/driver/devTool/error/testToolInstallationUserError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,mCAAmC;AACnC,yEAA6E;AAC7E,oEAAwF;AAExF,MAAM,SAAS,GAAG,2BAA2B,CAAC;AAC9C,MAAM,UAAU,GAAG,qDAAqD,CAAC;AAEzE,MAAa,6BAA8B,SAAQ,uBAAS;IAC1D,YAAY,UAAkB,EAAE,KAAU,EAAE,QAAiB;QAC3D,KAAK,CAAC;YACJ,MAAM,EAAE,kBAAS,CAAC,UAAU,CAAC;YAC7B,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK,YAAY,4BAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgB,CAAC,UAAU,CAAC;YACzF,cAAc,EACZ,KAAK,YAAY,4BAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkB,CAAC,UAAU,CAAC;YACpF,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AAXD,sEAWC"}

package/build/component/driver/devTool/installDriver.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export declare class ToolsInstallDriverImpl {
     resolveLocalCertificate(trustDevCert: boolean, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
     resolveFuncCoreTools(version: string, symlinkDir?: string, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
     resolveDotnet(outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
+    resolveTestTool(versionRange: string, symlinkDir: string): Promise<void>;
     private validateArgs;
     private setArgTelemetry;
     private setDevCertTelemetry;

package/build/component/driver/devTool/installDriver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;~~AAOzD~~,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;~~AAmB~~/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;~~IA+BzB~~,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;~~IAuC1F~~,OAAO,CAAC,YAAY;~~IAuBpB~~,OAAO,CAAC,eAAe;~~IAiBvB~~,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}
1	+ {"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAYzD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAsB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAmCzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuCpF,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B9E,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}

package/build/component/driver/devTool/installDriver.js CHANGED Viewed

@@ -24,6 +24,8 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
 const funcToolChecker_1 = require("../../../common/deps-checker/internal/funcToolChecker");
 const dotnetChecker_1 = require("../../../common/deps-checker/internal/dotnetChecker");
 const globalVars_1 = require("../../../core/globalVars");
+const testToolChecker_1 = require("../../../common/deps-checker/internal/testToolChecker");
+const testToolInstallationUserError_1 = require("./error/testToolInstallationUserError");
 const ACTION_NAME = "devTool/install";
 const helpLink = "https://aka.ms/teamsfx-actions/devtool-install";
 const outputKeys = {
@@ -31,6 +33,7 @@ const outputKeys = {
     sslKeyFile: "sslKeyFile",
     funcPath: "funcPath",
     dotnetPath: "dotnetPath",
+    testToolPath: "testToolPath",
 };
 let ToolsInstallDriver = class ToolsInstallDriver {
     constructor() {
@@ -87,6 +90,9 @@ class ToolsInstallDriverImpl {
             const dotnetRes = await this.resolveDotnet(outputEnvVarNames);
             dotnetRes.forEach((v, k) => res.set(k, v));
         }
+        if (args.testTool) {
+            await this.resolveTestTool(`${args.testTool.version}`, args.testTool.symlinkDir);
+        }
         return res;
     }
     async resolveLocalCertificate(trustDevCert, outputEnvVarNames) {
@@ -191,8 +197,27 @@ class ToolsInstallDriverImpl {
         }
         return res;
     }
+    async resolveTestTool(versionRange, symlinkDir) {
+        var _a;
+        const checker = new testToolChecker_1.TestToolChecker();
+        const projectPath = this.context.projectPath;
+        const status = await checker.resolve({ versionRange, symlinkDir, projectPath });
+        this.context.logProvider.debug(`Teams App Test Tool result: ${JSON.stringify({
+            isInstalled: status.isInstalled,
+            version: status.details.installVersion,
+            bin: status.details.binFolders,
+            supportedVersions: status.details.supportedVersions,
+        })}`);
+        this.setDepsCheckTelemetry(constant_1.TelemetryProperties.testToolStatus, status);
+        if (!status.isInstalled) {
+            throw new testToolInstallationUserError_1.TestToolInstallationUserError(ACTION_NAME, status.error, ((_a = status.error) === null || _a === void 0 ? void 0 : _a.helpLink) || deps_checker_1.v3DefaultHelpLink);
+        }
+        else {
+            this.context.addSummary(constant_1.Summaries.testToolSuccess(status.details.binFolders));
+        }
+    }
     validateArgs(args) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!!args.devCert && typeof ((_a = args.devCert) === null || _a === void 0 ? void 0 : _a.trust) !== "boolean") {
             throw new common_2.InvalidActionInputError(ACTION_NAME, ["devCert.trust"], helpLink);
         }
@@ -211,9 +236,21 @@ class ToolsInstallDriverImpl {
         if (!!args.dotnet && typeof args.dotnet !== "boolean") {
             throw new common_2.InvalidActionInputError(ACTION_NAME, ["dotnet"], helpLink);
         }
+        if (typeof args.testTool !== "undefined") {
+            if (typeof args.testTool !== "object") {
+                throw new common_2.InvalidActionInputError(ACTION_NAME, ["testTool"], helpLink);
+            }
+            if (typeof args.testTool.version !== "string" ||
+                !semver_1.default.validRange(`${(_c = args.testTool) === null || _c === void 0 ? void 0 : _c.version}`)) {
+                throw new common_2.InvalidActionInputError(ACTION_NAME, ["testTool.version"], helpLink);
+            }
+            if (typeof args.testTool.symlinkDir !== "string") {
+                throw new common_2.InvalidActionInputError(ACTION_NAME, ["testTool.symlinkDir"], helpLink);
+            }
+        }
     }
     setArgTelemetry(args) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.context.addTelemetryProperties({
             [constant_1.TelemetryProperties.driverArgs]: JSON.stringify({
                 devCert: args.devCert,
@@ -226,6 +263,14 @@ class ToolsInstallDriverImpl {
                         : "<undefined>",
                 },
                 dotnet: args.dotnet,
+                testTool: {
+                    version: (_c = args.testTool) === null || _c === void 0 ? void 0 : _c.version,
+                    symlinkDir: ((_d = args.testTool) === null || _d === void 0 ? void 0 : _d.symlinkDir)
+                        ? path.resolve(args.testTool.symlinkDir) === path.resolve("./devTools/testTool")
+                            ? "<default>"
+                            : "<unknown>"
+                        : "<undefined>",
+                },
             }),
         });
     }

package/build/component/driver/devTool/installDriver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,mDAA6B;AAC7B,4DAA4B;AAC5B,mCAAiC;AAEjC,+DAKsC;AACtC,2FAGuD;AACvD,+CAA6C;AAG7C,+CAAqD;AACrD,yCAMoB;AACpB,qFAAkF;AAClF,iFAA8E;AAE9E,kDAAgE;AAChE,mFAAgF;AAChF,+CAA8C;AAC9C,iEAAmE;AACnE,2FAAwF;AACxF,uFAAoF;AACpF,yDAA0D;AAC1D,2FAAwF;AACxF,yFAAsF;AAEtF,MAAM,WAAW,GAAG,iBAAiB,CAAC;AACtC,MAAM,QAAQ,GAAG,gDAAgD,CAAC;AAElE,MAAM,UAAU,GAAG;IACjB,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,cAAc;CAC7B,CAAC;AAGF,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,gBAAW,GAAG,kCAAuB,EAAE,CAAC;QAC/B,kBAAa,GAAG,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;IAkCjF,CAAC;IAhCC,KAAK,CAAC,GAAG,CACP,IAAqB,EACrB,OAAsB;QAEtB,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC7E,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,OAAO,CACX,IAAqB,EACrB,OAAsB,EACtB,iBAAuC;QAEvC,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACrE,OAAO;YACL,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,IAAI,CACR,IAAqB,EACrB,WAA8B,EAC9B,iBAAuC;QAEvC,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,IAAI,GAAG,IAAI,sBAAsB,CAAC,WAAW,CAAC,CAAC;YACrD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACjD,CAAC,EAAE,WAAW,CAAC,CAAC;IAClB,CAAC;CACF,CAAA;AAVC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;;qDAG5C,4BAAiB;QACV,GAAG;;8CAMxB;AAnCU,kBAAkB;IAD9B,gBAAO,CAAC,WAAW,CAAC;GACR,kBAAkB,CAoC9B;AApCY,gDAAkB;AAsC/B,MAAa,sBAAsB;IACjC,YAAoB,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAGlD,KAAK,CAAC,GAAG,CACP,IAAqB,EACrB,iBAAuC;QAEvC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACrD,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,iBAAiB,CAClB,CAAC;YACF,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC7C,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EACtB,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,iBAAiB,CAClB,CAAC;YACF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1C;QAED,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;YAC9D,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC5C;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;SAClF;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,YAAqB,EACrB,iBAAuC;QAEvC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,2FAA2F;QAC3F,MAAM,WAAW,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjE,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAC5B,oBAAoB,IAAI,CAAC,SAAS,CAAC;YACjC,IAAI,EAAE,eAAe,CAAC,QAAQ;YAC9B,GAAG,EAAE,eAAe,CAAC,OAAO;YAC5B,cAAc,EAAE,eAAe,CAAC,cAAc;YAC9C,SAAS,EAAE,eAAe,CAAC,SAAS;SACrC,CAAC,EAAE,CACL,CAAC;QACF,IAAI,YAAY,EAAE;YAChB,IAAI,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC1D,IAAI,IAAI,EAAE;gBACR,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;aACzC;YACD,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACrD,IAAI,IAAI,EAAE;gBACR,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;aACxC;SACF;QACD,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAExD,IAAI,OAAO,eAAe,CAAC,SAAS,KAAK,WAAW,EAAE;YACpD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,oBAAS,CAAC,cAAc,EAAE,CAAC,CAAC;YAC7D,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAS,CAAC,cAAc,EAAE,CAAC,CAAC;SACrD;aAAM,IAAI,eAAe,CAAC,SAAS,KAAK,KAAK,EAAE;YAC9C,MAAM,eAAe,CAAC,KAAK,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAS,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;SACjE;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAe,EACf,UAAmB,EACnB,iBAAuC;;QAEvC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,MAAM,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;YAC/C,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,UAAU;YACtB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;SACtC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAC5B,qBAAqB,IAAI,CAAC,SAAS,CAAC;YAClC,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc;YAC1C,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU;YAClC,iBAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,iBAAiB;SACxD,CAAC,EAAE,CACL,CAAC;QAEF,IAAI,CAAC,qBAAqB,CAAC,8BAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEvE,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,KAAK,EAAE;YAC/C,MAAM,IAAI,qDAAyB,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC/F;aAAM,IAAI,UAAU,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3D,IAAI,CAAC,OAAO,CAAC,UAAU,CACrB,oBAAS,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAChF,CAAC;SACH;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAS,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;SAC/E;QAED,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,0CAAE,UAAU,MAAK,SAAS,EAAE;YACjD,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzE,MAAM,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACzD,IAAI,IAAI,EAAE;gBACR,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,iBAAuC;;QACzD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,IAAI,0BAAW,EAAE,EAAE,IAAI,6BAAc,EAAE,CAAC,CAAC;QACjF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAC5B,gBAAgB,IAAI,CAAC,SAAS,CAAC;YAC7B,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,OAAO,EAAE,MAAA,YAAY,CAAC,OAAO,0CAAE,cAAc;YAC7C,GAAG,EAAE,MAAA,YAAY,CAAC,OAAO,0CAAE,UAAU;YACrC,iBAAiB,EAAE,MAAA,YAAY,CAAC,OAAO,0CAAE,iBAAiB;SAC3D,CAAC,EAAE,CACL,CAAC;QAEF,IAAI,CAAC,qBAAqB,CAAC,8BAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAE3E,IAAI,CAAC,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,KAAK,EAAE;YACnD,MAAM,IAAI,yDAA2B,CACnC,WAAW,EACX,YAAY,CAAC,KAAK,EAClB,YAAY,CAAC,KAAK,CAAC,QAAQ,CAC5B,CAAC;SACH;aAAM,IAAI,YAAY,CAAC,KAAK,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC;SACtD;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAS,CAAC,aAAa,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,UAAU,CAAC,CAAC,CAAC;SACrF;QACD,IAAI,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,UAAU,MAAK,SAAS,EAAE;YACnD,MAAM,eAAe,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU;iBACvD,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;iBACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,IAAI,EAAE;gBACR,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAChC;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,YAAoB,EAAE,UAAkB;;QAC5D,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAC5B,+BAA+B,IAAI,CAAC,SAAS,CAAC;YAC5C,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc;YACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;YAC9B,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB;SACpD,CAAC,EAAE,CACL,CAAC;QAEF,IAAI,CAAC,qBAAqB,CAAC,8BAAmB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,IAAI,6DAA6B,CACrC,WAAW,EACX,MAAM,CAAC,KAAK,EACZ,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,QAAQ,KAAI,gCAAiB,CAC5C,CAAC;SACH;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAS,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;SAC/E;IACH,CAAC;IAEO,YAAY,CAAC,IAAqB;;QACxC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,CAAA,KAAK,SAAS,EAAE;YAC9D,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;SAC7E;QACD,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE;YACpC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACjC,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;aACpE;YACD,IACE,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC;gBAChF,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,EAAE,CAAC,EAC3C;gBACA,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC5E;YACD,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE;gBAC3F,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC/E;SACF;QACD,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YACrD,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACxC,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACrC,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;aACxE;YACD,IACE,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,KAAK,QAAQ;gBACzC,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,EAAE,CAAC,EAC/C;gBACA,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,CAAC;aAChF;YACD,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,KAAK,QAAQ,EAAE;gBAChD,MAAM,IAAI,gCAAuB,CAAC,WAAW,EAAE,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,CAAC;aACnF;SACF;IACH,CAAC;IAEO,eAAe,CAAC,IAAqB;;QAC3C,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC;YAClC,CAAC,8BAAmB,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;gBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE;oBACJ,OAAO,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO;oBAC3B,UAAU,EAAE,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAU;wBAC/B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;4BACtE,CAAC,CAAC,WAAW;4BACb,CAAC,CAAC,WAAW;wBACf,CAAC,CAAC,aAAa;iBAClB;gBACD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE;oBACR,OAAO,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO;oBAC/B,UAAU,EAAE,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,UAAU;wBACnC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC;4BAC9E,CAAC,CAAC,WAAW;4BACb,CAAC,CAAC,WAAW;wBACf,CAAC,CAAC,aAAa;iBAClB;aACF,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,YAAqB,EAAE,eAAiC;QAClF,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC;YAClC,CAAC,8BAAmB,CAAC,aAAa,CAAC,EAAE,CAAC,YAAY;gBAChD,CAAC,CAAC,iCAAsB,CAAC,QAAQ;gBACjC,CAAC,CAAC,eAAe,CAAC,cAAc;oBAChC,CAAC,CAAC,iCAAsB,CAAC,cAAc;oBACvC,CAAC,CAAC,eAAe,CAAC,SAAS;wBAC3B,CAAC,CAAC,iCAAsB,CAAC,OAAO;wBAChC,CAAC,CAAC,iCAAsB,CAAC,UAAU;SACtC,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAC3B,YAA0E,EAC1E,SAA2B;QAE3B,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC;YAClC,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,WAAW;gBACnC,CAAC,CAAC,SAAS,CAAC,KAAK;oBACf,CAAC,CAAC,mCAAwB,CAAC,IAAI;oBAC/B,CAAC,CAAC,mCAAwB,CAAC,OAAO;gBACpC,CAAC,CAAC,mCAAwB,CAAC,MAAM;SACpC,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,mBAAmB,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;SACpE;IACH,CAAC;CACF;AApRC;IADC,WAAK,CAAC,CAAC,2BAAc,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC;;qDAG/D,GAAG;;iDAkCxB;AAxCH,wDAwRC"}

package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts CHANGED Viewed

@@ -11,6 +11,10 @@ export interface InstallToolArgs {
      * Install Dotnet
      */
     dotnet?: boolean;
+    /**
+     * Install Test Tool
+     */
+    testTool?: TestToolArgs;
 }
 interface DevCertArgs {
     trust: boolean;
@@ -19,5 +23,9 @@ interface FuncArgs {
     version: string | number;
     symlinkDir?: string;
 }
+interface TestToolArgs {
+    version: string | number;
+    symlinkDir: string;
+}
 export {};
 //# sourceMappingURL=InstallToolArgs.d.ts.map

package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"InstallToolArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/devTool/interfaces/InstallToolArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;~~CAClB~~;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,QAAQ;IAChB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
1	+ {"version":3,"file":"InstallToolArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/devTool/interfaces/InstallToolArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,QAAQ;IAChB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/build/component/driver/script/scriptDriver.d.ts CHANGED Viewed

@@ -21,7 +21,7 @@ export declare class ScriptDriver implements StepDriver {
 }
 export declare const scriptDriver: ScriptDriver;
 export declare function executeCommand(command: string, projectPath: string, logProvider: LogProvider, ui: DriverContext["ui"], workingDirectory?: string, env?: NodeJS.ProcessEnv, shell?: string, timeout?: number, redirectTo?: string): Promise<Result<[string, DotenvOutput], FxError>>;
-export declare function getStderrHandler(logProvider: LogProvider, systemEncoding: string, stderrStrings: string[], dataHandler: (data: string) => Promise<void>): (data: Buffer) => Promise<void>;
+export declare function getStderrHandler(logProvider: LogProvider, systemEncoding: string, stderrStrings: string[], dataHandler: (data: string) => void): (data: Buffer) => void;
 export declare function bufferToString(data: Buffer, systemEncoding: string): string;
 export declare function convertScriptErrorToFxError(error: child_process.ExecException, run: string): ScriptTimeoutError | ScriptExecutionError;
 export declare function parseSetOutputCommand(stdout: string): DotenvOutput;

package/build/component/driver/script/scriptDriver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAI1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAkElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,~~OAAO,CAAC,~~IAAI,~~CAAC~~,~~GAC3C,~~CAAC,IAAI,EAAE,MAAM,KAAK,~~OAAO,CAAC,~~IAAI,~~CAAC,CAOjC~~;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
1	+ {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAI1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAkElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}

package/build/component/driver/script/scriptDriver.js CHANGED Viewed

@@ -100,16 +100,16 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
                 resolve(teamsfx_api_1.ok([outputString, outputObject]));
             }
         });
-        const dataHandler = async (data) => {
+        const dataHandler = (data) => {
+            allOutputStrings.push(data);
             if (appendFile) {
-                await fs_extra_1.default.appendFile(appendFile, data);
+                fs_extra_1.default.appendFileSync(appendFile, data);
             }
-            allOutputStrings.push(data);
         };
-        (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", async (data) => {
+        (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
             const str = bufferToString(data, systemEncoding);
             logProvider.info(` [script action stdout] ${maskSecretValues(str)}`);
-            await dataHandler(str);
+            dataHandler(str);
         });
         const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
         (_b = cp.stderr) === null || _b === void 0 ? void 0 : _b.on("data", handler);
@@ -117,10 +117,10 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
 }
 exports.executeCommand = executeCommand;
 function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
-    return async (data) => {
+    return (data) => {
         const str = bufferToString(data, systemEncoding);
         logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
-        await dataHandler(str);
+        dataHandler(str);
         stderrStrings.push(str);
     };
 }
@@ -134,10 +134,10 @@ function bufferToString(data, systemEncoding) {
 exports.bufferToString = bufferToString;
 function convertScriptErrorToFxError(error, run) {
     if (error.killed) {
-        return new script_1.ScriptTimeoutError(run);
+        return new script_1.ScriptTimeoutError(run, error);
     }
     else {
-        return new script_1.ScriptExecutionError(run, error.message);
+        return new script_1.ScriptExecutionError(run, error.message, error);
     }
 }
 exports.convertScriptErrorToFxError = convertScriptErrorToFxError;

package/build/component/driver/script/scriptDriver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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~~KAAK~~,~~EAAE,~~IAAY,EAAE,EAAE;~~YACzC~~,~~IAAI~~,~~UAAU~~,~~EAAE;gBACd~~,~~MAAM~~,~~kBAAE~~,CAAC,~~UAAU,~~CAAC,UAAU,EAAE,~~IAAI~~,CAAC,~~CAAC;aACvC;YACD~~,~~gBAAgB,~~CAAC,~~IAAI~~,~~CAAC~~,IAAI,CAAC,CAAC;~~QAC9B~~,CAAC,CAAC;QACF,MAAA,EAAE,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,~~KAAK~~,~~EAAE,~~IAAY,EAAE,EAAE;~~YAC3C~~,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACjD,WAAW,CAAC,IAAI,CAAC,2BAA2B,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrE,~~MAAM,~~WAAW,CAAC,GAAG,CAAC,CAAC;~~QACzB~~,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAC1F,MAAA,EAAE,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AA5ED,wCA4EC;AAED,SAAgB,gBAAgB,CAC9B,WAAwB,EACxB,cAAsB,EACtB,aAAuB,EACvB,~~WAA4C~~;~~IAE5C~~,OAAO,~~KAAK~~,~~EAAE,~~IAAY,EAAE,EAAE;~~QAC5B~~,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACjD,WAAW,CAAC,OAAO,CAAC,2BAA2B,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxE,~~MAAM,~~WAAW,CAAC,GAAG,CAAC,CAAC;~~QACvB~~,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AAZD,4CAYC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,cAAsB;IACjE,MAAM,GAAG,GACP,cAAc,KAAK,MAAM,IAAI,cAAc,KAAK,OAAO;QACrD,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;QACjB,CAAC,CAAC,oBAAK,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzC,OAAO,GAAG,CAAC;AACb,CAAC;AAND,wCAMC;AAED,SAAgB,2BAA2B,CACzC,KAAkC,EAClC,GAAW;IAEX,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,OAAO,IAAI,2BAAkB,CAAC,GAAG,CAAC,CAAC;~~KACpC~~;SAAM;QACL,OAAO,IAAI,6BAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;~~KACrD~~;AACH,CAAC;AATD,kEASC;AAED,SAAgB,qBAAqB,CAAC,MAAc;IAClD,MAAM,KAAK,GAAG,2DAA2D,CAAC;IAC1E,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE;QACnC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,sDAYC;AAED,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,EAAE;gBACT,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aACvC;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAVD,4CAUC;AAED,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAFD,sDAEC"}
1	+ {"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}

package/build/component/driver/teamsApp/clients/appStudioClient.d.ts CHANGED Viewed

@@ -53,6 +53,12 @@ export declare namespace AppStudioClient {
      * @returns
      */
     function publishTeamsAppUpdate(teamsAppId: string, file: Buffer, appStudioToken: string): Promise<string>;
+    /**
+     * Get Stagged Teams app from tenant app catalog
+     * @param teamsAppId manifest.id, which is externalId in app catalog.
+     * @param appStudioToken
+     * @returns
+     */
     function getAppByTeamsAppId(teamsAppId: string, appStudioToken: string): Promise<IPublishingAppDenition | undefined>;
     function getUserList(teamsAppId: string, appStudioToken: string, logProvider: LogProvider): Promise<AppUser[] | undefined>;
     function checkPermission(teamsAppId: string, appStudioToken: string, userObjectId: string, logProvider: LogProvider): Promise<string>;

package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/clients/appStudioClient.ts"],"names":[],"mappings":";AAQA,OAAO,EAAe,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,kEAAkE,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,4DAA4D,CAAC;AAErF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAC;AAgB/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sEAAsE,CAAC;AAMzG,yBAAiB,eAAe,CAAC;IAK/B;;;OAGG;IACH,SAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,QAExC;IAoBD,SAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAC9C,IAAI,CAKN;IAED,SAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAC9C,IAAI,CAKN;IAED,SAAgB,aAAa,CAC3B,CAAC,EAAE,GAAG,EACN,OAAO,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAC9C,KAAK,CA0BP;IAED;;;;;;;OAOG;IACH,SAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,WAAW,EACxB,SAAS,UAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAwExB;IAED,SAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,aAAa,CAAC,CA+CxB;IAED;;;;;;OAMG;IACH,SAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC,CAmBlB;IAED;;;;;;OAMG;IACH,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,~~CA4CjB~~;IAED;;;;;;OAMG;IACH,SAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAqDjB;IAED,SAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,~~CA4B7C~~;IAED,SAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAShC;IAED,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAoDf;IAED,SAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,CAqBd;IAED,SAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC,CAe5B;IAWD,SAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAwE/F;CAQF"}
1	+ {"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/clients/appStudioClient.ts"],"names":[],"mappings":"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"}

package/build/component/driver/teamsApp/clients/appStudioClient.js CHANGED Viewed

@@ -225,6 +225,7 @@ var AppStudioClient;
      * @returns
      */
     async function publishTeamsApp(teamsAppId, file, appStudioToken) {
+        var _a;
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.PUBLISH_APP);
         try {
             const requester = createRequesterWithToken(appStudioToken, region);
@@ -241,6 +242,20 @@ var AppStudioClient;
                             return appDefinition.teamsAppId;
                         }
                     }
+                    // Corner case
+                    // Fail if an app with the same external.id exists in the staged app entitlements
+                    // App with same id already exists in the staged apps, Invoke UpdateAPI instead.
+                    if (response.data.error.code == "Conflict" &&
+                        ((_a = response.data.error.innerError) === null || _a === void 0 ? void 0 : _a.code) == "AppDefinitionAlreadyExists") {
+                        try {
+                            return await publishTeamsAppUpdate(teamsAppId, file, appStudioToken);
+                        }
+                        catch (e) {
+                            // Update Published app failed as well
+                            const error = results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.TeamsAppPublishConflictError.name, errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId), e);
+                            throw error;
+                        }
+                    }
                     const error = new Error(response === null || response === void 0 ? void 0 : response.data.error.message);
                     error.response = response;
                     error.request = response.request;
@@ -320,12 +335,18 @@ var AppStudioClient;
         }
     }
     AppStudioClient.publishTeamsAppUpdate = publishTeamsAppUpdate;
+    /**
+     * Get Stagged Teams app from tenant app catalog
+     * @param teamsAppId manifest.id, which is externalId in app catalog.
+     * @param appStudioToken
+     * @returns
+     */
     async function getAppByTeamsAppId(teamsAppId, appStudioToken) {
         globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP);
         const requester = createRequesterWithToken(appStudioToken, region);
         try {
-            const response = await requester.get(`/api/publishing/${teamsAppId}`);
+            const response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/publishing/${teamsAppId}`));
             if (response && response.data && response.data.value && response.data.value.length > 0) {
                 const appdefinitions = response.data.value[0].appDefinitions.map((item) => {
                     return {