From a04c883fcf290017ca1c5171df4acef4d2417586 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Mon, 8 Sep 2025 21:55:08 -0700 Subject: [PATCH 1/3] Remove pipeline variables --- azure.yaml | 91 ------------------------------------------------------ 1 file changed, 91 deletions(-) diff --git a/azure.yaml b/azure.yaml index 670d15684b..9028052cdb 100644 --- a/azure.yaml +++ b/azure.yaml @@ -38,97 +38,6 @@ services: run: cd ../frontend;npm install;npm run build interactive: false continueOnError: false -pipeline: - variables: - - AZURE_OPENAI_SERVICE - - AZURE_OPENAI_API_VERSION - - AZURE_OPENAI_RESOURCE_GROUP - - AZURE_OPENAI_LOCATION - - AZURE_DOCUMENTINTELLIGENCE_SERVICE - - AZURE_DOCUMENTINTELLIGENCE_RESOURCE_GROUP - - AZURE_DOCUMENTINTELLIGENCE_SKU - - AZURE_DOCUMENTINTELLIGENCE_LOCATION - - AZURE_SEARCH_INDEX - - AZURE_SEARCH_SERVICE - - AZURE_SEARCH_SERVICE_RESOURCE_GROUP - - AZURE_SEARCH_SERVICE_LOCATION - - AZURE_SEARCH_SERVICE_SKU - - AZURE_SEARCH_QUERY_LANGUAGE - - AZURE_SEARCH_QUERY_SPELLER - - AZURE_SEARCH_SEMANTIC_RANKER - - AZURE_SEARCH_QUERY_REWRITING - - AZURE_SEARCH_FIELD_NAME_EMBEDDING - - AZURE_STORAGE_ACCOUNT - - AZURE_STORAGE_RESOURCE_GROUP - - AZURE_STORAGE_SKU - - AZURE_APP_SERVICE - - AZURE_APP_SERVICE_SKU - - AZURE_APP_SERVICE_PLAN - - AZURE_OPENAI_CHATGPT_MODEL - - AZURE_OPENAI_CHATGPT_DEPLOYMENT - - AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY - - AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION - - AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU - - AZURE_OPENAI_EMB_MODEL_NAME - - AZURE_OPENAI_EMB_DEPLOYMENT - - AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY - - AZURE_OPENAI_EMB_DEPLOYMENT_VERSION - - AZURE_OPENAI_EMB_DEPLOYMENT_SKU - - AZURE_OPENAI_EMB_DIMENSIONS - - USE_EVAL - - AZURE_OPENAI_EVAL_MODEL - - AZURE_OPENAI_EVAL_MODEL_VERSION - - AZURE_OPENAI_EVAL_DEPLOYMENT - - AZURE_OPENAI_EVAL_DEPLOYMENT_SKU - - AZURE_OPENAI_EVAL_DEPLOYMENT_CAPACITY - - AZURE_OPENAI_DISABLE_KEYS - - OPENAI_HOST - - OPENAI_API_KEY - - OPENAI_ORGANIZATION - - AZURE_USE_APPLICATION_INSIGHTS - - AZURE_APPLICATION_INSIGHTS - - AZURE_APPLICATION_INSIGHTS_DASHBOARD - - AZURE_LOG_ANALYTICS - - USE_VECTORS - - USE_MULTIMODAL - - AZURE_VISION_ENDPOINT - - VISION_SECRET_NAME - - AZURE_VISION_SERVICE - - AZURE_VISION_RESOURCE_GROUP - - AZURE_VISION_LOCATION - - AZURE_VISION_SKU - - ENABLE_LANGUAGE_PICKER - - USE_SPEECH_INPUT_BROWSER - - USE_SPEECH_OUTPUT_BROWSER - - USE_SPEECH_OUTPUT_AZURE - - AZURE_SPEECH_SERVICE - - AZURE_SPEECH_SERVICE_RESOURCE_GROUP - - AZURE_SPEECH_SERVICE_LOCATION - - AZURE_SPEECH_SERVICE_SKU - - AZURE_SPEECH_SERVICE_VOICE - - AZURE_KEY_VAULT_NAME - - AZURE_USE_AUTHENTICATION - - AZURE_ENFORCE_ACCESS_CONTROL - - AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS - - AZURE_AUTH_TENANT_ID - - AZURE_SERVER_APP_ID - - AZURE_CLIENT_APP_ID - - ALLOWED_ORIGIN - - AZURE_ADLS_GEN2_STORAGE_ACCOUNT - - AZURE_ADLS_GEN2_FILESYSTEM_PATH - - AZURE_ADLS_GEN2_FILESYSTEM - - DEPLOYMENT_TARGET - - AZURE_CONTAINER_APPS_WORKLOAD_PROFILE - - USE_CHAT_HISTORY_BROWSER - - USE_MEDIA_DESCRIBER_AZURE_CU - - USE_AI_PROJECT - - RAG_SEARCH_TEXT_EMBEDDINGS - - RAG_SEARCH_IMAGE_EMBEDDINGS - - RAG_SEND_TEXT_SOURCES - - RAG_SEND_IMAGE_SOURCES - secrets: - - AZURE_SERVER_APP_SECRET - - AZURE_CLIENT_APP_SECRET hooks: preprovision: windows: From f4bd9f10b13bde54a77b26fee9b3a383d61eda31 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Mon, 8 Sep 2025 21:56:13 -0700 Subject: [PATCH 2/3] remove pipeline variables --- azure.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure.yaml b/azure.yaml index 9028052cdb..f629d9a374 100644 --- a/azure.yaml +++ b/azure.yaml @@ -2,7 +2,9 @@ name: azure-search-openai-demo metadata: - template: azure-search-openai-demo@0.0.2-beta + template: azure-search-openai-demo@0.0.3 +requiredVersions: + azd: ">= 1.17.0" services: backend: project: ./app/backend From ba2b9064858b86ce3c7c674c7ea32cfb66bca573 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Mon, 8 Sep 2025 22:00:11 -0700 Subject: [PATCH 3/3] Update instructions --- .github/copilot-instructions.md | 1 - CONTRIBUTING.md | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index a0615dbbda..bab937f41a 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -39,7 +39,6 @@ When adding new azd environment variables, update: 1. infra/main.parameters.json : Add the new parameter with a Bicep-friendly variable name and map to the new environment variable 1. infra/main.bicep: Add the new Bicep parameter at the top, and add it to the `appEnvVariables` object -1. azure.yaml: Add the new environment variable under pipeline config section 1. .azdo/pipelines/azure-dev.yml: Add the new environment variable under `env` section 1. .github/workflows/azure-dev.yml: Add the new environment variable under `env` section diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ac1ea82ab..ff664f7547 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -141,7 +141,6 @@ When adding new azd environment variables, please remember to update: 1. [main.parameters.json](./infra/main.parameters.json) 1. [appEnvVariables in main.bicep](./infra/main.bicep) -1. App Service's [azure.yaml](./azure.yaml) 1. [ADO pipeline](.azdo/pipelines/azure-dev.yml). 1. [Github workflows](.github/workflows/azure-dev.yml)