@microsoft/teamsfx-core 1.23.3 → 2.0.0-alpha.14ea2b310.0

package/build/component/driver/botFramework/error/unhandledError.js

@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const errorCode = "UnhandledError";
-const messageKey = "driver.botFramework.error.unhandledError";
+const messageKey = "error.common.UnhandledError";
 class UnhandledSystemError extends teamsfx_api_1.SystemError {
     constructor(actionName, detail) {
         const errorOptions = generateErrorOptions(actionName, detail);

package/build/component/driver/botFramework/error/unhandledError.js.map

@@ -1 +1 @@
-{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botFramework/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,0CAA0C,CAAC;AAE9D,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botFramework/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}

package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @author Siglud <siglud@gmail.com>
+ */
 import { ExecutionResult, StepDriver } from "../../interface/stepDriver";
 import { DriverContext } from "../../interface/commonArgs";
 import { FxError, Result } from "@microsoft/teamsfx-api";

package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureAppServiceDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AASzD,qBACa,2BAA4B,YAAW,UAAU;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAE7B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAErC;IAGI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAazF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAW3E"}
+{"version":3,"file":"azureAppServiceDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AASzD,qBACa,2BAA4B,YAAW,UAAU;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAwD;IACvF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAiD;IAGlF,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAazF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAW3E"}

package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js

@@ -1,6 +1,9 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @author Siglud <siglud@gmail.com>
+ */
 var AzureAppServiceDeployDriver_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureAppServiceDeployDriver = void 0;
@@ -11,7 +14,7 @@ const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTeleme
 const commonConstant_1 = require("../../../constant/commonConstant");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const AzureZipDeployImpl_1 = require("./impl/AzureZipDeployImpl");
-const ACTION_NAME = "azureAppService/deploy";
+const ACTION_NAME = "azureAppService/zipDeploy";
 let AzureAppServiceDeployDriver = AzureAppServiceDeployDriver_1 = class AzureAppServiceDeployDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.deploy.deployToAzureAppServiceDescription");
@@ -26,12 +29,8 @@ let AzureAppServiceDeployDriver = AzureAppServiceDeployDriver_1 = class AzureApp
     }
 };
 AzureAppServiceDeployDriver.SERVICE_NAME = "Azure App Service";
-AzureAppServiceDeployDriver.SUMMARY = [
-    localizeUtils_1.getLocalizedString("driver.deploy.azureAppServiceDeploySummary"),
-];
-AzureAppServiceDeployDriver.SUMMARY_PREPARE = [
-    localizeUtils_1.getLocalizedString("driver.deploy.notice.deployDryRunComplete"),
-];
+AzureAppServiceDeployDriver.SUMMARY = ["driver.deploy.azureAppServiceDeployDetailSummary"];
+AzureAppServiceDeployDriver.SUMMARY_PREPARE = ["driver.deploy.notice.deployDryRunComplete"];
 tslib_1.__decorate([
     lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
     tslib_1.__metadata("design:type", Function),

package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureAppServiceDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAGlC,mCAAiC;AAGjC,+CAA8C;AAC9C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,kEAA+D;AAE/D,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAG7C,IAAa,2BAA2B,mCAAxC,MAAa,2BAA2B;IAAxC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,kDAAkD,CACnD,CAAC;IAkCJ,CAAC;IAxBC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,OAAO,EACP,6BAA2B,CAAC,YAAY,EACxC,yDAAyD,EACzD,6BAA2B,CAAC,OAAO,EACnC,6BAA2B,CAAC,eAAe,CAC5C,CAAC;QACF,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,GAAG,EACH,6BAA2B,CAAC,YAAY,EACxC,yDAAyD,EACzD,6BAA2B,CAAC,OAAO,EACnC,6BAA2B,CAAC,eAAe,CAC5C,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC;CACF,CAAA;AAjCyB,wCAAY,GAAG,mBAAmB,CAAC;AACnC,mCAAO,GAAG;IAChC,kCAAkB,CAAC,4CAA4C,CAAC;CACjE,CAAC;AACsB,2CAAe,GAAG;IACxC,kCAAkB,CAAC,2CAA2C,CAAC;CAChE,CAAC;AAGF;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;sDAWtF;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;0DAWtF;AApCU,2BAA2B;IADvC,gBAAO,CAAC,WAAW,CAAC;GACR,2BAA2B,CAqCvC;AArCY,kEAA2B"}
+{"version":3,"file":"azureAppServiceDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureAppServiceDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;;AAGH,mCAAiC;AAGjC,+CAA8C;AAC9C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,kEAA+D;AAE/D,MAAM,WAAW,GAAG,2BAA2B,CAAC;AAGhD,IAAa,2BAA2B,mCAAxC,MAAa,2BAA2B;IAAxC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,kDAAkD,CACnD,CAAC;IA8BJ,CAAC;IAxBC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,OAAO,EACP,6BAA2B,CAAC,YAAY,EACxC,yDAAyD,EACzD,6BAA2B,CAAC,OAAO,EACnC,6BAA2B,CAAC,eAAe,CAC5C,CAAC;QACF,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,GAAG,EACH,6BAA2B,CAAC,YAAY,EACxC,yDAAyD,EACzD,6BAA2B,CAAC,OAAO,EACnC,6BAA2B,CAAC,eAAe,CAC5C,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC;CACF,CAAA;AA7ByB,wCAAY,GAAG,mBAAmB,CAAC;AACnC,mCAAO,GAAG,CAAC,kDAAkD,CAAC,CAAC;AAC/D,2CAAe,GAAG,CAAC,2CAA2C,CAAC,CAAC;AAGxF;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;sDAWtF;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;0DAWtF;AAhCU,2BAA2B;IADvC,gBAAO,CAAC,WAAW,CAAC;GACR,2BAA2B,CAiCvC;AAjCY,kEAA2B"}

package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @author Siglud <siglud@gmail.com>
+ */
 import { ExecutionResult, StepDriver } from "../../interface/stepDriver";
 import { DriverContext } from "../../interface/commonArgs";
 import { FxError, Result } from "@microsoft/teamsfx-api";

package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureFunctionDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AASzD,qBACa,yBAA0B,YAAW,UAAU;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAC5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAG7B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAErC;IAGI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAazF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAW3E"}
+{"version":3,"file":"azureFunctionDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AASzD,qBACa,yBAA0B,YAAW,UAAU;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAuD;IACtF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAiD;IAGlF,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAazF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAW3E"}

package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js

@@ -1,6 +1,9 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @author Siglud <siglud@gmail.com>
+ */
 var AzureFunctionDeployDriver_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureFunctionDeployDriver = void 0;
@@ -11,7 +14,7 @@ const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTeleme
 const commonConstant_1 = require("../../../constant/commonConstant");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const AzureZipDeployImpl_1 = require("./impl/AzureZipDeployImpl");
-const ACTION_NAME = "azureFunctions/deploy";
+const ACTION_NAME = "azureFunctions/zipDeploy";
 let AzureFunctionDeployDriver = AzureFunctionDeployDriver_1 = class AzureFunctionDeployDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.deploy.deployToAzureFunctionsDescription");
@@ -26,13 +29,9 @@ let AzureFunctionDeployDriver = AzureFunctionDeployDriver_1 = class AzureFunctio
     }
 };
 AzureFunctionDeployDriver.SERVICE_NAME = "Azure Function App";
