Merge branch 'release/6.0' into qinzhouxu/link

Author: qinzhouxu

packages/fx-core/resource/package.nls.json

@@ -857,6 +857,7 @@
   "driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation": "Azure OpenAI deployment name cannot be empty.",
   "driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation": "OpenAI assistant ID cannot be empty.",
   "driver.file.createOrUpdateEnvironmentFile.OpenAIEmbeddingDeploymentName.validation": "Azure OpenAI embedding deployment name cannot be empty.",
+  "driver.file.createOrUpdateEnvironmentFile.genericEnvVar.validation": "Environment variable value cannot be empty.",
   "driver.file.createOrUpdateJsonFile.description": "Create or update JSON file.",
   "driver.file.createOrUpdateJsonFile.summary": "Json file has been successfully generated to %s.",
   "driver.file.progressBar.appsettings": "Generating json file...",

packages/fx-core/src/common/templates-config.json

@@ -1,6 +1,6 @@
 {
     "version": "~5.0",
-    "localVersion": "5.0.2",
+    "localVersion": "5.0.3",
     "tagPrefix": "templates@",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",

packages/fx-core/src/component/configManager/lifecycle.ts

@@ -24,7 +24,6 @@ import {
 } from "./interface";
 import { MissingEnvironmentVariablesError } from "../../error";
 import { setErrorContext } from "../../common/globalVars";
-import { OpenAIEnvironmentVariables } from "../constants";
 
 function resolveDriverDef(
   def: DriverDefinition,
@@ -102,16 +101,7 @@ export function resolveString(
         resolved.push(envVar);
         newVal = newVal.replace(matches[0], envVal);
       }
-    } else if (
-      envVar === OpenAIEnvironmentVariables.SECRET_AZURE_OPENAI_API_KEY ||
-      envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT ||
-      envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME ||
-      envVar === OpenAIEnvironmentVariables.SECRET_OPENAI_API_KEY ||
-      envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME ||
-      envVar === OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID ||
-      envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID ||
-      envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT
-    ) {
+    } else if (envVar.includes("AZURE") || envVar.includes("OPENAI")) {
       if (envVal) {
         resolved.push(envVar);
         newVal = newVal.replace(matches[0], envVal);

packages/fx-core/src/component/constants.ts

@@ -128,4 +128,5 @@ export const OpenAIEnvironmentVariables = {
   OPENAI_ASSISTANT_ID: "OPENAI_ASSISTANT_ID",
   AZURE_OPENAI_ASSISTANT_ID: "AZURE_OPENAI_ASSISTANT_ID",
   AZURE_OPENAI_EMBEDDING_DEPLOYMENT: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT",
+  AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME",
 };

packages/fx-core/src/component/driver/aad/create.ts

@@ -5,16 +5,18 @@ import { hooks } from "@feathersjs/hooks/lib";
 import {
   FxError,
   M365TokenProvider,
+  Result,
   SystemError,
   UserError,
   err,
   ok,
-  Result,
 } from "@microsoft/teamsfx-api";
 import axios from "axios";
 import { Service } from "typedi";
 import { GraphScopes } from "../../../common/constants";
+import { AadSet } from "../../../common/globalVars";
 import { getLocalizedString } from "../../../common/localizeUtils";
+import { environmentNameManager } from "../../../core/environmentName";
 import {
   HttpClientError,
   HttpServerError,
@@ -41,9 +43,6 @@ import {
   questionKeys,
   telemetryKeys,
 } from "./utility/constants";
-import { AadSet } from "../../../common/globalVars";
-import { isTestToolEnabledProject } from "../../../common/tools";
-import { environmentNameManager } from "../../../core/environmentName";
 
 const actionName = "aadApp/create"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/aadapp-create";
@@ -212,11 +211,10 @@ export class CreateAadAppDriver implements StepDriver {
           getLocalizedString(logMessageKeys.failExecuteDriver, actionName, message)
         );
         if (error.response!.status >= 400 && error.response!.status < 500) {
-          // When user don't have permission to create AAD app, and cannot use Test Tool, we will ask for AAD app id and secret
+          // When user don't have permission to create AAD app, we will ask for AAD app id and secret
           if (
             error.response!.status === 403 &&
             message.includes(constants.insufficientPermissionErrorMessage) &&
-            !isTestToolEnabledProject(context.projectPath) &&
             process.env.TEAMSFX_ENV == environmentNameManager.getLocalEnvName()
           ) {
             context.addTelemetryProperties({