@microsoft/teamsfx-core 2.0.3 → 2.0.4-alpha.0237b70e3.0

package/build/component/telemetry.js

@@ -2,23 +2,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMigratedErrorEvent = exports.sendMigratedSuccessEvent = exports.sendMigratedStartEvent = exports.sendErrorEvent = exports.sendSuccessEvent = exports.sendStartEvent = exports.getCommonProperties = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const telemetry_1 = require("../common/telemetry");
+exports.sendErrorEvent = exports.sendSuccessEvent = exports.sendStartEvent = void 0;
 const globalVars_1 = require("../core/globalVars");
+const common_1 = require("../error/common");
 const constants_1 = require("./constants");
-const constants_2 = require("./resource/botService/constants");
-const constants_3 = require("./constants");
-const constants_4 = require("./constants");
-const telemetryHelper_1 = require("./resource/botService/telemetryHelper");
 function getCommonProperties() {
     const props = {
-        [constants_4.TelemetryConstants.properties.appId]: globalVars_1.globalVars.teamsAppId,
-        [constants_4.TelemetryConstants.properties.tenantId]: globalVars_1.globalVars.m365TenantId,
+        [constants_1.TelemetryConstants.properties.appId]: globalVars_1.globalVars.teamsAppId,
+        [constants_1.TelemetryConstants.properties.tenantId]: globalVars_1.globalVars.m365TenantId,
     };
     return props;
 }
