Merge pull request #14297 from OfficeDev/qinzhouxu/fix

fix: scoping fallback env variables

Author: wh-alice

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

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

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

@@ -130,3 +130,9 @@ export const OpenAIEnvironmentVariables = {
   AZURE_OPENAI_EMBEDDING_DEPLOYMENT: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT",
   AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME",
 };
+
+export const AzureEnvironmentVariables = {
+  AZURE_SEARCH_KEY: "AZURE_SEARCH_KEY",
+  SECRET_AZURE_SEARCH_KEY: "SECRET_AZURE_SEARCH_KEY",
+  AZURE_SEARCH_ENDPOINT: "AZURE_SEARCH_ENDPOINT",
+};

packages/fx-core/src/component/driver/file/createOrUpdateEnvironmentFile.ts

@@ -238,6 +238,7 @@ const getGenericEnvVarConfig = (envKey: string): OpenAIEnvVarConfig => ({
   validation: getNonEmptyStringValidation(
     "driver.file.createOrUpdateEnvironmentFile.genericEnvVar.validation"
   ),
+  isPassword: envKey.toLowerCase().includes("key") || envKey.toLowerCase().includes("secret"),
 });
 
 const envVarConfigs: OpenAIEnvVarConfig[] = [