-AzureFunctionDeployDriver.SUMMARY = [
-    // eslint-disable-next-line no-secrets/no-secrets
-    localizeUtils_1.getLocalizedString("driver.deploy.azureFunctionsDeploySummary"),
-];
-AzureFunctionDeployDriver.SUMMARY_PREPARE = [
-    localizeUtils_1.getLocalizedString("driver.deploy.notice.deployDryRunComplete"),
-];
+// eslint-disable-next-line no-secrets/no-secrets
+AzureFunctionDeployDriver.SUMMARY = ["driver.deploy.azureFunctionsDeployDetailSummary"];
+AzureFunctionDeployDriver.SUMMARY_PREPARE = ["driver.deploy.notice.deployDryRunComplete"];
 tslib_1.__decorate([
     hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
     tslib_1.__metadata("design:type", Function),

package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureFunctionDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAElC,mCAAiC;AAIjC,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,kEAA+D;AAE/D,MAAM,WAAW,GAAG,uBAAuB,CAAC;AAG5C,IAAa,yBAAyB,iCAAtC,MAAa,yBAAyB;IAAtC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,iDAAiD,CAClD,CAAC;IAmCJ,CAAC;IAxBC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,OAAO,EACP,2BAAyB,CAAC,YAAY,EACtC,uDAAuD,EACvD,2BAAyB,CAAC,OAAO,EACjC,2BAAyB,CAAC,eAAe,CAC1C,CAAC;QACF,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,GAAG,EACH,2BAAyB,CAAC,YAAY,EACtC,uDAAuD,EACvD,2BAAyB,CAAC,OAAO,EACjC,2BAAyB,CAAC,eAAe,CAC1C,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC;CACF,CAAA;AAlCyB,sCAAY,GAAG,oBAAoB,CAAC;AACpC,iCAAO,GAAG;IAChC,iDAAiD;IACjD,kCAAkB,CAAC,2CAA2C,CAAC;CAChE,CAAC;AACsB,yCAAe,GAAG;IACxC,kCAAkB,CAAC,2CAA2C,CAAC;CAChE,CAAC;AAGF;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;oDAWtF;AAGD;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;wDAWtF;AArCU,yBAAyB;IADrC,gBAAO,CAAC,WAAW,CAAC;GACR,yBAAyB,CAsCrC;AAtCY,8DAAyB"}
+{"version":3,"file":"azureFunctionDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;;AAEH,mCAAiC;AAIjC,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,kEAA+D;AAE/D,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAG/C,IAAa,yBAAyB,iCAAtC,MAAa,yBAAyB;IAAtC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,iDAAiD,CAClD,CAAC;IA+BJ,CAAC;IAxBC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,OAAO,EACP,2BAAyB,CAAC,YAAY,EACtC,uDAAuD,EACvD,2BAAyB,CAAC,OAAO,EACjC,2BAAyB,CAAC,eAAe,CAC1C,CAAC;QACF,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,GAAG,EACH,2BAAyB,CAAC,YAAY,EACtC,uDAAuD,EACvD,2BAAyB,CAAC,OAAO,EACjC,2BAAyB,CAAC,eAAe,CAC1C,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC;CACF,CAAA;AA9ByB,sCAAY,GAAG,oBAAoB,CAAC;AAC5D,iDAAiD;AACzB,iCAAO,GAAG,CAAC,iDAAiD,CAAC,CAAC;AAC9D,yCAAe,GAAG,CAAC,2CAA2C,CAAC,CAAC;AAGxF;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;oDAWtF;AAGD;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;wDAWtF;AAjCU,yBAAyB;IADrC,gBAAO,CAAC,WAAW,CAAC;GACR,yBAAyB,CAkCrC;AAlCY,8DAAyB"}

package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts

@@ -1,6 +1,9 @@
+/**
+ * @author FanH <Siglud@gmail.com>
+ */
 import { AzureDeployImpl } from "./impl/azureDeployImpl";
 import { DeployStepArgs } from "../../interface/buildAndDeployArgs";
-import { FxError, IProgressHandler, Result, UserInteraction } from "@microsoft/teamsfx-api";
+import { FxError, Result } from "@microsoft/teamsfx-api";
 import { ExecutionResult, StepDriver } from "../../interface/stepDriver";
 import { DriverContext, AzureResourceInfo } from "../../interface/commonArgs";
 import { TokenCredential } from "@azure/identity";
@@ -13,16 +16,14 @@ export declare class AzureStorageDeployDriver implements StepDriver {
  * deploy to Azure Storage
  */
 export declare class AzureStorageDeployDriverImpl extends AzureDeployImpl {
-    protected summaries: string[];
-    protected summaryPrepare: string[];
-    protected progressHandler: AsyncIterableIterator<void>;
-    protected progressNames: string[];
+    protected summaries: () => string[];
+    protected summaryPrepare: () => string[];
     pattern: RegExp;
     protected helpLink: string;
     azureDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<void>;
     private static createContainerClient;
     private deleteAllBlobs;
     private static isBlobFile;
-    createProgressBar(ui?: UserInteraction): IProgressHandler | undefined;
+    updateProgressbar(): void;
 }
 //# sourceMappingURL=azureStorageDeployDriver.d.ts.map

package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureStorageDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAcpE,OAAO,EACL,OAAO,EACP,gBAAgB,EAEhB,MAAM,EACN,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AASlD,qBACa,wBAAyB,YAAW,UAAU;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IAEI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAM/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAIrE;AAED;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,eAAe;IAC/D,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAmE;IAChG,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,CAAM;IACxC,SAAS,CAAC,eAAe,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAEpD;IACF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,CAA+D;IAEhG,OAAO,SAC2G;IAElH,SAAS,CAAC,QAAQ,SAAyD;IAErE,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;mBAiDK,qBAAqB;YAc5B,cAAc;IA4B5B,OAAO,CAAC,MAAM,CAAC,UAAU;IAIzB,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;CAMtE"}
+{"version":3,"file":"azureStorageDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAcpE,OAAO,EAAE,OAAO,EAAe,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAclD,qBACa,wBAAyB,YAAW,UAAU;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IAEI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAM/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAIrE;AAED;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,eAAe;IAC/D,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAEjC;IACF,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAY;IAEpD,OAAO,SAC2G;IAElH,SAAS,CAAC,QAAQ,SAAyD;IAErE,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;mBA+CK,qBAAqB;YA8B5B,cAAc;IAuB5B,OAAO,CAAC,MAAM,CAAC,UAAU;IAIzB,iBAAiB;CAGlB"}

package/build/component/driver/deploy/azure/azureStorageDeployDriver.js

@@ -4,9 +4,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureStorageDeployDriverImpl = exports.AzureStorageDeployDriver = void 0;
 const tslib_1 = require("tslib");
+/**
+ * @author FanH <Siglud@gmail.com>
+ */
 const azureDeployImpl_1 = require("./impl/azureDeployImpl");
 const deployConstant_1 = require("../../../constant/deployConstant");
-const deployError_1 = require("../../../error/deployError");
 const fileOperation_1 = require("../../../utils/fileOperation");
 const path_1 = tslib_1.__importDefault(require("path"));
 const mime = tslib_1.__importStar(require("mime"));
@@ -16,7 +18,8 @@ const hooks_1 = require("@feathersjs/hooks");
 const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTelemetry");
 const commonConstant_1 = require("../../../constant/commonConstant");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
-const progressBarHelper_1 = require("./impl/progressBarHelper");
+const azureSdkErrorHandler_1 = require("../../../utils/azureSdkErrorHandler");
+const deploy_1 = require("../../../../error/deploy");
 const ACTION_NAME = "azureStorage/deploy";
 let AzureStorageDeployDriver = class AzureStorageDeployDriver {
     constructor() {
@@ -53,25 +56,21 @@ exports.AzureStorageDeployDriver = AzureStorageDeployDriver;
 class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
     constructor() {
         super(...arguments);
-        this.summaries = [localizeUtils_1.getLocalizedString("driver.deploy.azureStorageDeploySummary")];
-        this.summaryPrepare = [];
-        this.progressHandler = progressBarHelper_1.progressBarHelper(deployConstant_1.ProgressBarConstant.UPLOAD_DEPLOY_TO_AZURE_STORAGE_PROGRESS);
-        this.progressNames = deployConstant_1.ProgressBarConstant.UPLOAD_DEPLOY_TO_AZURE_STORAGE_PROGRESS;
+        this.summaries = () => [
+            localizeUtils_1.getLocalizedString("driver.deploy.azureStorageDeployDetailSummary", this.distDirectory),
+        ];
+        this.summaryPrepare = () => [];
         this.pattern = /\/subscriptions\/([^\/]*)\/resourceGroups\/([^\/]*)\/providers\/Microsoft.Storage\/storageAccounts\/([^\/]*)/i;
         this.helpLink = "https://aka.ms/teamsfx-actions/azure-storage-deploy";
     }
     async azureDeploy(args, azureResource, azureCredential) {
-        var _a, _b, _c;
         await this.context.logProvider.debug("Start deploying to Azure Storage Service");
         await this.context.logProvider.debug("Get Azure Storage Service deploy credential");
-        await ((_a = this.progressHandler) === null || _a === void 0 ? void 0 : _a.next());
         const containerClient = await AzureStorageDeployDriverImpl.createContainerClient(azureResource, azureCredential);
         // delete all existing blobs
-        await ((_b = this.progressHandler) === null || _b === void 0 ? void 0 : _b.next());
         await this.deleteAllBlobs(containerClient, azureResource.instanceId, this.context.logProvider);
         await this.context.logProvider.debug("Uploading files to Azure Storage Service");
         // upload all to storage
-        await ((_c = this.progressHandler) === null || _c === void 0 ? void 0 : _c.next());
         const ig = await this.handleIgnore(args, this.context);
         const sourceFolder = this.distDirectory;
         const tasks = [];
@@ -93,18 +92,20 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
         const responses = await Promise.all(tasks);
         const errorResponse = responses.find((res) => res.errorCode);
         if (errorResponse) {
-            throw deployError_1.DeployExternalApiCallError.uploadToStorageError(sourceFolder, errorResponse, this.helpLink);
+            throw new deploy_1.AzureStorageUploadFilesError(azureResource.instanceId, sourceFolder, errorResponse, this.helpLink);
         }
         await this.context.logProvider.debug("Upload files to Azure Storage Service successfully");
         return;
     }
     static async createContainerClient(azureResource, azureCredential) {
         const blobServiceClient = await azureResourceOperation_1.createBlobServiceClient(azureResource, azureCredential);
-        const container = blobServiceClient.getContainerClient(deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME);
-        if (!(await container.exists())) {
-            await container.create();
-        }
-        return container;
+        return await azureSdkErrorHandler_1.wrapAzureOperation(async () => {
+            const container = blobServiceClient.getContainerClient(deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME);
+            if (!(await container.exists())) {
+                await container.create();
+            }
+            return container;
+        }, (e) => new deploy_1.AzureStorageGetContainerError(azureResource.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e), (e) => new deploy_1.AzureStorageGetContainerError(azureResource.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e));
     }
     async deleteAllBlobs(client, storageName, logProvider) {
         var e_1, _a;
@@ -128,16 +129,16 @@ class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
         const responses = await Promise.all(deleteJobs);
         const errorResponse = responses.find((res) => res.errorCode);
         if (errorResponse) {
-            throw deployError_1.DeployExternalApiCallError.clearStorageError("delete blob", errorResponse.errorCode, errorResponse, this.helpLink);
+            throw new deploy_1.AzureStorageClearBlobsError(storageName, errorResponse);
         }
     }
     static isBlobFile(blob) {
         var _a;
         return ((_a = blob.properties.contentLength) !== null && _a !== void 0 ? _a : -1) > 0;
     }
-    createProgressBar(ui) {
-        var _a;
-        return ui === null || ui === void 0 ? void 0 : ui.createProgressBar(`Deploying ${(_a = this.workingDirectory) !== null && _a !== void 0 ? _a : ""} to Azure Storage Service`, this.progressNames.length);
+    updateProgressbar() {
+        var _a, _b;
+        (_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(`Deploying ${(_b = this.workingDirectory) !== null && _b !== void 0 ? _b : ""} to Azure Storage Service`);
     }
 }
 exports.AzureStorageDeployDriverImpl = AzureStorageDeployDriverImpl;

package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,4DAAyD;AASzD,qEAAkE;AAElE,gEAAiE;AAEjE,wDAAwB;AACxB,mDAA6B;AAE7B,mCAAiC;AAGjC,kFAAgF;AAEhF,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqF;AACrF,oEAAsE;AACtE,8EAAyE;AACzE,qDAIkC;AAElC,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAG1C,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAArC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,+CAA+C,CAChD,CAAC;IAYJ,CAAC;IAVC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7D,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,MAAM,IAAI,GAAG,IAAI,4BAA4B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;CACF,CAAA;AAVC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;mDAItF;AAGD;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;uDAItF;AAdU,wBAAwB;IADpC,gBAAO,CAAC,WAAW,CAAC;GACR,wBAAwB,CAepC;AAfY,4DAAwB;AAiBrC;;GAEG;AACH,MAAa,4BAA6B,SAAQ,iCAAe;IAAjE;;QACY,cAAS,GAAmB,GAAG,EAAE,CAAC;YAC1C,kCAAkB,CAAC,+CAA+C,EAAE,IAAI,CAAC,aAAa,CAAC;SACxF,CAAC;QACQ,mBAAc,GAAmB,GAAG,EAAE,CAAC,EAAE,CAAC;QAEpD,YAAO,GACL,+GAA+G,CAAC;QAExG,aAAQ,GAAG,qDAAqD,CAAC;IAiH7E,CAAC;IA/GC,KAAK,CAAC,WAAW,CACf,IAAoB,EACpB,aAAgC,EAChC,eAAgC;QAEhC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACjF,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACpF,MAAM,eAAe,GAAG,MAAM,4BAA4B,CAAC,qBAAqB,CAC9E,aAAa,EACb,eAAe,CAChB,CAAC;QACF,4BAA4B;QAC5B,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACjF,wBAAwB;QACxB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,MAAM,KAAK,GAAwC,EAAE,CAAC;QACtD,MAAM,iCAAiB,CACrB,YAAY,EACZ,CAAC,QAAgB,EAAE,KAAe,EAAE,EAAE;YACpC,MAAM,YAAY,GAAW,cAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YACnE,IAAI,CAAC,YAAY,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACxC,OAAO;aACR;YACD,MAAM,OAAO,GAAmC;gBAC9C,eAAe,EAAE;oBACf,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,SAAS;iBACrD;aACF,CAAC;YACF,MAAM,MAAM,GAAG,eAAe,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAChE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QACnD,CAAC,EACD,CAAC,QAAgB,EAAE,EAAE;YACnB,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,CAAC,CACF,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE;YACjB,MAAM,IAAI,qCAA4B,CACpC,aAAa,CAAC,UAAU,EACxB,YAAY,EACZ,aAAa,EACb,IAAI,CAAC,QAAQ,CACd,CAAC;SACH;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QAC3F,OAAO;IACT,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,qBAAqB,CACxC,aAAgC,EAChC,eAAgC;QAEhC,MAAM,iBAAiB,GAAG,MAAM,gDAAuB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QACxF,OAAO,MAAM,yCAAkB,CAC7B,KAAK,IAAI,EAAE;YACT,MAAM,SAAS,GAAG,iBAAiB,CAAC,kBAAkB,CACpD,+BAAc,CAAC,4BAA4B,CAC5C,CAAC;YACF,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE;gBAC/B,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC;aAC1B;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,EACD,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,sCAA6B,CAC/B,aAAa,CAAC,UAAU,EACxB,+BAAc,CAAC,4BAA4B,EAC3C,CAAC,CACF,EACH,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,sCAA6B,CAC/B,aAAa,CAAC,UAAU,EACxB,+BAAc,CAAC,4BAA4B,EAC3C,CAAC,CACF,CACJ,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,MAAuB,EACvB,WAAmB,EACnB,WAAwB;;QAExB,MAAM,WAAW,CAAC,KAAK,CACrB,6CAA6C,+BAAc,CAAC,4BAA4B,gCAAgC,WAAW,IAAI,CACxI,CAAC;QAEF,MAAM,UAAU,GAAkC,EAAE,CAAC;;YACrD,KAAyB,IAAA,KAAA,sBAAA,MAAM,CAAC,aAAa,EAAE,CAAA,IAAA;gBAApC,MAAM,IAAI,WAAA,CAAA;gBACnB,IAAI,4BAA4B,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACjD,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC/C;aACF;;;;;;;;;QAED,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE;YACjB,MAAM,IAAI,oCAA2B,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;SACnE;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,IAAc;;QACtC,OAAO,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,aAAa,mCAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;IAED,iBAAiB;;QACf,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,aAAa,MAAA,IAAI,CAAC,gBAAgB,mCAAI,EAAE,2BAA2B,CAAC,CAAC;IAC9F,CAAC;CACF;AA1HD,oEA0HC"}

package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts

@@ -2,7 +2,7 @@ import { ExecutionResult, StepDriver } from "../../interface/stepDriver";
 import { AzureResourceInfo, DriverContext } from "../../interface/commonArgs";
 import { AzureStorageStaticWebsiteConfigArgs } from "../../interface/provisionArgs";
 import { BlobServiceClient } from "@azure/storage-blob";
-import { FxError, IProgressHandler, Result } from "@microsoft/teamsfx-api";
+import { FxError, Result } from "@microsoft/teamsfx-api";
 /**
  * enable static website for azure storage account
  */
@@ -18,14 +18,8 @@ export declare class AzureStorageStaticWebsiteConfigDriver implements StepDriver
      * enable static website for azure storage account
      * @param args Azure Storage resourceId, index page and error page
      * @param context log provider, progress handler, telemetry reporter
-     * @param progressBar progress handler
      */
-    config(args: unknown, context: DriverContext, progressBar?: IProgressHandler): Promise<Map<string, string>>;
+    config(args: unknown, context: DriverContext): Promise<Map<string, string>>;
     isStorageStatusWebsiteEnabled(azureInfo: AzureResourceInfo, azureBlobClient: BlobServiceClient, context: DriverContext): Promise<boolean>;
-    /**
-     * call when error happens
-     * do some resource clean up
-     */
-    static cleanup(progressBar?: IProgressHandler): Promise<void>;
 }
 //# sourceMappingURL=azureStorageStaticWebsiteConfigDriver.d.ts.map

package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,mCAAmC,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAU3E;;GAEG;AACH,qBACa,qCAAsC,YAAW,UAAU;IACtE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAG1B;IACF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,wEACoC;IACvE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,wFAI1C;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SACwE;IAG5G,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAY/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpE;;;;;OAKG;IACG,MAAM,CACV,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAyCzB,6BAA6B,CACjC,SAAS,EAAE,iBAAiB,EAC5B,eAAe,EAAE,iBAAiB,EAClC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,CAAC;IAOnB;;;OAGG;WACU,OAAO,CAAC,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGpE"}
+{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,mCAAmC,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAoB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAgB3E;;GAEG;AACH,qBACa,qCAAsC,YAAW,UAAU;IACtE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAG1B;IACF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,wEACoC;IACvE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,wFAI1C;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SACwE;IAG5G,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpE;;;;OAIG;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiD3E,6BAA6B,CACjC,SAAS,EAAE,iBAAiB,EAC5B,eAAe,EAAE,iBAAiB,EAClC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,CAAC;CAoBpB"}

package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js

@@ -14,6 +14,8 @@ const commonConstant_1 = require("../../../constant/commonConstant");
 const deployConstant_1 = require("../../../constant/deployConstant");
 const messages_1 = require("../../../messages");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
+const azureSdkErrorHandler_1 = require("../../../utils/azureSdkErrorHandler");
+const deploy_1 = require("../../../../error/deploy");
 const ACTION_NAME = "azureStorage/enableStaticWebsite";
 /**
  * enable static website for azure storage account
@@ -26,8 +28,8 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
     }
     async run(args, context) {
         var _a;
-        const progressBar = await ((_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(messages_1.ProgressMessages.configureAzureStorageEnableStaticWebsite, 2));
-        return common_1.wrapRun(() => this.config(args, context, progressBar), AzureStorageStaticWebsiteConfigDriver_1.cleanup.bind(progressBar), context.logProvider);
+        (_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.configureAzureStorageEnableStaticWebsite);
+        return common_1.wrapRun(() => this.config(args, context), undefined, context.logProvider);
     }
     execute(args, ctx) {
         return common_1.wrapSummary(this.run.bind(this, args, ctx), [
@@ -38,13 +40,10 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
      * enable static website for azure storage account
      * @param args Azure Storage resourceId, index page and error page
      * @param context log provider, progress handler, telemetry reporter
-     * @param progressBar progress handler
      */
-    async config(args, context, progressBar) {
+    async config(args, context) {
         var _a, _b;
         const logger = context.logProvider;
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.start());
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(messages_1.ProgressMessages.checkAzureStorageEnableStaticWebsite));
         const input = AzureStorageStaticWebsiteConfigDriver_1.STORAGE_CONFIG_ARGS(args, AzureStorageStaticWebsiteConfigDriver_1.HELP_LINK);
         await logger.debug(`Enabling static website feature for Azure Storage account ${input.storageResourceId}`);
         const azureInfo = azureResourceOperation_1.parseAzureResourceId(input.storageResourceId, AzureStorageStaticWebsiteConfigDriver_1.RESOURCE_PATTERN);
@@ -52,11 +51,8 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
         const azureBlobClient = await azureResourceOperation_1.createBlobServiceClient(azureInfo, azureTokenCredential);
         if (await this.isStorageStatusWebsiteEnabled(azureInfo, azureBlobClient, context)) {
             await logger.debug(`Static website feature is already enabled for Azure Storage account ${input.storageResourceId}.`);
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(messages_1.ProgressMessages.azureStorageStaticWebsiteAlreadyEnabled));
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true));
             return AzureStorageStaticWebsiteConfigDriver_1.RETURN_VALUE;
         }
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(messages_1.ProgressMessages.enableAzureStorageStaticWebsite));
         const properties = {
             staticWebsite: {
                 indexDocument: (_a = input.indexPage) !== null && _a !== void 0 ? _a : deployConstant_1.DeployConstant.DEFAULT_INDEX_DOCUMENT,
@@ -64,21 +60,12 @@ let AzureStorageStaticWebsiteConfigDriver = AzureStorageStaticWebsiteConfigDrive
                 enabled: true,
             },
         };
-        await azureBlobClient.setProperties(properties);
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true));
+        await azureSdkErrorHandler_1.wrapAzureOperation(() => azureBlobClient.setProperties(properties), (e) => new deploy_1.AzureStorageSetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e), (e) => new deploy_1.AzureStorageSetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e));
         return Promise.resolve(AzureStorageStaticWebsiteConfigDriver_1.RETURN_VALUE);
     }
     async isStorageStatusWebsiteEnabled(azureInfo, azureBlobClient, context) {
-        var _a;
         await context.logProvider.debug(`Checking if static website feature is enabled in Azure Storage account '${azureInfo.instanceId}'.`);
-        return ((_a = (await azureBlobClient.getProperties()).staticWebsite) === null || _a === void 0 ? void 0 : _a.enabled) === true;
-    }
-    /**
-     * call when error happens
-     * do some resource clean up
-     */
-    static async cleanup(progressBar) {
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(false));
+        return await azureSdkErrorHandler_1.wrapAzureOperation(async () => { var _a; return ((_a = (await azureBlobClient.getProperties()).staticWebsite) === null || _a === void 0 ? void 0 : _a.enabled) === true; }, (e) => new deploy_1.AzureStorageGetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e), (e) => new deploy_1.AzureStorageGetContainerPropertiesError(azureInfo.instanceId, deployConstant_1.DeployConstant.AZURE_STORAGE_CONTAINER_NAME, e));
     }
 };
 AzureStorageStaticWebsiteConfigDriver.HELP_LINK = "https://aka.ms/teamsfx-actions/azure-storage-enable-static-website";

