@microsoft/teamsfx-core 2.0.4-alpha.e83c26af7.0 → 2.0.4-alpha.ea55e6d34.0

package/build/common/spec-parser/utils.js

@@ -0,0 +1,309 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateServer = exports.checkServerUrl = exports.resolveServerUrl = exports.getUrlProtocol = exports.convertPathToCamelCase = exports.getResponseJson = exports.getRelativePath = exports.updateFirstLetter = exports.isSupportedApi = exports.checkPostBody = exports.checkParameters = exports.isYamlSpecFile = void 0;
+const tslib_1 = require("tslib");
+const axios_1 = tslib_1.__importDefault(require("axios"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const constants_1 = require("./constants");
+const path_1 = tslib_1.__importDefault(require("path"));
+const util = tslib_1.__importStar(require("util"));
+const interfaces_1 = require("./interfaces");
+const util_1 = require("util");
+async function isYamlSpecFile(specPath) {
+    if (specPath.endsWith(".yaml") || specPath.endsWith(".yml")) {
+        return true;
+    }
+    else if (specPath.endsWith(".json")) {
+        return false;
+    }
+    const isRemoteFile = specPath.startsWith("http:") || specPath.startsWith("https:");
+    const fileContent = isRemoteFile
+        ? (await axios_1.default.get(specPath)).data
+        : await fs_extra_1.default.readFile(specPath, "utf-8");
+    try {
+        JSON.parse(fileContent);
+        return false;
+    }
+    catch (error) {
+        return true;
+    }
+}
+exports.isYamlSpecFile = isYamlSpecFile;
+function checkParameters(paramObject) {
+    const paramResult = {
+        requiredNum: 0,
+        optionalNum: 0,
+        isValid: true,
+    };
+    if (!paramObject) {
+        return paramResult;
+    }
+    for (let i = 0; i < paramObject.length; i++) {
+        const param = paramObject[i];
+        if (param.in === "header" || param.in === "cookie") {
+            if (param.required) {
+                paramResult.isValid = false;
+            }
+            continue;
+        }
+        const schema = param.schema;
+        if (schema.type !== "boolean" &&
+            schema.type !== "string" &&
+            schema.type !== "number" &&
+            schema.type !== "integer") {
+            if (param.required) {
+                paramResult.isValid = false;
+            }
+            continue;
+        }
+        if (param.in === "query" || param.in === "path") {
+            if (param.required) {
+                paramResult.requiredNum = paramResult.requiredNum + 1;
+            }
+            else {
+                paramResult.optionalNum = paramResult.optionalNum + 1;
+            }
+        }
+    }
+    return paramResult;
+}
+exports.checkParameters = checkParameters;
+function checkPostBody(schema) {
+    const paramResult = {
+        requiredNum: 0,
+        optionalNum: 0,
+        isValid: true,
+    };
+    if (Object.keys(schema).length === 0) {
+        return paramResult;
+    }
+    if (schema.type === "string" ||
+        schema.type === "integer" ||
+        schema.type === "boolean" ||
+        schema.type === "number") {
+        if (schema.required) {
+            paramResult.requiredNum = paramResult.requiredNum + 1;
+        }
+        else {
+            paramResult.optionalNum = paramResult.optionalNum + 1;
+        }
+    }
+    else if (schema.type === "object") {
+        const { properties } = schema;
+        for (const property in properties) {
+            const result = checkPostBody(properties[property]);
+            paramResult.requiredNum += result.requiredNum;
+            paramResult.optionalNum += result.optionalNum;
+            paramResult.isValid = paramResult.isValid && result.isValid;
+        }
+    }
+    else {
+        if (schema.required) {
+            paramResult.isValid = false;
+        }
+    }
+    return paramResult;
+}
+exports.checkPostBody = checkPostBody;
+/**
+ * Checks if the given API is supported.
+ * @param {string} method - The HTTP method of the API.
+ * @param {string} path - The path of the API.
+ * @param {OpenAPIV3.Document} spec - The OpenAPI specification document.
+ * @returns {boolean} - Returns true if the API is supported, false otherwise.
+ * @description The following APIs are supported:
+ * 1. only support Get/Post operation without auth property
+ * 2. parameter inside query or path only support string, number, boolean and integer
+ * 3. parameter inside post body only support string, number, boolean, integer and object
+ * 4. request body + required parameters <= 1
+ * 5. response body should be “application/json” and not empty, and response code should be 20X
+ * 6. only support request body with “application/json” content type
+ */
+function isSupportedApi(method, path, spec) {
+    var _a;
+    const pathObj = spec.paths[path];
+    method = method.toLocaleLowerCase();
+    if (pathObj) {
+        if ((method === constants_1.ConstantString.PostMethod || method === constants_1.ConstantString.GetMethod) &&
+            pathObj[method] &&
+            !((_a = pathObj[method]) === null || _a === void 0 ? void 0 : _a.security)) {
+            const operationObject = pathObj[method];
+            const paramObject = operationObject.parameters;
+            const requestBody = operationObject.requestBody;
+            const requestJsonBody = requestBody === null || requestBody === void 0 ? void 0 : requestBody.content["application/json"];
+            const responseJson = getResponseJson(operationObject);
+            if (Object.keys(responseJson).length === 0) {
+                return false;
+            }
+            let requestBodyParamResult = {
+                requiredNum: 0,
+                optionalNum: 0,
+                isValid: true,
+            };
+            if (requestJsonBody) {
+                const requestBodySchema = requestJsonBody.schema;
+                requestBodyParamResult = checkPostBody(requestBodySchema);
+            }
+            if (!requestBodyParamResult.isValid) {
+                return false;
+            }
+            const paramResult = checkParameters(paramObject);
+            if (!paramResult.isValid) {
+                return false;
+            }
+            if (requestBodyParamResult.requiredNum + paramResult.requiredNum > 1) {
+                return false;
+            }
+            else if (requestBodyParamResult.requiredNum +
+                requestBodyParamResult.optionalNum +
+                paramResult.requiredNum +
+                paramResult.optionalNum ===
+                0) {
+                return false;
+            }
+            else {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+exports.isSupportedApi = isSupportedApi;
+function updateFirstLetter(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+exports.updateFirstLetter = updateFirstLetter;
+function getRelativePath(from, to) {
+    const relativePath = path_1.default.relative(path_1.default.dirname(from), to);
+    return path_1.default.normalize(relativePath).replace(/\\/g, "/");
+}
+exports.getRelativePath = getRelativePath;
+function getResponseJson(operationObject) {
+    var _a, _b;
+    let json = {};
+    for (const code of constants_1.ConstantString.ResponseCodeFor20X) {
+        const responseObject = (_a = operationObject === null || operationObject === void 0 ? void 0 : operationObject.responses) === null || _a === void 0 ? void 0 : _a[code];
+        if ((_b = responseObject === null || responseObject === void 0 ? void 0 : responseObject.content) === null || _b === void 0 ? void 0 : _b["application/json"]) {
+            json = responseObject.content["application/json"];
+            break;
+        }
+    }
+    return json;
+}
+exports.getResponseJson = getResponseJson;
+function convertPathToCamelCase(path) {
+    const pathSegments = path.split("/");
+    const camelCaseSegments = pathSegments.map((segment) => {
+        if (segment.startsWith("{")) {
+            segment = segment.substring(1, segment.length - 1);
+        }
+        return segment.charAt(0).toUpperCase() + segment.slice(1);
+    });
+    const camelCasePath = camelCaseSegments.join("");
+    return camelCasePath;
+}
+exports.convertPathToCamelCase = convertPathToCamelCase;
+function getUrlProtocol(urlString) {
+    try {
+        const url = new URL(urlString);
+        return url.protocol;
+    }
+    catch (err) {
+        return undefined;
+    }
+}
+exports.getUrlProtocol = getUrlProtocol;
+function resolveServerUrl(url) {
+    const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/g;
+    let matches = placeHolderReg.exec(url);
+    let newUrl = url;
+    while (matches != null) {
+        const envVar = matches[1];
+        const envVal = process.env[envVar];
+        if (!envVal) {
+            throw new Error(util_1.format(constants_1.ConstantString.ResolveServerUrlFailed, envVar));
+        }
+        else {
+            newUrl = newUrl.replace(matches[0], envVal);
+        }
+        matches = placeHolderReg.exec(url);
+    }
+    return newUrl;
+}
+exports.resolveServerUrl = resolveServerUrl;
+function checkServerUrl(servers) {
+    const errors = [];
+    let serverUrl;
+    try {
+        serverUrl = resolveServerUrl(servers[0].url);
+    }
+    catch (err) {
+        errors.push({
+            type: interfaces_1.ErrorType.ResolveServerUrlFailed,
+            content: err.message,
+            data: servers,
+        });
+        return errors;
+    }
+    const protocol = getUrlProtocol(serverUrl);
+    if (!protocol) {
+        // Relative server url is not supported
+        errors.push({
+            type: interfaces_1.ErrorType.RelativeServerUrlNotSupported,
+            content: constants_1.ConstantString.RelativeServerUrlNotSupported,
+            data: servers,
+        });
+    }
+    else if (protocol !== "https:") {
+        // Http server url is not supported
+        errors.push({
+            type: interfaces_1.ErrorType.UrlProtocolNotSupported,
+            content: util.format(constants_1.ConstantString.UrlProtocolNotSupported, protocol),
+            data: servers,
+        });
+    }
+    return errors;
+}
+exports.checkServerUrl = checkServerUrl;
+function validateServer(spec) {
+    const errors = [];
+    let hasTopLevelServers = false;
+    let hasPathLevelServers = false;
+    let hasOperationLevelServers = false;
+    if (spec.servers && spec.servers.length >= 1) {
+        hasTopLevelServers = true;
+        // for multiple server, we only use the first url
+        const serverErrors = checkServerUrl(spec.servers);
+        errors.push(...serverErrors);
+    }
+    const paths = spec.paths;
+    for (const path in paths) {
+        const methods = paths[path];
+        if ((methods === null || methods === void 0 ? void 0 : methods.servers) && methods.servers.length >= 1) {
+            hasPathLevelServers = true;
+            const serverErrors = checkServerUrl(methods.servers);
+            errors.push(...serverErrors);
+        }
+        for (const method in methods) {
+            const operationObject = methods[method];
+            if (isSupportedApi(method, path, spec)) {
+                if ((operationObject === null || operationObject === void 0 ? void 0 : operationObject.servers) && operationObject.servers.length >= 1) {
+                    hasOperationLevelServers = true;
+                    const serverErrors = checkServerUrl(operationObject.servers);
+                    errors.push(...serverErrors);
+                }
+            }
+        }
+    }
+    if (!hasTopLevelServers && !hasPathLevelServers && !hasOperationLevelServers) {
+        errors.push({
+            type: interfaces_1.ErrorType.NoServerInformation,
+            content: constants_1.ConstantString.NoServerInformation,
+        });
+    }
+    return errors;
+}
+exports.validateServer = validateServer;
+//# sourceMappingURL=utils.js.map

package/build/common/spec-parser/utils.js.map

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

package/build/common/telemetry.d.ts

@@ -1,7 +1,4 @@
-import { FxError, TelemetryReporter } from "@microsoft/teamsfx-api";
-export declare class TelemetryReporterInstance {
-    static telemetryReporter: TelemetryReporter | undefined;
-}
+import { FxError } from "@microsoft/teamsfx-api";
 export declare enum TelemetryProperty {
     TriggerFrom = "trigger-from",
     Component = "component",
@@ -35,7 +32,6 @@ export declare enum TelemetryProperty {
     TemplateScenario = "template-scenario",
     TemplateFallback = "template-fallback",
     TemplateName = "template-name",
-    SampleName = "sample-name",
     SampleDownloadDirectory = "sample-download-directory",
     Fallback = "fallback",
     HasSwitchedSubscription = "has-switched-subscription",
@@ -157,4 +153,10 @@ export declare function sendTelemetryEvent(component: string, eventName: string,
 export declare function sendTelemetryErrorEvent(component: string, eventName: string, fxError: FxError, properties?: {
     [p: string]: string;
 }): void;
+/**
+ * fill in telemetry properties for FxError
+ * @param error FxError
+ * @param props teletry properties
+ */
+export declare function fillInTelemetryPropsForFxError(props: Record<string, string>, error: FxError): void;
 //# sourceMappingURL=telemetry.d.ts.map

package/build/common/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}

package/build/common/telemetry.js

@@ -2,11 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty = exports.TelemetryReporterInstance = void 0;
+exports.fillInTelemetryPropsForFxError = exports.sendTelemetryErrorEvent = exports.sendTelemetryEvent = exports.ProjectMigratorGuideStatus = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.TelemetryEvent = exports.TelemetryProperty = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-class TelemetryReporterInstance {
-}
-exports.TelemetryReporterInstance = TelemetryReporterInstance;
+const constants_1 = require("../component/constants");
+const globalVars_1 = require("../core/globalVars");
 var TelemetryProperty;
 (function (TelemetryProperty) {
     TelemetryProperty["TriggerFrom"] = "trigger-from";
@@ -41,7 +40,6 @@ var TelemetryProperty;
     TelemetryProperty["TemplateScenario"] = "template-scenario";
     TelemetryProperty["TemplateFallback"] = "template-fallback";
     TelemetryProperty["TemplateName"] = "template-name";
-    TelemetryProperty["SampleName"] = "sample-name";
     TelemetryProperty["SampleDownloadDirectory"] = "sample-download-directory";
     TelemetryProperty["Fallback"] = "fallback";
     TelemetryProperty["HasSwitchedSubscription"] = "has-switched-subscription";
@@ -169,7 +167,7 @@ function sendTelemetryEvent(component, eventName, properties, measurements) {
         properties = {};
     }
     properties[TelemetryProperty.Component] = component;
-    (_a = TelemetryReporterInstance.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
+    (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(eventName, properties, measurements);
 }
 exports.sendTelemetryEvent = sendTelemetryEvent;
 function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
@@ -178,16 +176,44 @@ function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
         properties = {};
     }
     properties[TelemetryProperty.Component] = component;
-    properties[TelemetryProperty.Success] = TelemetrySuccess.No;
-    if (fxError instanceof teamsfx_api_1.UserError) {
-        properties[TelemetryProperty.ErrorType] = TelemetryErrorType.UserError;
+    fillInTelemetryPropsForFxError(properties, fxError);
+    (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, {});
+}
+exports.sendTelemetryErrorEvent = sendTelemetryErrorEvent;
+/**
+ * fill in telemetry properties for FxError
+ * @param error FxError
+ * @param props teletry properties
+ */
+function fillInTelemetryPropsForFxError(props, error) {
+    const errorCode = error.source + "." + error.name;
+    const errorType = error instanceof teamsfx_api_1.SystemError
+        ? constants_1.TelemetryConstants.values.systemError
+        : constants_1.TelemetryConstants.values.userError;
+    props[constants_1.TelemetryConstants.properties.success] = constants_1.TelemetryConstants.values.no;
+    props[constants_1.TelemetryConstants.properties.errorCode] =
+        props[constants_1.TelemetryConstants.properties.errorCode] || errorCode;
+    props[constants_1.TelemetryConstants.properties.errorType] = errorType;
+    props[constants_1.TelemetryConstants.properties.errorMessage] = error.message;
+    props[constants_1.TelemetryConstants.properties.errorStack] = error.stack !== undefined ? error.stack : ""; // error stack will not append in error-message any more
+    props[constants_1.TelemetryConstants.properties.errorName] = error.name;
+    // append global context properties
+    props[constants_1.TelemetryConstants.properties.errorComponent] = globalVars_1.globalVars.component;
+    props[constants_1.TelemetryConstants.properties.errorStage] = globalVars_1.globalVars.stage;
+    props[constants_1.TelemetryConstants.properties.errorMethod] = globalVars_1.globalVars.method;
+    props[constants_1.TelemetryConstants.properties.errorSource] = globalVars_1.globalVars.source;
+    if (error.innerError && error.innerError["code"]) {
+        props[constants_1.TelemetryConstants.properties.errorInnerCode] = error.innerError["code"];
     }
-    else {
-        properties[TelemetryProperty.ErrorType] = TelemetryErrorType.SystemError;
+    if (error.innerError) {
+        props[constants_1.TelemetryConstants.properties.innerError] = JSON.stringify(error.innerError, Object.getOwnPropertyNames(error.innerError));
+    }
+    if (error.categories) {
+        props[constants_1.TelemetryConstants.properties.errorCat] = error.categories.join("|");
+        props[constants_1.TelemetryConstants.properties.errorCat1] = error.categories[0];
+        props[constants_1.TelemetryConstants.properties.errorCat2] = error.categories[1];
+        props[constants_1.TelemetryConstants.properties.errorCat3] = error.categories[2];
     }
-    properties[TelemetryProperty.ErrorCode] = `${fxError.source}.${fxError.name}`;
-    properties[TelemetryProperty.ErrorMessage] = `${fxError.message}${fxError.stack ? "\nstack:\n" + fxError.stack : ""}`;
-    (_a = TelemetryReporterInstance.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, {});
 }
-exports.sendTelemetryErrorEvent = sendTelemetryErrorEvent;
+exports.fillInTelemetryPropsForFxError = fillInTelemetryPropsForFxError;
 //# sourceMappingURL=telemetry.js.map

package/build/common/telemetry.js.map

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

package/build/common/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EACL,oBAAoB,EACpB,OAAO,EACP,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAGhB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AAkChC,eAAO,MAAM,QAAQ,qBAwBpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAKvD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAMzD;AAED,wBAAsB,eAAe,CACnC,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,eAAe,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAqD5C;AAED,wBAAgB,wBAAwB,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAG5F;AAED,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/E;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAO5D;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAcjG;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAW1D;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAEtF;AAED,eAAO,MAAM,eAAe,UAAyD,CAAC;AACtF,eAAO,MAAM,aAAa,UAAoD,CAAC;AAC/E,eAAO,MAAM,WAAW,UAAoE,CAAC;AAC7F,eAAO,MAAM,mBAAmB,UAAqD,CAAC;AACtF,eAAO,MAAM,UAAU,WAAY,MAAM,aAAwC,CAAC;AAClF,eAAO,MAAM,WAAW,UAA6D,CAAC;AAEtF,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE;AAED,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAMnD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIzE;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;;cAmBzE;AAID,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAkBtF"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EACL,oBAAoB,EACpB,OAAO,EACP,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAGhB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AAkChC,eAAO,MAAM,QAAQ,qBAwBpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAKvD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAMzD;AAED,wBAAsB,eAAe,CACnC,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,eAAe,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAqD5C;AAED,wBAAgB,wBAAwB,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAG5F;AAED,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/E;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAO5D;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAcjG;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAW1D;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAEtF;AAED,eAAO,MAAM,eAAe,UAAyD,CAAC;AACtF,eAAO,MAAM,aAAa,UAAoD,CAAC;AAC/E,eAAO,MAAM,WAAW,UAAoE,CAAC;AAC7F,eAAO,MAAM,mBAAmB,UAAqD,CAAC;AACtF,eAAO,MAAM,UAAU,WAAY,MAAM,aAAwC,CAAC;AAClF,eAAO,MAAM,WAAW,UAA6D,CAAC;AAEtF,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE;AAED,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAWnD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIzE;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;;cAmBzE;AAID,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAkBtF"}

package/build/common/tools.js

@@ -231,6 +231,11 @@ exports.getSPFxToken = getSPFxToken;
 async function setRegion(authSvcToken) {
     const region = await authSvcClient_1.AuthSvcClient.getRegion(authSvcToken);
     if (region) {
+        // Do not set region for INT env
+        const appStudioEndpoint = constants_2.getAppStudioEndpoint();
+        if (appStudioEndpoint.includes("dev-int")) {
+            return;
+        }
         appStudioClient_1.AppStudioClient.setRegion(region);
         appStudioClient_2.AppStudioClient.setRegion(region);
     }
@@ -267,9 +272,9 @@ exports.getFixedCommonProjectSettings = getFixedCommonProjectSettings;
 const TunnelManagementUserAgent = { name: "Teams-Toolkit" };
 async function listDevTunnels(token) {
     try {
-        const tunnelManagementClientImpl = new dev_tunnels_management_1.TunnelManagementHttpClient(TunnelManagementUserAgent, async () => {
+        const tunnelManagementClientImpl = new dev_tunnels_management_1.TunnelManagementHttpClient(TunnelManagementUserAgent, () => {
             const res = `Bearer ${token}`;
-            return res;
+            return Promise.resolve(res);
         });
         const options = {
             includeAccessControl: true,

package/build/common/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";;;;AAGA,8EAA+E;AAC/E,wDAYgC;AAChC,0DAA0B;AAC1B,uDAAiC;AACjC,qDAA+B;AAC/B,+DAAyC;AACzC,mDAA6B;AAC7B,+BAA6B;AAC7B,sDAAuD;AACvD,0FAAuF;AACvF,sFAAmF;AACnF,sEAA8E;AAC9E,oFAAiF;AACjF,gGAAmH;AACnH,yCAA6D;AAC7D,oFAAkF;AAClF,4CAAgD;AAChD,2CAA8F;AAE9F,mDAAuE;AAEvE,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACrD,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/C,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACxD,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IACpD,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACtC,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,0BAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAG,CAAI,MAAS,EAAK,EAAE;IAC1C,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,MAAM,CAAC;KACf;IACD,IAAI,MAAM,YAAY,IAAI,EAAE;QAC1B,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAQ,CAAC;KAC1C;IACD,IAAI,MAAM,YAAY,KAAK,EAAE;QAC3B,MAAM,EAAE,GAAG,EAAW,CAAC;QACtB,MAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,gBAAQ,CAAM,CAAC,CAAC,CAAQ,CAAC;KACpD;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;QAC5D,MAAM,EAAE,GAAG,kBAAM,MAAiC,CAEjD,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,EAAE,CAAC,CAAC,CAAC,GAAG,gBAAQ,CAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,EAAO,CAAC;KAChB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAxBW,QAAA,QAAQ,YAwBnB;AAEF,SAAgB,iBAAiB,CAAC,KAAY;IAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,KAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,OAAO,CACL,SAAS,KAAK,aAAa,IAAI,SAAS,KAAK,iBAAiB,IAAI,SAAS,KAAK,YAAY,CAC7F,CAAC;AACJ,CAAC;AALD,8CAKC;AAED,SAAgB,mBAAmB,CAAC,KAAY;IAC9C,MAAM,SAAS,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,KAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,OAAO,CACL,SAAS,KAAK,yBAAa,CAAC,wBAAwB;QACpD,SAAS,KAAK,yBAAa,CAAC,oBAAoB,CACjD,CAAC;AACJ,CAAC;AAND,kDAMC;AAEM,KAAK,UAAU,eAAe,CACnC,oBAA0C,EAC1C,EAAmB,EACnB,oBAA6B;IAE7B,MAAM,aAAa,GAAuB,MAAM,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;IAEzF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,MAAM,EACN,qBAAqB,EACrB,gCAAgB,CAAC,2BAA2B,CAAC,EAC7C,kCAAkB,CAAC,2BAA2B,CAAC,CAChD,CACF,CAAC;KACH;IACD,IAAI,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,KAAK,oBAAoB,CAAC,CAAC;IACzF,IAAI,oBAAoB,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;QACjE,IAAI,WAAW,GAAiC,SAAS,CAAC;QAC1D,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;SAChC;aAAM;YACL,MAAM,OAAO,GAAiB,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtD,OAAO;oBACL,EAAE,EAAE,GAAG,CAAC,cAAc;oBACtB,KAAK,EAAE,GAAG,CAAC,gBAAgB;oBAC3B,IAAI,EAAE,GAAG,CAAC,QAAQ;iBACL,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC;gBACnC,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,uBAAuB;gBAC9B,OAAO,EAAE,OAAO;gBAChB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,MAAoB,CAAC;YAClD,WAAW,GAAG;gBACZ,cAAc,EAAE,OAAO,CAAC,EAAE;gBAC1B,gBAAgB,EAAE,OAAO,CAAC,KAAK;gBAC/B,QAAQ,EAAE,OAAO,CAAC,IAAc;aACjC,CAAC;SACH;QACD,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,MAAM,EACN,qBAAqB,EACrB,gCAAgB,CAAC,2BAA2B,CAAC,EAC7C,kCAAkB,CAAC,2BAA2B,CAAC,CAChD,CACF,CAAC;SACH;QACD,SAAS,GAAG,WAAW,CAAC;KACzB;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAzDD,0CAyDC;AAED,SAAgB,wBAAwB,CACtC,cAAuB,EACvB,QAAiB,EACjB,iBAA0B;IAE1B,IAAI,cAAc,IAAI,QAAQ,IAAI,iBAAiB,EAAE;QACnD,OAAO,GAAG,cAAc,MAAM,QAAQ,2BAA2B,cAAc,mBAAmB,iBAAiB,EAAE,CAAC;KACvH;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAVD,4DAUC;AAED,SAAgB,+BAA+B,CAAC,cAAsB,EAAE,OAAY;IAClF,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAHD,0EAGC;AAED,SAAgB,kCAAkC,CAAC,UAAkB;IACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;IAChF,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,oCAA4B,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;KACvE;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,gFAMC;AAED,SAAgB,mBAAmB,CAAC,OAAe,EAAE,UAAkB;IACrE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAHD,kDAGC;AAEM,KAAK,UAAU,WAAW,CAAC,MAAc;IAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAFD,kCAEC;AAED,SAAgB,OAAO;IACrB,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;AACnB,CAAC;AAFD,0BAEC;AAED,SAAgB,aAAa,CAAC,eAAqB;IACjD,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAuB,CAAC;IAClE,IAAI,gBAAgB,EAAE;QACpB,MAAM,eAAe,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;QAC/D,OAAO,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;KAC9E;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,sCAOC;AAEM,KAAK,UAAU,oBAAoB,CAAC,WAAmB;;IAC5D,IAAI,cAAc,CAAC;IACnB,IAAI;QACF,cAAc,GAAG,MAAM,6BAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KACnE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,iBAAG,CAAC,sBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9B;IACD,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KAClC;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;IACtC,OAAO,gBAAE,CACP,CAAA,MAAC,QAAQ,CAAC,0BAAkC,0CAAE,4BAA4B,MAAK,SAAS,CACzF,CAAC;AACJ,CAAC;AAdD,oDAcC;AAED,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAFD,oCAEC;AAED,SAAgB,iBAAiB;IAC/B,OAAO;QACL,CAAC,yBAAa,CAAC,aAAa,CAAC,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;QAC7F,CAAC,yBAAa,CAAC,GAAG,CAAC,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;QACzE,CAAC,0BAAc,CAAC,OAAO,CAAC,EAAE,kCAAkB,CAAC,qCAAqC,CAAC;QACnF,CAAC,0BAAc,CAAC,IAAI,CAAC,EAAE,kCAAkB,CAAC,kCAAkC,CAAC;QAC7E,CAAC,0BAAc,CAAC,IAAI,CAAC,EAAE,kCAAkB,CAAC,kCAAkC,CAAC;QAC7E,CAAC,2BAAe,CAAC,OAAO,CAAC,EAAE,kCAAkB,CAAC,sCAAsC,CAAC;QACrF,CAAC,2BAAe,CAAC,IAAI,CAAC,EAAE,kCAAkB,CAAC,mCAAmC,CAAC;QAC/E,CAAC,2BAAe,CAAC,IAAI,CAAC,EAAE,kCAAkB,CAAC,mCAAmC,CAAC;KAChF,CAAC;AACJ,CAAC;AAXD,8CAWC;AAEM,KAAK,UAAU,oBAAoB,CAAC,KAAa;IACtD,OAAO,iCAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAFD,oDAEC;AAEY,QAAA,eAAe,GAAG,CAAC,GAAG,gCAAoB,EAAE,2BAA2B,CAAC,CAAC;AACzE,QAAA,aAAa,GAAG,CAAC,+CAA+C,CAAC,CAAC;AAClE,QAAA,WAAW,GAAG,CAAC,2BAA2B,EAAE,kCAAkC,CAAC,CAAC;AAChF,QAAA,mBAAmB,GAAG,CAAC,gDAAgD,CAAC,CAAC;AAC/E,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,wBAAwB,CAAC,CAAC;AAArE,QAAA,UAAU,cAA2D;AACrE,QAAA,WAAW,GAAG,CAAC,wDAAwD,CAAC,CAAC;AAE/E,KAAK,UAAU,aAAa,CAAC,UAAkB;IACpD,MAAM,kBAAkB,GAAG,4DAA4D,CAAC;IACxF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE;YACnD,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,UAAU,EAAE,EAAE;SACnD,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;KAC7B;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AATD,sCASC;AAEM,KAAK,UAAU,YAAY,CAChC,iBAAoC;IAEpC,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC3D,MAAM,EAAE,2BAAmB;KAC5B,CAAC,CAAC;IACH,IAAI,QAAQ,GAAG,SAAS,CAAC;IACzB,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;YAC1D,MAAM,EAAE,kBAAU,CAAC,MAAM,CAAC;SAC3B,CAAC,CAAC;QACH,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;KACjE;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAfD,oCAeC;AAED;;;GAGG;AACI,KAAK,UAAU,SAAS,CAAC,YAAoB;IAClD,MAAM,MAAM,GAAG,MAAM,6BAAa,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAI,MAAM,EAAE;QACV,iCAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAClC,iCAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;KACtC;AACH,CAAC;AAND,8BAMC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3C,CAAC;AAJD,gDAIC;AAED,SAAgB,6BAA6B,CAAC,QAA4B;;IACxE,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,MAAM,YAAY,GAAG,8CAAsB,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,YAAK,CAAC,eAAe,CAAC,CAAC;QACxC,OAAO;YACL,SAAS,EAAE,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,mCAAI,SAAS;SAC5C,CAAC;KACH;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAnBD,sEAmBC;AAED,2FAA2F;AAC3F,MAAM,yBAAyB,GAAG,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;AACrD,KAAK,UAAU,cAAc,CAAC,KAAa;IAChD,IAAI;QACF,MAAM,0BAA0B,GAAG,IAAI,mDAA0B,CAC/D,yBAAyB,EACzB,KAAK,IAAI,EAAE;YACT,MAAM,GAAG,GAAG,UAAU,KAAK,EAAE,CAAC;YAC9B,OAAO,GAAG,CAAC;QACb,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5F,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,iBAAG,CAAC,IAAI,yBAAW,CAAC,YAAY,EAAE,sBAAsB,EAAG,KAAa,CAAC,OAAO,CAAC,CAAC,CAAC;KAC3F;AACH,CAAC;AAlBD,wCAkBC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}

package/build/common/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function convertToAlphanumericOnly(appName: string): string;
 export declare function loadingOptionsPlaceholder(): string;
+export declare function loadingDefaultPlaceholder(): string;
 //# sourceMappingURL=utils.d.ts.map

package/build/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}

package/build/common/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadingOptionsPlaceholder = exports.convertToAlphanumericOnly = void 0;
+exports.loadingDefaultPlaceholder = exports.loadingOptionsPlaceholder = exports.convertToAlphanumericOnly = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const localizeUtils_1 = require("./localizeUtils");
@@ -12,4 +12,8 @@ function loadingOptionsPlaceholder() {
     return localizeUtils_1.getLocalizedString("ui.select.LoadingOptionsPlaceholder");
 }
 exports.loadingOptionsPlaceholder = loadingOptionsPlaceholder;
+function loadingDefaultPlaceholder() {
+    return localizeUtils_1.getLocalizedString("ui.select.LoadingDefaultPlaceholder");
+}
+exports.loadingDefaultPlaceholder = loadingDefaultPlaceholder;
 //# sourceMappingURL=utils.js.map

package/build/common/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAqD;AAErD,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAqD;AAErD,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC"}

package/build/component/configManager/interface.d.ts

@@ -4,6 +4,9 @@
 import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
 import { DriverContext } from "../driver/interface/commonArgs";
 import { StepDriver } from "../driver/interface/stepDriver";
+export declare type AdditionalMetadata = {
+    [key: string]: unknown;
+};
 export declare type RawProjectModel = {
     registerApp?: DriverDefinition[];
     provision?: DriverDefinition[];
@@ -12,6 +15,7 @@ export declare type RawProjectModel = {
     publish?: DriverDefinition[];
     environmentFolderPath?: string;
     version: string;
+    additionalMetadata?: AdditionalMetadata;
 };
 export declare type ProjectModel = {
     registerApp?: ILifecycle;
@@ -21,6 +25,7 @@ export declare type ProjectModel = {
     publish?: ILifecycle;
     environmentFolderPath?: string;
     version: string;
+    additionalMetadata?: AdditionalMetadata;
 };
 export declare type DriverDefinition = {
     name?: string;
@@ -67,7 +72,6 @@ export declare type ExecutionResult = {
 export interface ILifecycle {
     name: LifecycleName;
     driverDefs: DriverDefinition[];
-    run(ctx: DriverContext): Promise<Result<Output, FxError>>;
     /**
      * Resolve all placeholders in the driver's arguments based on the environment variables in-place.
      * Unresolved placeholders will be returned. It can be used to get unresolved placeholders before actually