-exports.getCommonProperties = getCommonProperties;
 function sendStartEvent(eventName, properties, measurements) {
     var _a;
     const props = Object.assign(Object.assign({}, getCommonProperties()), properties);
@@ -27,185 +21,17 @@ function sendStartEvent(eventName, properties, measurements) {
 exports.sendStartEvent = sendStartEvent;
 function sendSuccessEvent(eventName, properties, measurements) {
     var _a;
-    const props = Object.assign(Object.assign(Object.assign({}, getCommonProperties()), properties), { [constants_4.TelemetryConstants.properties.success]: constants_4.TelemetryConstants.values.yes });
+    const props = Object.assign(Object.assign(Object.assign({}, getCommonProperties()), properties), { [constants_1.TelemetryConstants.properties.success]: constants_1.TelemetryConstants.values.yes });
     (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, props, measurements !== null && measurements !== void 0 ? measurements : {});
 }
 exports.sendSuccessEvent = sendSuccessEvent;
 function sendErrorEvent(eventName, error, properties, measurements) {
     var _a;
-    const errorCode = error.source + "." + error.name;
-    const errorType = error instanceof teamsfx_api_1.SystemError
-        ? constants_4.TelemetryConstants.values.systemError
-        : constants_4.TelemetryConstants.values.userError;
-    const props = Object.assign(Object.assign(Object.assign({}, getCommonProperties()), properties), { [constants_4.TelemetryConstants.properties.success]: constants_4.TelemetryConstants.values.no, [constants_4.TelemetryConstants.properties.errorCode]: errorCode, [constants_4.TelemetryConstants.properties.errorType]: errorType, [constants_4.TelemetryConstants.properties.errorMessage]: error.message });
+    const props = Object.assign(Object.assign({}, getCommonProperties()), properties);
+    common_1.fillInTelemetryPropsForFxError(props, error);
     (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, props, measurements !== null && measurements !== void 0 ? measurements : {}, [
-        constants_4.TelemetryConstants.properties.errorMessage,
+        constants_1.TelemetryConstants.properties.errorMessage,
     ]);
 }
 exports.sendErrorEvent = sendErrorEvent;
-function sendMigratedStartEvent(eventName, context, inputs, properties, measurements) {
-    var _a, _b, _c;
-    if (!needMigrate(eventName, properties)) {
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.AddFeature) {
-        const componentName = (_a = properties === null || properties === void 0 ? void 0 : properties[telemetry_1.TelemetryProperty.Component]) !== null && _a !== void 0 ? _a : "";
-        const props = Object.assign(Object.assign({}, properties), { [telemetry_1.TelemetryProperty.Component]: migrateComponentName(componentName) });
-        sendStartEvent(telemetry_1.TelemetryEvent.Scaffold, props, measurements);
-        sendStartEvent(telemetry_1.TelemetryEvent.GenerateBicep, props, measurements);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Provision && ((_b = context.envInfo) === null || _b === void 0 ? void 0 : _b.envName) === "local") {
-        migrateProvision((props) => {
-            sendStartEvent(telemetry_1.TelemetryEvent.LocalDebug, props, measurements);
-        }, context, properties);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Provision && ((_c = context.envInfo) === null || _c === void 0 ? void 0 : _c.envName) !== "local") {
-        migrateProvision((props) => {
-            sendStartEvent(telemetry_1.TelemetryEvent.Provision, props, measurements);
-        }, context, properties);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Deploy) {
-        migrateDeploy((props) => {
-            sendStartEvent(telemetry_1.TelemetryEvent.PreDeploy, props, measurements);
-            sendSuccessEvent(telemetry_1.TelemetryEvent.PreDeploy, props, measurements);
-            sendStartEvent(telemetry_1.TelemetryEvent.Deploy, props, measurements);
-        }, context, inputs, properties);
-        return;
-    }
-}
-exports.sendMigratedStartEvent = sendMigratedStartEvent;
-function sendMigratedSuccessEvent(eventName, context, inputs, properties, measurements) {
-    var _a, _b, _c;
-    if (!needMigrate(eventName, properties)) {
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.AddFeature) {
-        const componentName = (_a = properties === null || properties === void 0 ? void 0 : properties[telemetry_1.TelemetryProperty.Component]) !== null && _a !== void 0 ? _a : "";
-        let props = Object.assign(Object.assign({}, properties), { [telemetry_1.TelemetryProperty.Component]: migrateComponentName(componentName) });
-        if (componentName === constants_4.ComponentNames.TeamsBot) {
-            props = fulfillCommonBotProperties(props, context.projectSetting.components.find((component) => component.name === constants_4.ComponentNames.TeamsBot));
-        }
-        sendSuccessEvent(telemetry_1.TelemetryEvent.Scaffold, props, measurements);
-        sendSuccessEvent(telemetry_1.TelemetryEvent.GenerateBicep, props, measurements);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Provision && ((_b = context.envInfo) === null || _b === void 0 ? void 0 : _b.envName) === "local") {
-        migrateProvision((props) => {
-            sendSuccessEvent(telemetry_1.TelemetryEvent.LocalDebug, props, measurements);
-            sendStartEvent(telemetry_1.TelemetryEvent.PostLocalDebug, props, measurements);
-            sendSuccessEvent(telemetry_1.TelemetryEvent.PostLocalDebug, props, measurements);
-        }, context, properties);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Provision && ((_c = context.envInfo) === null || _c === void 0 ? void 0 : _c.envName) !== "local") {
-        migrateProvision((props) => {
-            sendSuccessEvent(telemetry_1.TelemetryEvent.Provision, props, measurements);
-            sendStartEvent(telemetry_1.TelemetryEvent.PostProvision, props, measurements);
-            sendSuccessEvent(telemetry_1.TelemetryEvent.PostProvision, props, measurements);
-        }, context, properties);
-        return;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Deploy) {
-        migrateDeploy((props) => sendSuccessEvent(eventName, props, measurements), context, inputs, properties);
-        return;
-    }
-}
-exports.sendMigratedSuccessEvent = sendMigratedSuccessEvent;
-function sendMigratedErrorEvent(eventName, error, context, inputs, properties, measurements) {
-    if (!needMigrate(eventName, properties)) {
-        return;
-    }
-    let props = Object.assign({}, properties);
-    let componentName;
-    switch (error.source) {
-        case "Storage":
-            componentName = constants_3.PluginNames.FE;
-            break;
-        case "WebApp":
-            componentName = (inputs === null || inputs === void 0 ? void 0 : inputs["Scenario"]) === constants_4.Scenarios.Tab ? constants_3.PluginNames.FE : constants_3.PluginNames.BOT;
-            break;
-        case "Functions":
-            componentName = (inputs === null || inputs === void 0 ? void 0 : inputs["Scenario"]) === constants_4.Scenarios.Api ? constants_3.PluginNames.FUNC : constants_3.PluginNames.BOT;
-            break;
-        case "BotService":
-        case "BT":
-            componentName = constants_3.PluginNames.BOT;
-            telemetryHelper_1.TelemetryHelper.fillAppStudioErrorProperty(error.innerError, props);
-            break;
-    }
-    if (componentName) {
-        props = Object.assign(Object.assign({}, props), { [telemetry_1.TelemetryProperty.Component]: componentName });
-        sendErrorEvent(migrateEventName(eventName, context), error, props, measurements);
-    }
-}
-exports.sendMigratedErrorEvent = sendMigratedErrorEvent;
-function needMigrate(eventName, properties) {
-    var _a;
-    const component = (_a = properties === null || properties === void 0 ? void 0 : properties[telemetry_1.TelemetryProperty.Component]) !== null && _a !== void 0 ? _a : "";
-    return ([constants_4.ComponentNames.TeamsApi, constants_4.ComponentNames.TeamsBot, constants_4.ComponentNames.TeamsTab].includes(component) ||
-        (component === "core" &&
-            eventName !== telemetry_1.TelemetryEvent.AddFeature &&
-            eventName !== telemetry_1.TelemetryEvent.CreateProject));
-}
-function migrateEventName(eventName, context) {
-    var _a;
-    if (eventName === telemetry_1.TelemetryEvent.AddFeature) {
-        return telemetry_1.TelemetryEvent.Scaffold;
-    }
-    if (eventName === telemetry_1.TelemetryEvent.Provision && ((_a = context.envInfo) === null || _a === void 0 ? void 0 : _a.envName) === "local") {
-        return telemetry_1.TelemetryEvent.LocalDebug;
-    }
-    return eventName;
-}
-function getMigrateComponents(context) {
-    return context.projectSetting.components.filter((component) => [constants_4.ComponentNames.TeamsApi, constants_4.ComponentNames.TeamsBot, constants_4.ComponentNames.TeamsTab].includes(component.name));
-}
-function migrateComponentName(componentName) {
-    switch (componentName) {
-        case constants_4.ComponentNames.TeamsApi:
-            return constants_3.PluginNames.FUNC;
-        case constants_4.ComponentNames.TeamsBot:
-            return constants_3.PluginNames.BOT;
-        case constants_4.ComponentNames.TeamsTab:
-            return constants_3.PluginNames.FE;
-        default:
-            return componentName;
-    }
-}
-function migrateDeploy(cb, context, inputs, properties) {
-    let inputPlugins = inputs[constants_1.AzureSolutionQuestionNames.PluginSelectionDeploy];
-    if (!Array.isArray(inputPlugins)) {
-        inputPlugins = context.projectSetting.components
-            .filter((component) => component.deploy && component.hosting != undefined)
-            .map((component) => migrateComponentName(component.name));
-    }
-    if (Array.isArray(inputPlugins)) {
-        inputPlugins.forEach((pluginName) => {
-            let props = Object.assign(Object.assign({}, properties), { [telemetry_1.TelemetryProperty.Component]: migrateComponentName(pluginName) });
-            if (pluginName === constants_3.PluginNames.BOT) {
-                props = fulfillCommonBotProperties(props, context.projectSetting.components.find((component) => component.name === constants_4.ComponentNames.TeamsBot));
-            }
-            cb(props);
-        });
-    }
-}
-function migrateProvision(cb, context, properties) {
-    const components = getMigrateComponents(context);
-    components.forEach((component) => {
-        let props = Object.assign(Object.assign({}, properties), { [telemetry_1.TelemetryProperty.Component]: migrateComponentName(component.name) });
-        props = fulfillCommonBotProperties(props, component);
-        cb(props);
-    });
-}
-function fulfillCommonBotProperties(props, component) {
-    if ((component === null || component === void 0 ? void 0 : component.name) === constants_4.ComponentNames.TeamsBot) {
-        props = Object.assign(Object.assign({}, props), { [constants_2.TelemetryKeys.HostType]: (component === null || component === void 0 ? void 0 : component.hosting) === constants_4.ComponentNames.Function ? "azure-function" : "app-service", [constants_2.TelemetryKeys.BotCapabilities]: (component === null || component === void 0 ? void 0 : component.capabilities)
-                ? JSON.stringify(component.capabilities)
-                : "" });
-    }
-    return props;
-}
 //# sourceMappingURL=telemetry.js.map

package/build/component/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/component/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/component/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAuD;AACvD,4CAAiE;AACjE,2CAAiD;AAGjD,SAAS,mBAAmB;IAC1B,MAAM,KAAK,GAAG;QACZ,CAAC,8BAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,uBAAU,CAAC,UAAU;QAC5D,CAAC,8BAAkB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,uBAAU,CAAC,YAAY;KAClE,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,mCACN,mBAAmB,EAAE,GACrB,UAAU,CACd,CAAC;IACF,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,GAAG,QAAQ,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;AAC/F,CAAC;AAVD,wCAUC;AAED,SAAgB,gBAAgB,CAC9B,SAAiB,EACjB,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,iDACN,mBAAmB,EAAE,GACrB,UAAU,KACb,CAAC,8BAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,8BAAkB,CAAC,MAAM,CAAC,GAAG,GACvE,CAAC;IACF,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;AACpF,CAAC;AAXD,4CAWC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,KAAc,EACd,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,mCACN,mBAAmB,EAAE,GACrB,UAAU,CACd,CAAC;IACF,uCAA8B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,EAAE;QACrF,8BAAkB,CAAC,UAAU,CAAC,YAAY;KAC3C,CAAC,CAAC;AACL,CAAC;AAdD,wCAcC"}

package/build/component/utils/ResourceGroupHelper.d.ts

@@ -1,30 +1,22 @@
 import { ResourceManagementClient } from "@azure/arm-resources";
-import { AzureAccountProvider, FxError, Inputs, QTreeNode, Result, v2 } from "@microsoft/teamsfx-api";
-export declare type AzureSubscription = {
-    displayName: string;
-    subscriptionId: string;
-};
-export declare const DefaultResourceGroupLocation = "East US";
+import { AzureAccountProvider, FxError, Result } from "@microsoft/teamsfx-api";
 export declare type ResourceGroupInfo = {
     createNewResourceGroup: boolean;
     name: string;
     location: string;
 };
-export declare class ResourceGroupHelper {
+declare class ResourceGroupHelper {
     createNewResourceGroup(resourceGroupName: string, azureAccountProvider: AzureAccountProvider, subscriptionId: string, location: string): Promise<Result<string, FxError>>;
     checkResourceGroupExistence(resourceGroupName: string, rmClient: ResourceManagementClient): Promise<Result<boolean, FxError>>;
     getResourceGroupInfo(resourceGroupName: string, rmClient: ResourceManagementClient): Promise<Result<ResourceGroupInfo | undefined, FxError>>;
     listResourceGroups(rmClient: ResourceManagementClient): Promise<Result<[string, string][], FxError>>;
     getLocations(azureAccountProvider: AzureAccountProvider, rmClient: ResourceManagementClient): Promise<Result<string[], FxError>>;
-    getQuestionsForResourceGroup(defaultResourceGroupName: string, existingResourceGroupNameLocations: [string, string][], availableLocations: string[], rmClient: ResourceManagementClient): Promise<QTreeNode | undefined>;
-    /**
-     * Ask user to create a new resource group or use an existing resource group
-     */
-    askResourceGroupInfo(ctx: v2.Context, inputs: Inputs, azureAccountProvider: AzureAccountProvider, rmClient: ResourceManagementClient, defaultResourceGroupName: string): Promise<Result<ResourceGroupInfo, FxError>>;
     /**
      * Ask user to create a new resource group or use an existing resource group  V3
      */
     askResourceGroupInfoV3(azureAccountProvider: AzureAccountProvider, rmClient: ResourceManagementClient, defaultResourceGroupName: string): Promise<Result<ResourceGroupInfo, FxError>>;
+    createRmClient(azureAccountProvider: AzureAccountProvider, subscriptionId: string): Promise<ResourceManagementClient>;
 }
 export declare const resourceGroupHelper: ResourceGroupHelper;
+export {};
 //# sourceMappingURL=ResourceGroupHelper.d.ts.map

package/build/component/utils/ResourceGroupHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,MAAM,EAIN,SAAS,EACT,MAAM,EAGN,EAAE,EACH,MAAM,wBAAwB,CAAC;AAuBhC,oBAAY,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,4BAA4B,YAAY,CAAC;AACtD,oBAAY,iBAAiB,GAAG;IAC9B,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,qBAAa,mBAAmB;IACxB,sBAAsB,CAC1B,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqC7B,2BAA2B,CAC/B,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAe9B,oBAAoB,CACxB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAqBpD,kBAAkB,CACtB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAkBzC,YAAY,CAChB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAoC/B,4BAA4B,CAChC,wBAAwB,EAAE,MAAM,EAChC,kCAAkC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EACtD,kBAAkB,EAAE,MAAM,EAAE,EAC5B,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkCjC;;OAEG;IACG,oBAAoB,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAI9C;;OAEG;IACG,sBAAsB,CAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;CAkD/C;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
+{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,EAKP,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAmBhC,oBAAY,iBAAiB,GAAG;IAC9B,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,cAAM,mBAAmB;IACjB,sBAAsB,CAC1B,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAmC7B,2BAA2B,CAC/B,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAe9B,oBAAoB,CACxB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAqBpD,kBAAkB,CACtB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAiBzC,YAAY,CAChB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAmCrC;;OAEG;IACG,sBAAsB,CAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IA0CxC,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM;CASxF;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}

package/build/component/utils/ResourceGroupHelper.js

@@ -1,27 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resourceGroupHelper = exports.ResourceGroupHelper = exports.DefaultResourceGroupLocation = void 0;
+exports.resourceGroupHelper = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const arm_resources_1 = require("@azure/arm-resources");
 const arm_subscriptions_1 = require("@azure/arm-subscriptions");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const constants_1 = require("../../common/constants");
 const globalVars_1 = require("../../core/globalVars");
-const question_1 = require("../../core/question");
 const azure_1 = require("../../error/azure");
-const constants_2 = require("../constants");
+const other_1 = require("../../question/other");
+const questionNames_1 = require("../../question/questionNames");
+const visitor_1 = require("../../ui/visitor");
+const constants_1 = require("../constants");
 const MsResources = "Microsoft.Resources";
 const ResourceGroups = "resourceGroups";
-exports.DefaultResourceGroupLocation = "East US";
 // TODO: use the emoji plus sign like Azure Functions extension
 const newResourceGroupOption = "+ New resource group";
 class ResourceGroupHelper {
     async createNewResourceGroup(resourceGroupName, azureAccountProvider, subscriptionId, location) {
-        const azureToken = await azureAccountProvider.getIdentityCredentialAsync();
-        if (!azureToken)
-            return teamsfx_api_1.err(new azure_1.InvalidAzureCredentialError());
-        const rmClient = new arm_resources_1.ResourceManagementClient(azureToken, subscriptionId);
+        const rmClient = await this.createRmClient(azureAccountProvider, subscriptionId);
         const maybeExist = await this.checkResourceGroupExistence(resourceGroupName, rmClient);
         if (maybeExist.isErr()) {
             return teamsfx_api_1.err(maybeExist.error);
@@ -70,17 +67,16 @@ class ResourceGroupHelper {
         }
     }
     async listResourceGroups(rmClient) {
+        var _a;
         try {
             const results = [];
             const res = rmClient.resourceGroups.list();
-            let result = await res.next();
-            if (result.value.name)
-                results.push([result.value.name, result.value.location]);
-            while (!result.done) {
-                if (result.value.name)
-                    results.push([result.value.name, result.value.location]);
+            let result;
+            do {
                 result = await res.next();
-            }
+                if ((_a = result.value) === null || _a === void 0 ? void 0 : _a.name)
+                    results.push([result.value.name, result.value.location]);
+            } while (!result.done);
             return teamsfx_api_1.ok(results);
         }
         catch (e) {
@@ -88,7 +84,7 @@ class ResourceGroupHelper {
         }
     }
     async getLocations(azureAccountProvider, rmClient) {
-        var _a;
+        var _a, _b;
         const azureToken = await azureAccountProvider.getIdentityCredentialAsync();
         if (!azureToken)
             return teamsfx_api_1.err(new azure_1.InvalidAzureCredentialError());
@@ -97,16 +93,14 @@ class ResourceGroupHelper {
         try {
             const res = subscriptionClient.subscriptions.listLocations(askSubRes.subscriptionId);
             const locations = [];
-            let result = await res.next();
-            if (result.value.displayName)
-                locations.push(result.value.displayName);
-            while (!result.done) {
-                if (result.value.displayName)
-                    locations.push(result.value.displayName);
+            let result;
+            do {
                 result = await res.next();
-            }
+                if ((_a = result.value) === null || _a === void 0 ? void 0 : _a.displayName)
+                    locations.push(result.value.displayName);
+            } while (!result.done);
             const providerData = await rmClient.providers.get(MsResources);
-            const resourceTypeData = (_a = providerData.resourceTypes) === null || _a === void 0 ? void 0 : _a.find((rt) => { var _a; return ((_a = rt.resourceType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ResourceGroups.toLowerCase(); });
+            const resourceTypeData = (_b = providerData.resourceTypes) === null || _b === void 0 ? void 0 : _b.find((rt) => { var _a; return ((_a = rt.resourceType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ResourceGroups.toLowerCase(); });
             const resourceLocations = resourceTypeData === null || resourceTypeData === void 0 ? void 0 : resourceTypeData.locations;
             const rgLocations = resourceLocations === null || resourceLocations === void 0 ? void 0 : resourceLocations.filter((item) => locations.includes(item));
             if (!rgLocations || rgLocations.length == 0) {
@@ -118,77 +112,34 @@ class ResourceGroupHelper {
             return teamsfx_api_1.err(new azure_1.ListResourceGroupLocationsError(rmClient.subscriptionId, e.message || JSON.stringify(e)));
         }
     }
-    async getQuestionsForResourceGroup(defaultResourceGroupName, existingResourceGroupNameLocations, availableLocations, rmClient) {
-        const selectResourceGroup = question_1.QuestionSelectResourceGroup();
-        const staticOptions = [
-            { id: newResourceGroupOption, label: newResourceGroupOption },
-        ];
-        selectResourceGroup.staticOptions = staticOptions.concat(existingResourceGroupNameLocations.map((item) => {
-            return {
-                id: item[0],
-                label: item[0],
-                description: item[1],
-            };
-        }));
-        const node = new teamsfx_api_1.QTreeNode(selectResourceGroup);
-        const existingResourceGroupNames = existingResourceGroupNameLocations.map((item) => item[0]);
-        const inputNewResourceGroupName = question_1.newResourceGroupNameQuestion(existingResourceGroupNames);
-        inputNewResourceGroupName.default = defaultResourceGroupName;
-        const newResourceGroupNameNode = new teamsfx_api_1.QTreeNode(inputNewResourceGroupName);
-        newResourceGroupNameNode.condition = { equals: newResourceGroupOption };
-        node.addChild(newResourceGroupNameNode);
-        const selectLocation = question_1.QuestionNewResourceGroupLocation();
-        // TODO: maybe lazily load locations
-        selectLocation.staticOptions = availableLocations;
-        selectLocation.default = "East US";
-        const newResourceGroupLocationNode = new teamsfx_api_1.QTreeNode(selectLocation);
-        newResourceGroupNameNode.addChild(newResourceGroupLocationNode);
-        return node.trim();
-    }
-    /**
-     * Ask user to create a new resource group or use an existing resource group
-     */
-    async askResourceGroupInfo(ctx, inputs, azureAccountProvider, rmClient, defaultResourceGroupName) {
-        return this.askResourceGroupInfoV3(azureAccountProvider, rmClient, defaultResourceGroupName);
-    }
     /**
      * Ask user to create a new resource group or use an existing resource group  V3
      */
     async askResourceGroupInfoV3(azureAccountProvider, rmClient, defaultResourceGroupName) {
-        var _a;
-        const listRgRes = await this.listResourceGroups(rmClient);
-        if (listRgRes.isErr())
-            return teamsfx_api_1.err(listRgRes.error);
-        const getLocationsRes = await this.getLocations(azureAccountProvider, rmClient);
-        if (getLocationsRes.isErr()) {
-            return teamsfx_api_1.err(getLocationsRes.error);
-        }
-        const node = await this.getQuestionsForResourceGroup(defaultResourceGroupName, listRgRes.value, getLocationsRes.value, rmClient);
+        const node = other_1.resourceGroupQuestionNode(azureAccountProvider, rmClient.subscriptionId, defaultResourceGroupName);
         const inputs = {
             platform: teamsfx_api_1.Platform.VSCode,
         };
         if (node) {
-            const res = await teamsfx_api_1.traverse(node, inputs, globalVars_1.TOOLS.ui);
+            const res = await visitor_1.traverse(node, inputs, globalVars_1.TOOLS.ui);
             if (res.isErr()) {
-                (_a = globalVars_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`[${constants_1.PluginDisplayName.Solution}] failed to run question model for target resource group.`);
                 return teamsfx_api_1.err(res.error);
             }
         }
-        const targetResourceGroupName = inputs.targetResourceGroupName;
+        const targetResourceGroupNameOptionItem = inputs[questionNames_1.QuestionNames.TargetResourceGroupName];
+        const targetResourceGroupName = targetResourceGroupNameOptionItem.id;
         if (!targetResourceGroupName || typeof targetResourceGroupName !== "string") {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, "InvalidInputError", "Invalid targetResourceGroupName"));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, "InvalidInputError", "Invalid targetResourceGroupName"));
         }
-        const resourceGroupName = inputs.targetResourceGroupName;
-        if (resourceGroupName === newResourceGroupOption) {
+        if (targetResourceGroupName === newResourceGroupOption) {
             return teamsfx_api_1.ok({
-                name: inputs[question_1.CoreQuestionNames.NewResourceGroupName],
-                location: inputs[question_1.CoreQuestionNames.NewResourceGroupLocation],
+                name: inputs[questionNames_1.QuestionNames.NewResourceGroupName],
+                location: inputs[questionNames_1.QuestionNames.NewResourceGroupLocation],
                 createNewResourceGroup: true,
             });
         }
         else {
-            const target = listRgRes.value.find((item) => item[0] == targetResourceGroupName);
-            const location = target[1]; // location must exist because the user can only select from this list.
+            const location = targetResourceGroupNameOptionItem.description; // location must exist because the user can only select from this list.
             return teamsfx_api_1.ok({
                 createNewResourceGroup: false,
                 name: targetResourceGroupName,
@@ -196,7 +147,15 @@ class ResourceGroupHelper {
             });
         }
     }
+    async createRmClient(azureAccountProvider, subscriptionId) {
+        const azureToken = await azureAccountProvider.getIdentityCredentialAsync();
+        if (azureToken === undefined) {
+            throw new azure_1.InvalidAzureCredentialError();
+        }
+        await azureAccountProvider.setSubscription(subscriptionId);
+        const rmClient = new arm_resources_1.ResourceManagementClient(azureToken, subscriptionId);
+        return rmClient;
+    }
 }
-exports.ResourceGroupHelper = ResourceGroupHelper;
 exports.resourceGroupHelper = new ResourceGroupHelper();
 //# sourceMappingURL=ResourceGroupHelper.js.map

package/build/component/utils/ResourceGroupHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAAgE;AAChE,gEAA8D;AAC9D,wDAagC;AAChC,sDAA2D;AAC3D,sDAA8C;AAC9C,kDAK6B;AAC7B,6CAQ2B;AAC3B,4CAA8C;AAE9C,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAO3B,QAAA,4BAA4B,GAAG,SAAS,CAAC;AAOtD,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAEtD,MAAa,mBAAmB;IAC9B,KAAK,CAAC,sBAAsB,CAC1B,iBAAyB,EACzB,oBAA0C,EAC1C,cAAsB,EACtB,QAAgB;QAEhB,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,CAAC,UAAU;YAAE,OAAO,iBAAG,CAAC,IAAI,mCAA2B,EAAE,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,IAAI,wCAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACvF,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC9B;QACD,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,OAAO,iBAAG,CAAC,IAAI,kCAA0B,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,CAAC;SAC/E;QACD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,EAAE;gBAC/E,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;aAClC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC/B,OAAO,iBAAG,CACR,IAAI,gCAAwB,CAC1B,iBAAiB,EACjB,cAAc,EACd,qBAAqB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAChD,CACF,CAAC;aACH;YACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC1B;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,gCAAwB,CAC1B,iBAAiB,EACjB,cAAc,EACd,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC/B,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,iBAAyB,EACzB,QAAkC;QAElC,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YACjF,OAAO,gBAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC5B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CACR,IAAI,wCAAgC,CAClC,iBAAiB,EACjB,QAAQ,CAAC,cAAc,EACvB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAClB,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,iBAAyB,EACzB,QAAkC;QAElC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACpE,IAAI,MAAM,CAAC,IAAI,EAAE;gBACf,OAAO,gBAAE,CAAC;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B,CAAC,CAAC;aACJ;;gBAAM,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SAC7B;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,6BAAqB,CACvB,iBAAiB,EACjB,QAAQ,CAAC,cAAc,EACvB,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC/B,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAkC;QAElC,IAAI;YACF,MAAM,OAAO,GAAuB,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAC3C,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI;gBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;gBACnB,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAChF,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aAC3B;YACD,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;SACpB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,+BAAuB,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACrF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,oBAA0C,EAC1C,QAAkC;;QAElC,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,CAAC,UAAU;YAAE,OAAO,iBAAG,CAAC,IAAI,mCAA2B,EAAE,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,IAAI,sCAAkB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI;YACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,CAAC,aAAa,CAAC,SAAU,CAAC,cAAc,CAAC,CAAC;YACtF,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW;gBAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACvE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;gBACnB,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW;oBAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACvE,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aAC3B;YACD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,gBAAgB,GAAG,MAAA,YAAY,CAAC,aAAa,0CAAE,IAAI,CACvD,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,EAAE,CAAC,YAAY,0CAAE,WAAW,EAAE,MAAK,cAAc,CAAC,WAAW,EAAE,CAAA,EAAA,CACxE,CAAC;YACF,MAAM,iBAAiB,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,SAAS,CAAC;YACtD,MAAM,WAAW,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3C,OAAO,iBAAG,CACR,IAAI,uCAA+B,CACjC,QAAQ,CAAC,cAAc,EACvB,+BAA+B,CAChC,CACF,CAAC;aACH;YACD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;SACxB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,uCAA+B,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC7F,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,wBAAgC,EAChC,kCAAsD,EACtD,kBAA4B,EAC5B,QAAkC;QAElC,MAAM,mBAAmB,GAAG,sCAA2B,EAAE,CAAC;QAC1D,MAAM,aAAa,GAAiB;YAClC,EAAE,EAAE,EAAE,sBAAsB,EAAE,KAAK,EAAE,sBAAsB,EAAE;SAC9D,CAAC;QACF,mBAAmB,CAAC,aAAa,GAAG,aAAa,CAAC,MAAM,CACtD,kCAAkC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9C,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBACd,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;aACrB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,mBAAmB,CAAC,CAAC;QAEhD,MAAM,0BAA0B,GAAG,kCAAkC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7F,MAAM,yBAAyB,GAAG,uCAA4B,CAAC,0BAA0B,CAAC,CAAC;QAC3F,yBAAyB,CAAC,OAAO,GAAG,wBAAwB,CAAC;QAC7D,MAAM,wBAAwB,GAAG,IAAI,uBAAS,CAAC,yBAAyB,CAAC,CAAC;QAC1E,wBAAwB,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;QACxE,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAExC,MAAM,cAAc,GAAG,2CAAgC,EAAE,CAAC;QAC1D,oCAAoC;QACpC,cAAc,CAAC,aAAa,GAAG,kBAAkB,CAAC;QAClD,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC;QACnC,MAAM,4BAA4B,GAAG,IAAI,uBAAS,CAAC,cAAc,CAAC,CAAC;QACnE,wBAAwB,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAEhE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB,CACxB,GAAe,EACf,MAAc,EACd,oBAA0C,EAC1C,QAAkC,EAClC,wBAAgC;QAEhC,OAAO,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,CAAC,CAAC;IAC/F,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAC1B,oBAA0C,EAC1C,QAAkC,EAClC,wBAAgC;;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC1D,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QAChF,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAClD,wBAAwB,EACxB,SAAS,CAAC,KAAK,EACf,eAAe,CAAC,KAAK,EACrB,QAAQ,CACT,CAAC;QACF,MAAM,MAAM,GAAW;YACrB,QAAQ,EAAE,sBAAQ,CAAC,MAAM;SAC1B,CAAC;QACF,IAAI,IAAI,EAAE;YACR,MAAM,GAAG,GAAG,MAAM,sBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,CAAC,CAAC;YACnD,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;gBACf,MAAA,kBAAK,CAAC,WAAW,0CAAE,KAAK,CACtB,IAAI,6BAAiB,CAAC,QAAQ,2DAA2D,CAC1F,CAAC;gBACF,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACvB;SACF;QACD,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;QAC/D,IAAI,CAAC,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE;YAC3E,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC,0BAAc,EAAE,mBAAmB,EAAE,iCAAiC,CAAC,CACtF,CAAC;SACH;QACD,MAAM,iBAAiB,GAAG,MAAM,CAAC,uBAAuB,CAAC;QACzD,IAAI,iBAAiB,KAAK,sBAAsB,EAAE;YAChD,OAAO,gBAAE,CAAC;gBACR,IAAI,EAAE,MAAM,CAAC,4BAAiB,CAAC,oBAAoB,CAAC;gBACpD,QAAQ,EAAE,MAAM,CAAC,4BAAiB,CAAC,wBAAwB,CAAC;gBAC5D,sBAAsB,EAAE,IAAI;aAC7B,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,uEAAuE;YACpG,OAAO,gBAAE,CAAC;gBACR,sBAAsB,EAAE,KAAK;gBAC7B,IAAI,EAAE,uBAAuB;gBAC7B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;SACJ;IACH,CAAC;CACF;AA7PD,kDA6PC;AAEY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAAgE;AAChE,gEAA8D;AAC9D,wDAUgC;AAChC,sDAA8C;AAC9C,6CAQ2B;AAC3B,gDAAiE;AACjE,gEAA6D;AAC7D,8CAA4C;AAC5C,4CAA8C;AAE9C,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAQxC,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAEtD,MAAM,mBAAmB;IACvB,KAAK,CAAC,sBAAsB,CAC1B,iBAAyB,EACzB,oBAA0C,EAC1C,cAAsB,EACtB,QAAgB;QAEhB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAC;QACjF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACvF,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC9B;QACD,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,OAAO,iBAAG,CAAC,IAAI,kCAA0B,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC,CAAC;SAC/E;QACD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,EAAE;gBAC/E,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;aAClC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC/B,OAAO,iBAAG,CACR,IAAI,gCAAwB,CAC1B,iBAAiB,EACjB,cAAc,EACd,qBAAqB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAChD,CACF,CAAC;aACH;YACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC1B;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,gCAAwB,CAC1B,iBAAiB,EACjB,cAAc,EACd,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC/B,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,iBAAyB,EACzB,QAAkC;QAElC,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YACjF,OAAO,gBAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC5B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CACR,IAAI,wCAAgC,CAClC,iBAAiB,EACjB,QAAQ,CAAC,cAAc,EACvB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAClB,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,iBAAyB,EACzB,QAAkC;QAElC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACpE,IAAI,MAAM,CAAC,IAAI,EAAE;gBACf,OAAO,gBAAE,CAAC;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B,CAAC,CAAC;aACJ;;gBAAM,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SAC7B;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,6BAAqB,CACvB,iBAAiB,EACjB,QAAQ,CAAC,cAAc,EACvB,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC/B,CACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAkC;;QAElC,IAAI;YACF,MAAM,OAAO,GAAuB,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAC3C,IAAI,MAAM,CAAC;YACX,GAAG;gBACD,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC1B,IAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,IAAI;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;aAClF,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE;YACvB,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;SACpB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,+BAAuB,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACrF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,oBAA0C,EAC1C,QAAkC;;QAElC,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,CAAC,UAAU;YAAE,OAAO,iBAAG,CAAC,IAAI,mCAA2B,EAAE,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,IAAI,sCAAkB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI;YACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,CAAC,aAAa,CAAC,SAAU,CAAC,cAAc,CAAC,CAAC;YACtF,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,IAAI,MAAM,CAAC;YACX,GAAG;gBACD,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC1B,IAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,WAAW;oBAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;aACzE,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE;YACvB,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,gBAAgB,GAAG,MAAA,YAAY,CAAC,aAAa,0CAAE,IAAI,CACvD,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,EAAE,CAAC,YAAY,0CAAE,WAAW,EAAE,MAAK,cAAc,CAAC,WAAW,EAAE,CAAA,EAAA,CACxE,CAAC;YACF,MAAM,iBAAiB,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,SAAS,CAAC;YACtD,MAAM,WAAW,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3C,OAAO,iBAAG,CACR,IAAI,uCAA+B,CACjC,QAAQ,CAAC,cAAc,EACvB,+BAA+B,CAChC,CACF,CAAC;aACH;YACD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;SACxB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,IAAI,uCAA+B,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC7F,CAAC;SACH;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAC1B,oBAA0C,EAC1C,QAAkC,EAClC,wBAAgC;QAEhC,MAAM,IAAI,GAAG,iCAAyB,CACpC,oBAAoB,EACpB,QAAQ,CAAC,cAAc,EACvB,wBAAwB,CACzB,CAAC;QACF,MAAM,MAAM,GAAW;YACrB,QAAQ,EAAE,sBAAQ,CAAC,MAAM;SAC1B,CAAC;QACF,IAAI,IAAI,EAAE;YACR,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,CAAC,CAAC;YACnD,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;gBACf,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACvB;SACF;QAED,MAAM,iCAAiC,GAAG,MAAM,CAC9C,6BAAa,CAAC,uBAAuB,CACb,CAAC;QAE3B,MAAM,uBAAuB,GAAG,iCAAiC,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE;YAC3E,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC,0BAAc,EAAE,mBAAmB,EAAE,iCAAiC,CAAC,CACtF,CAAC;SACH;QACD,IAAI,uBAAuB,KAAK,sBAAsB,EAAE;YACtD,OAAO,gBAAE,CAAC;gBACR,IAAI,EAAE,MAAM,CAAC,6BAAa,CAAC,oBAAoB,CAAC;gBAChD,QAAQ,EAAE,MAAM,CAAC,6BAAa,CAAC,wBAAwB,CAAC;gBACxD,sBAAsB,EAAE,IAAI;aAC7B,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,QAAQ,GAAG,iCAAiC,CAAC,WAAY,CAAC,CAAC,uEAAuE;YACxI,OAAO,gBAAE,CAAC;gBACR,sBAAsB,EAAE,KAAK;gBAC7B,IAAI,EAAE,uBAAuB;gBAC7B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;SACJ;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,oBAA0C,EAAE,cAAsB;QACrF,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,mCAA2B,EAAE,CAAC;SACzC;QACD,MAAM,oBAAoB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,IAAI,wCAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAC1E,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAEY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC"}

package/build/component/utils/azureResourceOperation.d.ts

@@ -21,6 +21,4 @@ export declare function getAzureAccountCredential(tokenProvider: AzureAccountPro
  */
 export declare function createBlobServiceClient(azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<BlobServiceClient>;
 export declare function generateSasToken(client: StorageAccounts, resourceGroupName: string, storageName: string): Promise<string>;
-export declare function getBlobUri(storageName: string): string;
-export declare function getBlobServiceClient(blobUri: string, sasToken: string): Promise<BlobServiceClient>;
 //# sourceMappingURL=azureResourceOperation.d.ts.map

package/build/component/utils/azureResourceOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureResourceOperation.d.ts","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAiD,MAAM,oBAAoB,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAa3F;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,eAAe,CAAC,CAgB1B;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAG5B"}
+{"version":3,"file":"azureResourceOperation.d.ts","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAiD,MAAM,oBAAoB,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAa3F;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,eAAe,CAAC,CAgB1B;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAyBjB"}

package/build/component/utils/azureResourceOperation.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlobServiceClient = exports.getBlobUri = exports.generateSasToken = exports.createBlobServiceClient = exports.getAzureAccountCredential = exports.parseAzureResourceId = void 0;
+exports.generateSasToken = exports.createBlobServiceClient = exports.getAzureAccountCredential = exports.parseAzureResourceId = void 0;
 const componentError_1 = require("../error/componentError");
 const storage_blob_1 = require("@azure/storage-blob");
 const arm_storage_1 = require("@azure/arm-storage");
@@ -70,10 +70,8 @@ exports.generateSasToken = generateSasToken;
 function getBlobUri(storageName) {
     return `https://${storageName}.blob.core.windows.net`;
 }
-exports.getBlobUri = getBlobUri;
 async function getBlobServiceClient(blobUri, sasToken) {
     const connectionString = `BlobEndpoint=${blobUri};SharedAccessSignature=${sasToken}`;
     return storage_blob_1.BlobServiceClient.fromConnectionString(connectionString);
 }
-exports.getBlobServiceClient = getBlobServiceClient;
 //# sourceMappingURL=azureResourceOperation.js.map

package/build/component/utils/azureResourceOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureResourceOperation.js","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,4DAAkF;AAElF,sDAAwD;AACxD,oDAAoG;AACpG,+DAA4D;AAE5D,iEAA4D;AAE5D;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,UAAkB,EAAE,OAAe;IACtE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACjC,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,0BAA0B,EAAE;YAC3F,YAAY;YACZ,UAAU;SACX,CAAC,CAAC;KACJ;IACD,OAAO;QACL,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAChC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QACnC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAbD,oDAaC;AAED;;;GAGG;AACI,KAAK,UAAU,yBAAyB,CAC7C,aAAmC;IAEnC,MAAM,UAAU,GAAG,MAAM,yCAAkB,CACzC,GAAG,EAAE,CAAC,aAAa,CAAC,0BAA0B,EAAE,EAChD,CAAC,CAAC,EAAE,EAAE,CAAC,qCAAoB,CAAC,6BAA6B,CAAC,+BAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAC9F,CAAC,CAAC,EAAE,EAAE,CAAC,qCAAoB,CAAC,uBAAuB,CAAC,+BAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CACzF,CAAC;IACF,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,kCAAiB,CAAC,gBAAgB,CACtC,QAAQ,EACR,iBAAiB,EACjB,6CAA6C,EAC7C,SAAS,EACT,6BAA6B,CAC9B,CAAC;KACH;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAlBD,8DAkBC;AAED;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CAC3C,aAAgC,EAChC,eAAgC;IAEhC,MAAM,oBAAoB,GAAG,IAAI,qCAAuB,CACtD,eAAe,EACf,aAAa,CAAC,cAAc,CAC7B,CAAC,eAAe,CAAC;IAClB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,oBAAoB,EACpB,aAAa,CAAC,iBAAiB,EAC/B,aAAa,CAAC,UAAU,CACzB,CAAC;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACrD,OAAO,MAAM,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACvD,CAAC;AAfD,0DAeC;AAEM,KAAK,UAAU,gBAAgB,CACpC,MAAuB,EACvB,iBAAyB,EACzB,WAAmB;IAEnB,MAAM,oBAAoB,GAAyB;QACjD,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,KAAK;QACpB,WAAW,EAAE,MAAM;QACnB,qBAAqB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,+BAAc,CAAC,2BAA2B,CAAC;QACxF,sBAAsB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,+BAAc,CAAC,mBAAmB,CAAC;KAClF,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,yCAAkB,CACpC,KAAK,IAAI,EAAE,CACT,CACE,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAClF,CAAC,eAAe,EACnB,CAAC,CAAC,EAAE,EAAE,CACJ,qCAAoB,CAAC,sBAAsB,CACzC,+BAAc,CAAC,iBAAiB,EAChC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAClB,EACH,CAAC,CAAC,EAAE,EAAE,CACJ,qCAAoB,CAAC,gBAAgB,CAAC,+BAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC7F,CAAC;IACF,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,qCAAoB,CAAC,gBAAgB,CAAC,+BAAc,CAAC,iBAAiB,CAAC,CAAC;KAC/E;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AA7BD,4CA6BC;AAED,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,WAAW,WAAW,wBAAwB,CAAC;AACxD,CAAC;AAFD,gCAEC;AAEM,KAAK,UAAU,oBAAoB,CACxC,OAAe,EACf,QAAgB;IAEhB,MAAM,gBAAgB,GAAG,gBAAgB,OAAO,0BAA0B,QAAQ,EAAE,CAAC;IACrF,OAAO,gCAAiB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;AAClE,CAAC;AAND,oDAMC"}
+{"version":3,"file":"azureResourceOperation.js","sourceRoot":"","sources":["../../../src/component/utils/azureResourceOperation.ts"],"names":[],"mappings":"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"}

package/build/component/utils/azureSdkErrorHandler.d.ts

@@ -5,7 +5,5 @@ import { RestError } from "@azure/storage-blob";
 import { DeployExternalApiCallError } from "../error/deployError";
 import { BaseComponentInnerError } from "../error/componentError";
 import { FxError } from "@microsoft/teamsfx-api";
-export declare function isAzureRestError(error: any): error is RestError;
-export declare function isAzureRemoteServerError(error: any): error is RestError;
 export declare function wrapAzureOperation<T>(operation: () => Promise<T>, remoteErrorHandler: (e: RestError) => DeployExternalApiCallError | FxError, otherErrorHandler: (e: unknown) => BaseComponentInnerError | FxError): Promise<T>;
 //# sourceMappingURL=azureSdkErrorHandler.d.ts.map

package/build/component/utils/azureSdkErrorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"azureSdkErrorHandler.d.ts","sourceRoot":"","sources":["../../../src/component/utils/azureSdkErrorHandler.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,SAAS,CAE/D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,SAAS,CAKvE;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EACxC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,kBAAkB,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,0BAA0B,GAAG,OAAO,EAC1E,iBAAiB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,uBAAuB,GAAG,OAAO,GACnE,OAAO,CAAC,CAAC,CAAC,CASZ"}
+{"version":3,"file":"azureSdkErrorHandler.d.ts","sourceRoot":"","sources":["../../../src/component/utils/azureSdkErrorHandler.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAajD,wBAAsB,kBAAkB,CAAC,CAAC,EACxC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,kBAAkB,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,0BAA0B,GAAG,OAAO,EAC1E,iBAAiB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,uBAAuB,GAAG,OAAO,GACnE,OAAO,CAAC,CAAC,CAAC,CASZ"}

package/build/component/utils/azureSdkErrorHandler.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapAzureOperation = exports.isAzureRemoteServerError = exports.isAzureRestError = void 0;
+exports.wrapAzureOperation = void 0;
 /**
  * @author Siglud <siglud@gmail.com>
  */
@@ -11,13 +11,11 @@ const commonConstant_1 = require("../constant/commonConstant");
 function isAzureRestError(error) {
     return error instanceof storage_blob_1.RestError || error.hasOwnProperty("statusCode");
 }
-exports.isAzureRestError = isAzureRestError;
 function isAzureRemoteServerError(error) {
     var _a;
     return (isAzureRestError(error) &&
         ((_a = error === null || error === void 0 ? void 0 : error.statusCode) !== null && _a !== void 0 ? _a : commonConstant_1.HttpStatusCode.ACCEPTED) >= commonConstant_1.HttpStatusCode.INTERNAL_SERVER_ERROR);
 }
-exports.isAzureRemoteServerError = isAzureRemoteServerError;
 async function wrapAzureOperation(operation, remoteErrorHandler, otherErrorHandler) {
     try {
         return await operation();

package/build/component/utils/azureSdkErrorHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"azureSdkErrorHandler.js","sourceRoot":"","sources":["../../../src/component/utils/azureSdkErrorHandler.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,sDAAgD;AAEhD,+DAA4D;AAI5D,SAAgB,gBAAgB,CAAC,KAAU;IACzC,OAAO,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AAC1E,CAAC;AAFD,4CAEC;AAED,SAAgB,wBAAwB,CAAC,KAAU;;IACjD,OAAO,CACL,gBAAgB,CAAC,KAAK,CAAC;QACvB,CAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,mCAAI,+BAAc,CAAC,QAAQ,CAAC,IAAI,+BAAc,CAAC,qBAAqB,CACvF,CAAC;AACJ,CAAC;AALD,4DAKC;AAEM,KAAK,UAAU,kBAAkB,CACtC,SAA2B,EAC3B,kBAA0E,EAC1E,iBAAoE;IAEpE,IAAI;QACF,OAAO,MAAM,SAAS,EAAE,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAChC;AACH,CAAC;AAbD,gDAaC"}
+{"version":3,"file":"azureSdkErrorHandler.js","sourceRoot":"","sources":["../../../src/component/utils/azureSdkErrorHandler.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AACH,sDAAgD;AAEhD,+DAA4D;AAI5D,SAAS,gBAAgB,CAAC,KAAU;IAClC,OAAO,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAU;;IAC1C,OAAO,CACL,gBAAgB,CAAC,KAAK,CAAC;QACvB,CAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,mCAAI,+BAAc,CAAC,QAAQ,CAAC,IAAI,+BAAc,CAAC,qBAAqB,CACvF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,SAA2B,EAC3B,kBAA0E,EAC1E,iBAAoE;IAEpE,IAAI;QACF,OAAO,MAAM,SAAS,EAAE,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAChC;AACH,CAAC;AAbD,gDAaC"}

package/build/component/utils/charsetUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charsetUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/charsetUtils.ts"],"names":[],"mappings":"AA+LA,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CA0CzD"}
+{"version":3,"file":"charsetUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/charsetUtils.ts"],"names":[],"mappings":"AAkMA,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CA0CzD"}