package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAIlC,mCAAiC;AACjC,kDAA8F;AAE9F,kFAI+C;AAG/C,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,qEAAkE;AAClE,gDAAqD;AACrD,oEAAsE;AAEtE,MAAM,WAAW,GAAG,kCAAkC,CAAC;AAEvD;;GAEG;AAEH,IAAa,qCAAqC,6CAAlD,MAAa,qCAAqC;IAAlD;QACW,gBAAW,GAAW,kCAAkB;QAC/C,iDAAiD;QACjD,4DAA4D,CAC7D,CAAC;IAoGJ,CAAC;IAvFC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;;QAC7C,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,OAAO,CAAC,EAAE,0CAAE,iBAAiB,CACrD,2BAAgB,CAAC,wCAAwC,EACzD,CAAC,CACF,CAAA,CAAC;QACF,OAAO,gBAAO,CACZ,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EAC7C,uCAAqC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC/D,OAAO,CAAC,WAAW,CACpB,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,oBAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE;YACjD,0CAA0C;SAC3C,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CACV,IAAa,EACb,OAAsB,EACtB,WAA8B;;QAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;QACnC,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,EAAE,CAAA,CAAC;QAC3B,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,2BAAgB,CAAC,oCAAoC,CAAC,CAAA,CAAC;QAC/E,MAAM,KAAK,GAAG,uCAAqC,CAAC,mBAAmB,CACrE,IAAI,EACJ,uCAAqC,CAAC,SAAS,CAChD,CAAC;QACF,MAAM,MAAM,CAAC,KAAK,CAChB,6DAA6D,KAAK,CAAC,iBAAiB,EAAE,CACvF,CAAC;QACF,MAAM,SAAS,GAAG,6CAAoB,CACpC,KAAK,CAAC,iBAAiB,EACvB,uCAAqC,CAAC,gBAAgB,CACvD,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,kDAAyB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC3F,MAAM,eAAe,GAAG,MAAM,gDAAuB,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QAEvF,IAAI,MAAM,IAAI,CAAC,6BAA6B,CAAC,SAAS,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE;YACjF,MAAM,MAAM,CAAC,KAAK,CAChB,uEAAuE,KAAK,CAAC,iBAAiB,GAAG,CAClG,CAAC;YACF,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,2BAAgB,CAAC,uCAAuC,CAAC,CAAA,CAAC;YAClF,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;YAC7B,OAAO,uCAAqC,CAAC,YAAY,CAAC;SAC3D;QAED,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,2BAAgB,CAAC,+BAA+B,CAAC,CAAA,CAAC;QAC1E,MAAM,UAAU,GAAG;YACjB,aAAa,EAAE;gBACb,aAAa,EAAE,MAAA,KAAK,CAAC,SAAS,mCAAI,+BAAc,CAAC,sBAAsB;gBACvE,oBAAoB,EAAE,MAAA,KAAK,CAAC,SAAS,mCAAI,+BAAc,CAAC,sBAAsB;gBAC9E,OAAO,EAAE,IAAI;aACd;SACuB,CAAC;QAE3B,MAAM,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;QAC7B,OAAO,OAAO,CAAC,OAAO,CAAC,uCAAqC,CAAC,YAAY,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,6BAA6B,CACjC,SAA4B,EAC5B,eAAkC,EAClC,OAAsB;;QAEtB,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAC7B,2EAA2E,SAAS,CAAC,UAAU,IAAI,CACpG,CAAC;QACF,OAAO,CAAA,MAAA,CAAC,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,aAAa,0CAAE,OAAO,MAAK,IAAI,CAAC;IACjF,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAA8B;QACjD,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;IAChC,CAAC;CACF,CAAA;AAnG2B,+CAAS,GACjC,oEAAoE,CAAC;AAC7C,yDAAmB,GAAG,kBAAS,CAAsC;IAC7F,iBAAiB,EAAE,iBAAQ;IAC3B,SAAS,EAAE,mBAAU,CAAC,iBAAQ,CAAC;IAC/B,SAAS,EAAE,mBAAU,CAAC,iBAAQ,CAAC;CAChC,CAAC,CAAC;AACuB,kDAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;AACzC,sDAAgB,GACxC,+GAA+G,CAAC;AAGlH;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,wBAAwB,CAAC,CAAC,CAAC;;;;gEAWzF;AA3BU,qCAAqC;IADjD,gBAAO,CAAC,WAAW,CAAC;GACR,qCAAqC,CAwGjD;AAxGY,sFAAqC"}
+{"version":3,"file":"azureStorageStaticWebsiteConfigDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.ts"],"names":[],"mappings":"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"}

