@microsoft/teamsfx-core 1.2.0 → 1.2.2-alpha.eb4575da.0

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.d.ts

@@ -0,0 +1,31 @@
+import { ResourceManagementClient } from "@azure/arm-resources";
+import { Middleware } from "@feathersjs/hooks";
+import { AzureAccountProvider, FxError, Inputs, QTreeNode, Result, UserError, v2 } from "@microsoft/teamsfx-api";
+export declare type AzureSubscription = {
+    displayName: string;
+    subscriptionId: string;
+};
+export declare const DefaultResourceGroupLocation = "East US";
+export declare type ResourceGroupInfo = {
+    createNewResourceGroup: boolean;
+    name: string;
+    location: string;
+};
+export declare function ResourceGroupErrorHandlerMW(operation: string): Middleware;
+export declare class ResourceGroupApiError extends UserError {
+    constructor(operation: string, resourceGroupName?: string, error?: any);
+}
+export 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[]): 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>>;
+}
+export declare const resourceGroupHelper: ResourceGroupHelper;
+//# sourceMappingURL=ResourceGroupHelper.d.ts.map

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAsB,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AACjF,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EAGN,SAAS,EACT,EAAE,EACH,MAAM,wBAAwB,CAAC;AAchC,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,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAazE;AAED,qBAAa,qBAAsB,SAAQ,SAAS;gBACtC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;CAuBvE;AAED,qBAAa,mBAAmB;IAExB,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;IAM9B,oBAAoB,CACxB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAYpD,kBAAkB,CACtB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAQzC,YAAY,CAChB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAkC/B,4BAA4B,CAChC,wBAAwB,EAAE,MAAM,EAChC,kCAAkC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EACtD,kBAAkB,EAAE,MAAM,EAAE,GAC3B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAgCjC;;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;CAuD/C;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js

