@microsoft/teamsfx-core 3.0.10-alpha.445672d19.0 → 3.0.10-alpha.4748befd3.0

package/build/core/FxCore.js

@@ -18,7 +18,6 @@ const url_1 = require("url");
 const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
 const constants_1 = require("../common/constants");
 const daSpecParser_1 = require("../common/daSpecParser");
-const featureFlags_1 = require("../common/featureFlags");
 const globalVars_1 = require("../common/globalVars");
 const localizeUtils_1 = require("../common/localizeUtils");
 const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
@@ -1056,7 +1055,7 @@ class FxCore {
             .toString()
             .split(/\r?\n/)
             .forEach((line) => {
-            const reg = /^([a-zA-Z_][a-zA-Z0-9_]*=)/g;
+            const reg = /^([a-zA-Z_][a-zA-Z0-9_]*=)(.*)/g;
             const match = reg.exec(line);
             if (match) {
                 if (match[1].startsWith("TEAMSFX_ENV=")) {
@@ -1066,7 +1065,7 @@ class FxCore {
                     writeStream.write(`APP_NAME_SUFFIX=${targetEnvName}${os.EOL}`);
                 }
                 else if (match[1].startsWith("AGENT_SCOPE=")) {
-                    writeStream.write(`AGENT_SCOPE=shared${os.EOL}`);
+                    writeStream.write(`AGENT_SCOPE=${match[2]}${os.EOL}`);
                 }
                 else {
                     writeStream.write(`${match[1]}${os.EOL}`);
@@ -1349,24 +1348,10 @@ class FxCore {
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
-        // Call Kiota to select the OpenAPI spec file
-        if (inputs.platform === teamsfx_api_1.Platform.VSCode &&
-            featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
-            inputs[constants_3.QuestionNames.ActionType] === constants_3.ActionStartOptions.apiSpec().id &&
-            !!!inputs[constants_3.QuestionNames.ActionManifestPath]) {
-            return (0, teamsfx_api_1.ok)({
-                projectPath: inputs.projectPath,
-                lastCommand: constants_2.KiotaLastCommands.addPlugin,
-                manifestPath: inputs[constants_3.QuestionNames.ManifestPath],
-            });
-        }
         const context = (0, globalVars_1.createContext)();
         const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
         const appPackageFolder = path.dirname(teamsManifestPath);
         const isGenerateFromApiSpec = inputs[constants_3.QuestionNames.ActionType] === constants_3.ActionStartOptions.apiSpec().id;
-        const isKiotaIntegration = inputs.platform === teamsfx_api_1.Platform.VSCode &&
-            featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
-            !!inputs[constants_3.QuestionNames.ActionManifestPath];
         // validate the project is valid for adding plugin
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
         if (manifestRes.isErr()) {
@@ -1393,15 +1378,9 @@ class FxCore {
         // Will be used if generating from API spec
         let specParser = undefined;
         let authNameAndSchemes = [];
-        if (isGenerateFromApiSpec && !isKiotaIntegration) {
+        if (isGenerateFromApiSpec) {
             specParser = new m365_spec_parser_1.SpecParser(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), (0, helper_2.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
             const listResult = await (0, daSpecParser_1.listAPIInfo)(inputs[constants_3.QuestionNames.ApiSpecLocation].trim());
-            if (inputs.platform === teamsfx_api_1.Platform.VSCode &&
-                featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
-                inputs[constants_3.QuestionNames.ActionType] === constants_3.ActionStartOptions.apiSpec().id &&
-                !!inputs[constants_3.QuestionNames.ActionManifestPath]) {
-                inputs[constants_3.QuestionNames.ApiOperation] = listResult.APIs.filter((value) => value.isValid).map((value) => value.api);
-            }
             authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
             if (authNameAndSchemes.length > 0) {
                 const doesLocalYamlPathExists = await fs_extra_1.default.pathExists(path.join(inputs.projectPath, versionMetadata_1.MetadataV3.localConfigFile));
@@ -1428,64 +1407,39 @@ class FxCore {
             actionId = `action_${suffix}`;
         }
         let destinationPluginManifestPath;
-        if (isKiotaIntegration) {
-            // 1. Copy openapi spec file
-            const openapiSpecFileName = path.basename(inputs[constants_3.QuestionNames.ApiSpecLocation]);
-            const openapiSpecPath = path.join(appPackageFolder, openapiSpecFileName);
-            await fs_extra_1.default.copyFile(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), openapiSpecPath);
-            // 2. Copy plugin manifest file
-            const pluginManifestPath = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, path.basename(inputs[constants_3.QuestionNames.ActionManifestPath]));
-            destinationPluginManifestPath = pluginManifestPath;
-            await fs_extra_1.default.copyFile(inputs[constants_3.QuestionNames.ActionManifestPath], pluginManifestPath);
-            // 2.1 Need to update the plugin manifest file
-            const authData = await (0, daSpecParser_1.parseAndUpdatePluginManifestForKiota)(pluginManifestPath, true);
-            // 3. Update teamsapp.local.yaml and teamsapp.yaml if need to add auth action
-            for (const authInfo of authData) {
-                await (0, helper_2.injectAuthAction)(inputs.projectPath, authInfo.authName, undefined, openapiSpecPath, false, authInfo.authType === "apiKey" ? "ApiKeyPluginVault" : "OAuthPluginVault", false, authInfo.registrationId);
-            }
-            // 4. Add action in plugin manifest
+        // generate files
+        if (isGenerateFromApiSpec && specParser) {
+            destinationPluginManifestPath =
+                await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
+            const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName));
+            const generateRes = await (0, helper_2.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
+                destinationApiSpecFilePath: destinationApiSpecPath,
+                pluginManifestFilePath: destinationPluginManifestPath,
+            }, inputs[constants_3.QuestionNames.ApiSpecLocation].trim());
+            if (generateRes.isErr()) {
+                return (0, teamsfx_api_1.err)(generateRes.error);
+            }
+            const warnings = generateRes.value.warnings;
+            if (warnings && warnings.length > 0) {
+                const warnSummary = await (0, helper_2.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
+                context.logProvider.info(warnSummary + "\n");
+            }
             const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_3.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
             if (addActionRes.isErr()) {
                 return (0, teamsfx_api_1.err)(addActionRes.error);
             }
-            // 5. Update plugin manifest to add ac info (optional)
-            await (0, helper_2.generateAdaptiveCardInPluginManifestForKiota)(pluginManifestPath, openapiSpecPath, context);
+            for (const authNameAndScheme of authNameAndSchemes) {
+                await this.updateAuthActionInYaml(authNameAndScheme.authName, authNameAndScheme.authScheme, inputs.projectPath, destinationApiSpecPath, destinationPluginManifestPath);
+            }
         }
         else {
-            // generate files
-            if (isGenerateFromApiSpec && specParser) {
-                destinationPluginManifestPath =
-                    await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
-                const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName));
-                const generateRes = await (0, helper_2.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
-                    destinationApiSpecFilePath: destinationApiSpecPath,
-                    pluginManifestFilePath: destinationPluginManifestPath,
-                }, inputs[constants_3.QuestionNames.ApiSpecLocation].trim());
-                if (generateRes.isErr()) {
-                    return (0, teamsfx_api_1.err)(generateRes.error);
-                }
-                const warnings = generateRes.value.warnings;
-                if (warnings && warnings.length > 0) {
-                    const warnSummary = await (0, helper_2.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
-                    context.logProvider.info(warnSummary + "\n");
-                }
-                const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_3.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
-                if (addActionRes.isErr()) {
-                    return (0, teamsfx_api_1.err)(addActionRes.error);
-                }
-                for (const authNameAndScheme of authNameAndSchemes) {
-                    await this.updateAuthActionInYaml(authNameAndScheme.authName, authNameAndScheme.authScheme, inputs.projectPath, destinationApiSpecPath, destinationPluginManifestPath);
-                }
-            }
-            else {
-                const addPluginRes = await (0, helper_1.addExistingPlugin)(declarativeCopilotManifestPath, inputs[constants_3.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_3.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
-                if (addPluginRes.isErr()) {
-                    return (0, teamsfx_api_1.err)(addPluginRes.error);
-                }
-                destinationPluginManifestPath = addPluginRes.value.destinationPluginManifestPath;
-                const warningMessage = (0, common_1.outputScaffoldingWarningMessage)(addPluginRes.value.warnings);
-                context.logProvider.info(warningMessage);
+            const addPluginRes = await (0, helper_1.addExistingPlugin)(declarativeCopilotManifestPath, inputs[constants_3.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_3.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
+            if (addPluginRes.isErr()) {
+                return (0, teamsfx_api_1.err)(addPluginRes.error);
             }
+            destinationPluginManifestPath = addPluginRes.value.destinationPluginManifestPath;
+            const warningMessage = (0, common_1.outputScaffoldingWarningMessage)(addPluginRes.value.warnings);
+            context.logProvider.info(warningMessage);
         }
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             const successMessage = (0, localizeUtils_1.getLocalizedString)("core.addPlugin.success.vsc", actionId);