Fix search env var (#1455)

Author: pamelafox

app/backend/app.py

@@ -216,7 +216,7 @@ async def setup_clients():
     AZURE_STORAGE_CONTAINER = os.environ["AZURE_STORAGE_CONTAINER"]
     AZURE_SEARCH_SERVICE = os.environ["AZURE_SEARCH_SERVICE"]
     AZURE_SEARCH_INDEX = os.environ["AZURE_SEARCH_INDEX"]
-    SEARCH_SECRET_NAME = os.getenv("SEARCH_SECRET_NAME")
+    AZURE_SEARCH_SECRET_NAME = os.getenv("AZURE_SEARCH_SECRET_NAME")
     AZURE_KEY_VAULT_NAME = os.getenv("AZURE_KEY_VAULT_NAME")
     # Shared by all OpenAI deployments
     OPENAI_HOST = os.getenv("OPENAI_HOST", "azure")
@@ -264,7 +264,7 @@ async def setup_clients():
         key_vault_client = SecretClient(
             vault_url=f"https://{AZURE_KEY_VAULT_NAME}.vault.azure.net", credential=azure_credential
         )
-        search_key = SEARCH_SECRET_NAME and (await key_vault_client.get_secret(SEARCH_SECRET_NAME)).value
+        search_key = AZURE_SEARCH_SECRET_NAME and (await key_vault_client.get_secret(AZURE_SEARCH_SECRET_NAME)).value
         await key_vault_client.close()
 
     # Set up clients for AI Search and Storage

infra/main.bicep

@@ -237,7 +237,7 @@ module backend 'core/host/appservice.bicep' = {
       AZURE_SEARCH_SERVICE: searchService.outputs.name
       AZURE_SEARCH_SEMANTIC_RANKER: actualSearchServiceSemanticRankerLevel
       AZURE_VISION_ENDPOINT: useGPT4V ? computerVision.outputs.endpoint : ''
-      SEARCH_SECRET_NAME: useSearchServiceKey ? searchServiceSecretName : ''
+      AZURE_SEARCH_SECRET_NAME: useSearchServiceKey ? searchServiceSecretName : ''
       AZURE_KEY_VAULT_NAME: useKeyVault ? keyVault.outputs.name : ''
       AZURE_SEARCH_QUERY_LANGUAGE: searchQueryLanguage
       AZURE_SEARCH_QUERY_SPELLER: searchQuerySpeller

tests/test_app_config.py

@@ -114,7 +114,7 @@ async def test_app_config_for_client(client):
 async def test_app_visionkey_notfound(monkeypatch, minimal_env):
     monkeypatch.setenv("AZURE_KEY_VAULT_NAME", "my_key_vault")
     monkeypatch.setenv("VISION_SECRET_NAME", "")
-    monkeypatch.setenv("SEARCH_SECRET_NAME", "search-secret-name")
+    monkeypatch.setenv("AZURE_SEARCH_SECRET_NAME", "search-secret-name")
 
     async def get_secret(*args, **kwargs):
         if args[1] == "vision-secret-name":
@@ -132,7 +132,7 @@ async def get_secret(*args, **kwargs):
 async def test_app_searchkey_notfound(monkeypatch, minimal_env):
     monkeypatch.setenv("AZURE_KEY_VAULT_NAME", "my_key_vault")
     monkeypatch.setenv("VISION_SECRET_NAME", "vision-secret-name")
-    monkeypatch.setenv("SEARCH_SECRET_NAME", "")
+    monkeypatch.setenv("AZURE_SEARCH_SECRET_NAME", "")
 
     async def get_secret(*args, **kwargs):
         if args[1] == "search-secret-name":