@@ -0,0 +1,222 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resourceGroupHelper = exports.ResourceGroupHelper = exports.ResourceGroupApiError = exports.ResourceGroupErrorHandlerMW = exports.DefaultResourceGroupLocation = void 0;
+const tslib_1 = require("tslib");
+// 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 ms_rest_js_1 = require("@azure/ms-rest-js");
+const hooks_1 = require("@feathersjs/hooks");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const constants_1 = require("../../../../common/constants");
+const questionModel_1 = require("../../../../core/middleware/questionModel");
+const question_1 = require("../../../../core/question");
+const constants_2 = 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";
+function ResourceGroupErrorHandlerMW(operation) {
+    return async (ctx, next) => {
+        const resourceGroupName = ctx.arguments.length > 0 && typeof ctx.arguments[0] === "string"
+            ? ctx.arguments[0]
+            : undefined;
+        try {
+            await next();
+        }
+        catch (e) {
+            const fxError = new ResourceGroupApiError(operation, resourceGroupName, e);
+            ctx.result = teamsfx_api_1.err(fxError);
+        }
+    };
+}
+exports.ResourceGroupErrorHandlerMW = ResourceGroupErrorHandlerMW;
+class ResourceGroupApiError extends teamsfx_api_1.UserError {
+    constructor(operation, resourceGroupName, error) {
+        const baseErrorMessage = `${operation} failed ${resourceGroupName ? "resource group:" + resourceGroupName : ""}`;
+        const errorName = new.target.name;
+        if (!error)
+            super(new.target.name, baseErrorMessage, constants_2.SolutionSource);
+        else if (error instanceof ms_rest_js_1.RestError) {
+            const restError = error;
+            // Avoid sensitive information like request headers in the error message.
+            const rawErrorString = JSON.stringify({
+                code: restError.code,
+                statusCode: restError.statusCode,
+                body: restError.body,
+                name: restError.name,
+                message: restError.message,
+            });
+            super(errorName, `${baseErrorMessage}, error: '${rawErrorString}'`, constants_2.SolutionSource);
+        }
+        else if (error instanceof Error) {
+            super({ name: errorName, error: error });
+        }
+        else {
+            super(errorName, `${baseErrorMessage}, error: '${JSON.stringify(error)}'`, constants_2.SolutionSource);
+        }
+    }
+}
+exports.ResourceGroupApiError = ResourceGroupApiError;
+class ResourceGroupHelper {
+    async createNewResourceGroup(resourceGroupName, azureAccountProvider, subscriptionId, location) {
+        const azureToken = await azureAccountProvider.getAccountCredentialAsync();
+        if (!azureToken)
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.FailedToGetAzureCredential, "Failed to get azure credential", constants_2.SolutionSource));
+        const rmClient = new arm_resources_1.ResourceManagementClient(azureToken, subscriptionId);
+        const maybeExist = await this.checkResourceGroupExistence(resourceGroupName, rmClient);
+        if (maybeExist.isErr()) {
+            return teamsfx_api_1.err(maybeExist.error);
+        }
+        if (maybeExist.value) {
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.FailedToCreateResourceGroup, `Failed to create resource group "${resourceGroupName}": the resource group exists`, constants_2.SolutionSource));
+        }
+        const response = await rmClient.resourceGroups.createOrUpdate(resourceGroupName, {
+            location: location,
+            tags: { "created-by": "teamsfx" },
+        });
+        if (response.name === undefined) {
+            return teamsfx_api_1.err(new ResourceGroupApiError("create", resourceGroupName));
+        }
+        return teamsfx_api_1.ok(response.name);
+    }
+    async checkResourceGroupExistence(resourceGroupName, rmClient) {
+        const checkRes = await rmClient.resourceGroups.checkExistence(resourceGroupName);
+        return teamsfx_api_1.ok(!!checkRes.body);
+    }
+    async getResourceGroupInfo(resourceGroupName, rmClient) {
+        const getRes = await rmClient.resourceGroups.get(resourceGroupName);
+        if (getRes.name) {
+            return teamsfx_api_1.ok({
+                createNewResourceGroup: false,
+                name: getRes.name,
+                location: getRes.location,
+            });
+        }
+        else
+            return teamsfx_api_1.ok(undefined);
+    }
+    async listResourceGroups(rmClient) {
+        const resourceGroupResults = await rmClient.resourceGroups.list();
+        const resourceGroupNameLocations = resourceGroupResults
+            .filter((item) => item.name)
+            .map((item) => [item.name, item.location]);
+        return teamsfx_api_1.ok(resourceGroupNameLocations);
+    }
+    async getLocations(azureAccountProvider, rmClient) {
+        var _a;
+        const azureToken = await azureAccountProvider.getAccountCredentialAsync();
+        if (!azureToken)
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.FailedToGetAzureCredential, "Failed to get azure credential", constants_2.SolutionSource));
+        const subscriptionClient = new arm_subscriptions_1.SubscriptionClient(azureToken);
+        const askSubRes = await azureAccountProvider.getSelectedSubscription(true);
+        const listLocations = await subscriptionClient.subscriptions.listLocations(askSubRes.subscriptionId);
+        const locations = listLocations.map((item) => item.displayName);
+        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 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) {
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`Failed to list resource group locations`), constants_2.SolutionSource, constants_2.SolutionError.FailedToListResourceGroupLocation));
+        }
+        return teamsfx_api_1.ok(rgLocations);
+    }
+    async getQuestionsForResourceGroup(defaultResourceGroupName, existingResourceGroupNameLocations, availableLocations) {
+        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 inputNewResourceGroupName = question_1.QuestionNewResourceGroupName;
+        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;
+        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) {
+        var _a, _b;
+        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);
+        if (node) {
+            const res = await teamsfx_api_1.traverse(node, inputs, ctx.userInteraction);
+            if (res.isErr()) {
+                (_a = ctx.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 desensitized = questionModel_1.desensitize(node, inputs);
+            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[${constants_1.PluginDisplayName.Solution}] success to run question model for resource group, answers:${JSON.stringify(desensitized)}`);
+        }
+        const targetResourceGroupName = inputs.targetResourceGroupName;
+        if (!targetResourceGroupName || typeof targetResourceGroupName !== "string") {
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError("InvalidInputError", "Invalid targetResourceGroupName", constants_2.SolutionSource));
+        }
+        const resourceGroupName = inputs.targetResourceGroupName;
+        if (resourceGroupName === newResourceGroupOption) {
+            return teamsfx_api_1.ok({
+                name: inputs[question_1.CoreQuestionNames.NewResourceGroupName],
+                location: inputs[question_1.CoreQuestionNames.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.
+            return teamsfx_api_1.ok({
+                createNewResourceGroup: false,
+                name: targetResourceGroupName,
+                location: location,
+            });
+        }
+    }
+}
+tslib_1.__decorate([
+    hooks_1.hooks([ResourceGroupErrorHandlerMW("create")]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, Object, String, String]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ResourceGroupHelper.prototype, "createNewResourceGroup", null);
+tslib_1.__decorate([
+    hooks_1.hooks([ResourceGroupErrorHandlerMW("checkExistence")]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, arm_resources_1.ResourceManagementClient]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ResourceGroupHelper.prototype, "checkResourceGroupExistence", null);
+tslib_1.__decorate([
+    hooks_1.hooks([ResourceGroupErrorHandlerMW("get")]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, arm_resources_1.ResourceManagementClient]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ResourceGroupHelper.prototype, "getResourceGroupInfo", null);
+tslib_1.__decorate([
+    hooks_1.hooks([ResourceGroupErrorHandlerMW("list")]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [arm_resources_1.ResourceManagementClient]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ResourceGroupHelper.prototype, "listResourceGroups", null);
+exports.ResourceGroupHelper = ResourceGroupHelper;
+exports.resourceGroupHelper = new ResourceGroupHelper();
+//# sourceMappingURL=ResourceGroupHelper.js.map

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/adaptor.js

@@ -23,7 +23,7 @@ class ScaffoldingContextAdapter extends BaseSolutionContextAdaptor {
         const v2context = params[0];
         const inputs = params[1];
         if (!inputs.projectPath) {
-            throw new Error(`ivalid project path: ${inputs.projectPath}`);
+            throw new Error(`invalid project path: ${inputs.projectPath}`);
         }
         this.root = inputs.projectPath;
         this.targetEnvName = inputs.targetEnvName;

package/build/plugins/solution/fx-solution/v2/adaptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adaptor.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/adaptor.ts"],"names":[],"mappings":";;;AAAA,wDAuBgC;AAEhC,0BAAgE;AAEhE,oDAAsD;AACtD,kDAAoD;AACpD,yDAAqF;AACrF,mCAAyC;AAEzC,MAAM,0BAA0B;IAAhC;QACE,YAAO,GAAG,kBAAU,EAAE,CAAC;QACvB,SAAI,GAAG,EAAE,CAAC;QAYV,mBAAc,GAAmB,IAAI,oBAAW,CAAC,EAAE,CAAC,CAAC;IAEvD,CAAC;CAAA;AAED;;GAEG;AACH,MAAa,yBAA0B,SAAQ,0BAA0B;IACvE,YAAY,MAAwE;QAClF,KAAK,EAAE,CAAC;QACR,MAAM,SAAS,GAAe,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,MAAM,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAChE;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC,iBAAiB,CAAC;QACrD,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QACtC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,kBAAU,EAAE,CAAC,CAAC,MAAM;IACrC,CAAC;CACF;AAvBD,8DAuBC;AAED,MAAa,uBAAwB,SAAQ,0BAA0B;IACrE,YAAY,MAAwE;QAClF,KAAK,EAAE,CAAC;QACR,MAAM,SAAS,GAAe,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,MAAM,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,OAAO,GAAc,MAAM,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC,iBAAiB,CAAC;QACrD,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAC;QAC/D,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;QAC3D,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QAC/C,IAAI,CAAC,yBAAyB,GAAG,SAAS,CAAC,yBAAyB,CAAC;QACrE,MAAM,KAAK,GAAG,uBAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/E;QACD,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAmB;YACnC,KAAK,EAAE,2BAAgB,CAAC,KAAK,CAAC;SAC/B,CAAC;IACJ,CAAC;IAED,eAAe;QACb,OAAO,sBAAc,CACnB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE;YAClD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,gCAAqB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;QAChF,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AA3CD,0DA2CC;AAED,MAAa,0BAA2B,SAAQ,0BAA0B;IACxE,YAAY,MAAqE;QAC/E,KAAK,EAAE,CAAC;QACR,MAAM,SAAS,GAAe,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,MAAM,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC,iBAAiB,CAAC;QACrD,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAC;QAC/D,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;QAC3D,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QAC/C,IAAI,CAAC,yBAAyB,GAAG,SAAS,CAAC,yBAAyB,CAAC;QACrE,MAAM,KAAK,GAAG,uBAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/E;QACD,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAmB;YACnC,KAAK,EAAE,2BAAgB,CAAC,KAAK,CAAC;SAC/B,CAAC;IACJ,CAAC;CACF;AAlCD,gEAkCC;AAED,MAAa,6BAA6B;IAIxC,YAAY,QAA2B;QACrC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC1B,IAAI,QAAQ,CAAC,wBAAwB,EAAE;YACrC,MAAM,EAAE,GAAG,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;SAC5D;QACD,IAAI,QAAQ,CAAC,sBAAsB,EAAE;YACnC,MAAM,EAAE,GAAG,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1D,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;IAED,qBAAqB,CACnB,EAA8D;QAE9D,OAAO,KAAK,EAAE,GAAkB,EAA+C,EAAE;YAC/E,IACE,CAAC,GAAG,CAAC,EAAE;gBACP,CAAC,GAAG,CAAC,WAAW;gBAChB,CAAC,GAAG,CAAC,iBAAiB;gBACtB,CAAC,GAAG,CAAC,cAAc;gBACnB,CAAC,GAAG,CAAC,eAAe;gBACpB,CAAC,GAAG,CAAC,OAAO,EACZ;gBACA,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,wBAAwB,CAAC,EACnC,kBAAc,EACd,iBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;aACH;YACD,MAAM,KAAK,GAAe;gBACxB,eAAe,EAAE,GAAG,CAAC,EAAE;gBACvB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;gBACxC,cAAc,EAAE,GAAG,CAAC,cAAc;gBAClC,cAAc,EAAE,GAAG,CAAC,eAAe;aACpC,CAAC;YACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,OAAmD,CAAC,CAAC;YACxF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB,CACjB,EAA4D;QAE5D,OAAO,KAAK,EAAE,GAAkB,EAA+C,EAAE;YAC/E,IACE,CAAC,GAAG,CAAC,EAAE;gBACP,CAAC,GAAG,CAAC,WAAW;gBAChB,CAAC,GAAG,CAAC,iBAAiB;gBACtB,CAAC,GAAG,CAAC,cAAc;gBACnB,CAAC,GAAG,CAAC,eAAe;gBACpB,CAAC,GAAG,CAAC,OAAO,EACZ;gBACA,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,wBAAwB,CAAC,EACnC,kBAAc,EACd,iBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;aACH;YACD,MAAM,KAAK,GAAe;gBACxB,eAAe,EAAE,GAAG,CAAC,EAAE;gBACvB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;gBACxC,cAAc,EAAE,GAAG,CAAC,cAAc;gBAClC,cAAc,EAAE,GAAG,CAAC,eAAe;aACpC,CAAC;YACF,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,OAAmD,CAAC,CAAC;YACxF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;CACF;AAjFD,sEAiFC"}

package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgC/F"}
+{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6B/F"}

package/build/plugins/solution/fx-solution/v2/createEnv.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEnv = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../../../common/tools");
 const core_1 = require("../../../../core");
 const arm_1 = require("../arm");
 const utils_1 = require("./utils");
 async function createEnv(ctx, inputs) {
-    if (tools_1.isArmSupportEnabled() &&
-        utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
+    if (utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
         const solutionContext = {
             root: inputs.projectPath || "",
             envInfo: core_1.newEnvInfo(inputs.targetEnvName),

package/build/plugins/solution/fx-solution/v2/createEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,oDAA+D;AAC/D,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IACE,2BAAmB,EAAE;QACrB,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAC5E;QACA,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAhCD,8BAgCC"}
+{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IAAI,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAAE;QAChF,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7BD,8BA6BC"}

package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts

@@ -1,7 +1,7 @@
-import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json, ProjectSettings } from "@microsoft/teamsfx-api";
 export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
 export declare function canAddCapability(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
-export declare function canAddResource(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
+export declare function canAddResource(projectSetting: ProjectSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
 export declare function addCapability(ctx: v2.Context, inputs: Inputs, localSettings: Json): Promise<Result<{
     solutionSettings?: SolutionSettings;
     solutionConfig?: Record<string, unknown>;

package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAkChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAkCD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAmKnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EAMJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAwBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2MA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AA4BD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+JnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}