package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts

@@ -1,18 +1,18 @@
 /// <reference types="node" />
+/**
+ * @author FanH <Siglud@gmail.com>
+ */
 import { AzureDeployImpl } from "./azureDeployImpl";
-import { AzureUploadConfig, DeployStepArgs } from "../../../interface/buildAndDeployArgs";
+import { AzureUploadConfig, DeployContext, DeployStepArgs } from "../../../interface/buildAndDeployArgs";
 import { AzureResourceInfo, DriverContext } from "../../../interface/commonArgs";
 import { TokenCredential } from "@azure/core-auth";
-import { IProgressHandler, LogProvider, UserInteraction } from "@microsoft/teamsfx-api";
+import { LogProvider } from "@microsoft/teamsfx-api";
 export declare class AzureZipDeployImpl extends AzureDeployImpl {
     pattern: RegExp;
     private readonly serviceName;
     protected helpLink: string;
-    protected summaries: string[];
-    protected summaryPrepare: string[];
-    protected zipBuffer: Buffer | undefined;
-    protected progressHandler?: AsyncIterableIterator<void>;
-    protected progressNames: string[];
+    protected summaries: () => string[];
+    protected summaryPrepare: () => string[];
     constructor(args: unknown, context: DriverContext, serviceName: string, helpLink: string, summaries: string[], summaryPrepare: string[]);
     azureDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<void>;
     protected prepare: (args: DeployStepArgs) => Promise<void>;
@@ -25,6 +25,13 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
      * @protected
      */
     zipDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<number>;
+    /**
+     * pack dist folder into zip
+     * @param args dist folder and ignore files
+     * @param context log provider etc..
+     * @protected
+     */
+    protected packageToZip(args: DeployStepArgs, context: DeployContext): Promise<Buffer>;
     /**
      * call azure app service or azure function zip deploy method
      * @param zipDeployEndpoint azure zip deploy endpoint
@@ -33,13 +40,13 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
      * @param logger log provider
      * @protected
      */
-    protected zipDeployPackage(zipDeployEndpoint: string, zipBuffer: Buffer, config: AzureUploadConfig, logger?: LogProvider): Promise<string>;
+    zipDeployPackage(zipDeployEndpoint: string, zipBuffer: Buffer, config: AzureUploadConfig, logger?: LogProvider): Promise<string>;
     /**
      * create azure zip deploy endpoint
      * @param siteName azure app service or azure function name
      * @protected
      */
     protected getZipDeployEndpoint(siteName: string): string;
-    createProgressBar(ui?: UserInteraction): IProgressHandler | undefined;
+    updateProgressbar(): void;
 }
 //# sourceMappingURL=AzureZipDeployImpl.d.ts.map

package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQxF,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC9B,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxD,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;gBAGhC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAWpB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAchB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAGxD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IA0ClB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA8DlB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;CAMtE"}
+{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAWrD,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;gBAGvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAWpB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAahB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAExD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IAqClB;;;;;OAKG;cACa,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAmB3F;;;;;;;OAOG;IACG,gBAAgB,CACpB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA0ElB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB;CAGlB"}