From 4026de6b81c6a5d0372a2eb819108e4103f31fc8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:27:11 +0000 Subject: [PATCH 1/4] Initial plan From bd801f87af375fb2e10b1dcbf3e0a36dcbfaefc6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:36:02 +0000 Subject: [PATCH 2/4] Initial creation of bicepparam files using az bicep decompile-params Co-authored-by: dantelmomsft <113094107+dantelmomsft@users.noreply.github.com> --- deploy/aca/infra/main.parameters.bicepparam | 117 ++++++++++++++++++++ deploy/aks/infra/main.parameters.bicepparam | 103 +++++++++++++++++ 2 files changed, 220 insertions(+) create mode 100644 deploy/aca/infra/main.parameters.bicepparam create mode 100644 deploy/aks/infra/main.parameters.bicepparam diff --git a/deploy/aca/infra/main.parameters.bicepparam b/deploy/aca/infra/main.parameters.bicepparam new file mode 100644 index 0000000..0d80c81 --- /dev/null +++ b/deploy/aca/infra/main.parameters.bicepparam @@ -0,0 +1,117 @@ +using './main.bicep' + +param environmentName = '\${AZURE_ENV_NAME}' + +param resourceGroupName = '\${AZURE_RESOURCE_GROUP}' + +param location = '\${AZURE_LOCATION}' + +param principalId = '\${AZURE_PRINCIPAL_ID}' + +param principalType = '\${AZURE_PRINCIPAL_TYPE=User}' + +param openAiServiceName = '\${AZURE_OPENAI_SERVICE}' + +param openAiResourceGroupName = '\${AZURE_OPENAI_RESOURCE_GROUP}' + +param customOpenAiResourceGroupLocation = '\${AZURE_OPENAI_SERVICE_LOCATION}' + +param openAiSkuName = 'S0' + +param documentIntelligenceServiceName = '\${AZURE_DOCUMENT_INTELLIGENCE_SERVICE}' + +param documentIntelligenceResourceGroupName = '\${AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP}' + +param documentIntelligenceSkuName = 'S0' + +param searchIndexName = '\${AZURE_SEARCH_INDEX=gptkbindex}' + +param searchServiceName = '\${AZURE_SEARCH_SERVICE}' + +param searchServiceResourceGroupName = '\${AZURE_SEARCH_SERVICE_RESOURCE_GROUP}' + +param searchServiceLocation = '\${AZURE_SEARCH_SERVICE_LOCATION}' + +param searchServiceSkuName = '\${AZURE_SEARCH_SERVICE_SKU=standard}' + +param searchQueryLanguage = '\${AZURE_SEARCH_QUERY_LANGUAGE=en-us}' + +param searchQuerySpeller = '\${AZURE_SEARCH_QUERY_SPELLER=lexicon}' + +param storageAccountName = '\${AZURE_STORAGE_ACCOUNT}' + +param storageResourceGroupName = '\${AZURE_STORAGE_RESOURCE_GROUP}' + +param storageSkuName = '\${AZURE_STORAGE_SKU=Standard_LRS}' + +param chatGptModelName = '\${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}' + +param chatGptModelVersion = '\${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}' + +param chatGptDeploymentName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}' + +param chatGptDeploymentCapacity = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}' + +param chatGptDeploymentSkuName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}' + +param evalModelName = '\${AZURE_OPENAI_EVAL_MODEL}' + +param evalModelVersion = '\${AZURE_OPENAI_EVAL_MODEL_VERSION}' + +param evalDeploymentName = '\${AZURE_OPENAI_EVAL_DEPLOYMENT}' + +param evalDeploymentSkuName = '\${AZURE_OPENAI_EVAL_DEPLOYMENT_SKU}' + +param evalDeploymentCapacity = '\${AZURE_OPENAI_EVAL_DEPLOYMENT_CAPACITY}' + +param embeddingModelName = '\${AZURE_OPENAI_EMB_MODEL}' + +param embeddingModelVersion = '\${AZURE_OPENAI_EMB_MODEL_VERSION}' + +param embeddingDeploymentName = '\${AZURE_OPENAI_EMB_DEPLOYMENT}' + +param embeddingDeploymentVersion = '\${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}' + +param embeddingDeploymentSkuName = '\${AZURE_OPENAI_EMB_DEPLOYMENT_SKU}' + +param embeddingDeploymentCapacity = '\${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY}' + +param embeddingDimensions = '\${AZURE_OPENAI_EMB_DIMENSIONS}' + +param useApplicationInsights = '\${AZURE_USE_APPLICATION_INSIGHTS=true}' + +param useChatHistoryBrowser = '\${USE_CHAT_HISTORY_BROWSER=false}' + +param useChatHistoryCosmos = '\${USE_CHAT_HISTORY_COSMOS=false}' + +param enableGlobalDocumentAccess = '\${AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS=true}' + +param cosmosDbSkuName = '\${AZURE_COSMOSDB_SKU=serverless}' + +param cosmodDbResourceGroupName = '\${AZURE_COSMOSDB_RESOURCE_GROUP}' + +param cosmosDbLocation = '\${AZURE_COSMOSDB_LOCATION}' + +param cosmosDbAccountName = '\${AZURE_COSMOSDB_ACCOUNT}' + +param cosmosDbThroughput = '\${AZURE_COSMOSDB_THROUGHPUT}' + +param useAuthentication = '\${AZURE_USE_AUTHENTICATION=false}' + +param authTenantId = '\${AZURE_AUTH_TENANT_ID}' + +param serverAppId = '\${AZURE_SERVER_APP_ID}' + +param clientAppId = '\${AZURE_CLIENT_APP_ID}' + +param useServiceBusIndexing = '\${USE_SERVICEBUS_INDEXING=true}' + +param useEval = '\${USE_EVAL=false}' + +param useSafetyEval = '\${USE_SAFETY_EVAL=false}' + +param apiAppExists = false + +param webAppExists = false + +param indexerAppExists = false diff --git a/deploy/aks/infra/main.parameters.bicepparam b/deploy/aks/infra/main.parameters.bicepparam new file mode 100644 index 0000000..4137db8 --- /dev/null +++ b/deploy/aks/infra/main.parameters.bicepparam @@ -0,0 +1,103 @@ +using './main.bicep' + +param environmentName = '\${AZURE_ENV_NAME}' + +param resourceGroupName = '\${AZURE_RESOURCE_GROUP}' + +param location = '\${AZURE_LOCATION}' + +param kubernetesVersion = '\${AZURE_KUBERNETES_VERSION=1.33}' + +param principalId = '\${AZURE_PRINCIPAL_ID}' + +param principalType = '\${AZURE_PRINCIPAL_TYPE=User}' + +param openAiServiceName = '\${AZURE_OPENAI_SERVICE}' + +param openAiResourceGroupName = '\${AZURE_OPENAI_RESOURCE_GROUP}' + +param customOpenAiResourceGroupLocation = '\${AZURE_OPENAI_SERVICE_LOCATION}' + +param openAiSkuName = 'S0' + +param documentIntelligenceServiceName = '\${AZURE_DOCUMENT_INTELLIGENCE_SERVICE}' + +param documentIntelligenceResourceGroupName = '\${AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP}' + +param documentIntelligenceSkuName = 'S0' + +param searchIndexName = '\${AZURE_SEARCH_INDEX=gptkbindex}' + +param searchServiceName = '\${AZURE_SEARCH_SERVICE}' + +param searchServiceResourceGroupName = '\${AZURE_SEARCH_SERVICE_RESOURCE_GROUP}' + +param searchServiceLocation = '\${AZURE_SEARCH_SERVICE_LOCATION}' + +param searchServiceSkuName = '\${AZURE_SEARCH_SERVICE_SKU=standard}' + +param searchQueryLanguage = '\${AZURE_SEARCH_QUERY_LANGUAGE=en-us}' + +param searchQuerySpeller = '\${AZURE_SEARCH_QUERY_SPELLER=lexicon}' + +param storageAccountName = '\${AZURE_STORAGE_ACCOUNT}' + +param storageResourceGroupName = '\${AZURE_STORAGE_RESOURCE_GROUP}' + +param storageSkuName = '\${AZURE_STORAGE_SKU=Standard_LRS}' + +param chatGptModelName = '\${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}' + +param chatGptModelVersion = '\${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}' + +param chatGptDeploymentName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}' + +param chatGptDeploymentCapacity = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}' + +param chatGptDeploymentSkuName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}' + +param embeddingModelName = '\${AZURE_OPENAI_EMB_MODEL=text-embedding-3-large}' + +param embeddingModelVersion = '\${AZURE_OPENAI_EMB_MODEL_VERSION=1}' + +param embeddingDeploymentName = '\${AZURE_OPENAI_EMB_DEPLOYMENT=text-embedding-3-large}' + +param embeddingDeploymentSkuName = '\${AZURE_OPENAI_EMB_DEPLOYMENT_SKU=GlobalStandard}' + +param embeddingDeploymentCapacity = '\${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY=80}' + +param embeddingDimensions = '\${AZURE_OPENAI_EMB_DIMENSIONS=3072}' + +param openAiHost = '\${OPENAI_HOST=azure}' + +param openAiApiKey = '\${OPENAI_API_KEY}' + +param openAiApiOrganization = '\${OPENAI_ORGANIZATION}' + +param useApplicationInsights = '\${AZURE_USE_APPLICATION_INSIGHTS=true}' + +param useChatHistoryBrowser = '\${USE_CHAT_HISTORY_BROWSER=false}' + +param useChatHistoryCosmos = '\${USE_CHAT_HISTORY_COSMOS=false}' + +param enableGlobalDocumentAccess = '\${AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS=true}' + +param cosmosDbSkuName = '\${AZURE_COSMOSDB_SKU=serverless}' + +param cosmodDbResourceGroupName = '\${AZURE_COSMOSDB_RESOURCE_GROUP}' + +param cosmosDbLocation = '\${AZURE_COSMOSDB_LOCATION}' + +param cosmosDbAccountName = '\${AZURE_COSMOSDB_ACCOUNT}' + +param cosmosDbThroughput = '\${AZURE_COSMOSDB_THROUGHPUT}' + +param useAuthentication = '\${AZURE_USE_AUTHENTICATION=false}' + +param authTenantId = '\${AZURE_AUTH_TENANT_ID}' + +param serverAppId = '\${AZURE_SERVER_APP_ID}' + +param clientAppId = '\${AZURE_CLIENT_APP_ID}' + +param useServiceBusIndexing = '\${USE_SERVICEBUS_INDEXING=true}' From 2f023244ec86a84a2e026de964c916803625004a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:51:28 +0000 Subject: [PATCH 3/4] Fix bicepparam files to use readEnvironmentVariable() function and add missing parameters Co-authored-by: dantelmomsft <113094107+dantelmomsft@users.noreply.github.com> --- deploy/aca/infra/main.parameters.bicepparam | 163 +++++++------------- deploy/aks/infra/main.parameters.bicepparam | 149 ++++++------------ 2 files changed, 103 insertions(+), 209 deletions(-) diff --git a/deploy/aca/infra/main.parameters.bicepparam b/deploy/aca/infra/main.parameters.bicepparam index 0d80c81..22928a8 100644 --- a/deploy/aca/infra/main.parameters.bicepparam +++ b/deploy/aca/infra/main.parameters.bicepparam @@ -1,117 +1,60 @@ using './main.bicep' -param environmentName = '\${AZURE_ENV_NAME}' - -param resourceGroupName = '\${AZURE_RESOURCE_GROUP}' - -param location = '\${AZURE_LOCATION}' - -param principalId = '\${AZURE_PRINCIPAL_ID}' - -param principalType = '\${AZURE_PRINCIPAL_TYPE=User}' - -param openAiServiceName = '\${AZURE_OPENAI_SERVICE}' - -param openAiResourceGroupName = '\${AZURE_OPENAI_RESOURCE_GROUP}' - -param customOpenAiResourceGroupLocation = '\${AZURE_OPENAI_SERVICE_LOCATION}' - +param environmentName = readEnvironmentVariable('AZURE_ENV_NAME') +param resourceGroupName = readEnvironmentVariable('AZURE_RESOURCE_GROUP') +param location = readEnvironmentVariable('AZURE_LOCATION') +param principalId = readEnvironmentVariable('AZURE_PRINCIPAL_ID') +param principalType = readEnvironmentVariable('AZURE_PRINCIPAL_TYPE', 'User') +param openAiServiceName = readEnvironmentVariable('AZURE_OPENAI_SERVICE') +param openAiResourceGroupName = readEnvironmentVariable('AZURE_OPENAI_RESOURCE_GROUP') +param openAiResourceGroupLocation = readEnvironmentVariable('AZURE_OPENAI_RESOURCE_GROUP_LOCATION') +param customOpenAiResourceGroupLocation = readEnvironmentVariable('AZURE_OPENAI_SERVICE_LOCATION') param openAiSkuName = 'S0' - -param documentIntelligenceServiceName = '\${AZURE_DOCUMENT_INTELLIGENCE_SERVICE}' - -param documentIntelligenceResourceGroupName = '\${AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP}' - +param documentIntelligenceServiceName = readEnvironmentVariable('AZURE_DOCUMENT_INTELLIGENCE_SERVICE') +param documentIntelligenceResourceGroupName = readEnvironmentVariable('AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP') param documentIntelligenceSkuName = 'S0' - -param searchIndexName = '\${AZURE_SEARCH_INDEX=gptkbindex}' - -param searchServiceName = '\${AZURE_SEARCH_SERVICE}' - -param searchServiceResourceGroupName = '\${AZURE_SEARCH_SERVICE_RESOURCE_GROUP}' - -param searchServiceLocation = '\${AZURE_SEARCH_SERVICE_LOCATION}' - -param searchServiceSkuName = '\${AZURE_SEARCH_SERVICE_SKU=standard}' - -param searchQueryLanguage = '\${AZURE_SEARCH_QUERY_LANGUAGE=en-us}' - -param searchQuerySpeller = '\${AZURE_SEARCH_QUERY_SPELLER=lexicon}' - -param storageAccountName = '\${AZURE_STORAGE_ACCOUNT}' - -param storageResourceGroupName = '\${AZURE_STORAGE_RESOURCE_GROUP}' - -param storageSkuName = '\${AZURE_STORAGE_SKU=Standard_LRS}' - -param chatGptModelName = '\${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}' - -param chatGptModelVersion = '\${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}' - -param chatGptDeploymentName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}' - -param chatGptDeploymentCapacity = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}' - -param chatGptDeploymentSkuName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}' - -param evalModelName = '\${AZURE_OPENAI_EVAL_MODEL}' - -param evalModelVersion = '\${AZURE_OPENAI_EVAL_MODEL_VERSION}' - -param evalDeploymentName = '\${AZURE_OPENAI_EVAL_DEPLOYMENT}' - -param evalDeploymentSkuName = '\${AZURE_OPENAI_EVAL_DEPLOYMENT_SKU}' - -param evalDeploymentCapacity = '\${AZURE_OPENAI_EVAL_DEPLOYMENT_CAPACITY}' - -param embeddingModelName = '\${AZURE_OPENAI_EMB_MODEL}' - -param embeddingModelVersion = '\${AZURE_OPENAI_EMB_MODEL_VERSION}' - -param embeddingDeploymentName = '\${AZURE_OPENAI_EMB_DEPLOYMENT}' - -param embeddingDeploymentVersion = '\${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}' - -param embeddingDeploymentSkuName = '\${AZURE_OPENAI_EMB_DEPLOYMENT_SKU}' - -param embeddingDeploymentCapacity = '\${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY}' - -param embeddingDimensions = '\${AZURE_OPENAI_EMB_DIMENSIONS}' - -param useApplicationInsights = '\${AZURE_USE_APPLICATION_INSIGHTS=true}' - -param useChatHistoryBrowser = '\${USE_CHAT_HISTORY_BROWSER=false}' - -param useChatHistoryCosmos = '\${USE_CHAT_HISTORY_COSMOS=false}' - -param enableGlobalDocumentAccess = '\${AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS=true}' - -param cosmosDbSkuName = '\${AZURE_COSMOSDB_SKU=serverless}' - -param cosmodDbResourceGroupName = '\${AZURE_COSMOSDB_RESOURCE_GROUP}' - -param cosmosDbLocation = '\${AZURE_COSMOSDB_LOCATION}' - -param cosmosDbAccountName = '\${AZURE_COSMOSDB_ACCOUNT}' - -param cosmosDbThroughput = '\${AZURE_COSMOSDB_THROUGHPUT}' - -param useAuthentication = '\${AZURE_USE_AUTHENTICATION=false}' - -param authTenantId = '\${AZURE_AUTH_TENANT_ID}' - -param serverAppId = '\${AZURE_SERVER_APP_ID}' - -param clientAppId = '\${AZURE_CLIENT_APP_ID}' - -param useServiceBusIndexing = '\${USE_SERVICEBUS_INDEXING=true}' - -param useEval = '\${USE_EVAL=false}' - -param useSafetyEval = '\${USE_SAFETY_EVAL=false}' - +param searchIndexName = readEnvironmentVariable('AZURE_SEARCH_INDEX', 'gptkbindex') +param searchServiceName = readEnvironmentVariable('AZURE_SEARCH_SERVICE') +param searchServiceResourceGroupName = readEnvironmentVariable('AZURE_SEARCH_SERVICE_RESOURCE_GROUP') +param searchServiceLocation = readEnvironmentVariable('AZURE_SEARCH_SERVICE_LOCATION') +param searchServiceSkuName = readEnvironmentVariable('AZURE_SEARCH_SERVICE_SKU', 'standard') +param searchQueryLanguage = readEnvironmentVariable('AZURE_SEARCH_QUERY_LANGUAGE', 'en-us') +param searchQuerySpeller = readEnvironmentVariable('AZURE_SEARCH_QUERY_SPELLER', 'lexicon') +param storageAccountName = readEnvironmentVariable('AZURE_STORAGE_ACCOUNT') +param storageResourceGroupName = readEnvironmentVariable('AZURE_STORAGE_RESOURCE_GROUP') +param storageSkuName = readEnvironmentVariable('AZURE_STORAGE_SKU', 'Standard_LRS') +param chatGptModelName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_MODEL', 'gpt-4o-mini') +param chatGptModelVersion = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_VERSION', '2024-07-18') +param chatGptDeploymentName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT', 'gpt-4o-mini') +param chatGptDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY', '80')) +param chatGptDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME', 'Standard') +param evalModelName = readEnvironmentVariable('AZURE_OPENAI_EVAL_MODEL') +param evalModelVersion = readEnvironmentVariable('AZURE_OPENAI_EVAL_MODEL_VERSION') +param evalDeploymentName = readEnvironmentVariable('AZURE_OPENAI_EVAL_DEPLOYMENT') +param evalDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_EVAL_DEPLOYMENT_SKU') +param evalDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_EVAL_DEPLOYMENT_CAPACITY')) +param embeddingModelName = readEnvironmentVariable('AZURE_OPENAI_EMB_MODEL') +param embeddingDeploymentName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT') +param embeddingDeploymentVersion = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_VERSION') +param embeddingDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_SKU') +param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY')) +param embeddingDimensions = int(readEnvironmentVariable('AZURE_OPENAI_EMB_DIMENSIONS')) +param useApplicationInsights = bool(readEnvironmentVariable('AZURE_USE_APPLICATION_INSIGHTS', 'true')) +param useChatHistoryBrowser = bool(readEnvironmentVariable('USE_CHAT_HISTORY_BROWSER', 'false')) +param useChatHistoryCosmos = bool(readEnvironmentVariable('USE_CHAT_HISTORY_COSMOS', 'false')) +param enableGlobalDocumentAccess = bool(readEnvironmentVariable('AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS', 'true')) +param cosmosDbSkuName = readEnvironmentVariable('AZURE_COSMOSDB_SKU', 'serverless') +param cosmodDbResourceGroupName = readEnvironmentVariable('AZURE_COSMOSDB_RESOURCE_GROUP') +param cosmosDbLocation = readEnvironmentVariable('AZURE_COSMOSDB_LOCATION') +param cosmosDbAccountName = readEnvironmentVariable('AZURE_COSMOSDB_ACCOUNT') +param cosmosDbThroughput = int(readEnvironmentVariable('AZURE_COSMOSDB_THROUGHPUT')) +param useAuthentication = bool(readEnvironmentVariable('AZURE_USE_AUTHENTICATION', 'false')) +param authTenantId = readEnvironmentVariable('AZURE_AUTH_TENANT_ID') +param serverAppId = readEnvironmentVariable('AZURE_SERVER_APP_ID') +param clientAppId = readEnvironmentVariable('AZURE_CLIENT_APP_ID') +param useServiceBusIndexing = bool(readEnvironmentVariable('USE_SERVICEBUS_INDEXING', 'true')) +param useEval = bool(readEnvironmentVariable('USE_EVAL', 'false')) +param useSafetyEval = bool(readEnvironmentVariable('USE_SAFETY_EVAL', 'false')) param apiAppExists = false - param webAppExists = false - param indexerAppExists = false diff --git a/deploy/aks/infra/main.parameters.bicepparam b/deploy/aks/infra/main.parameters.bicepparam index 4137db8..47b409a 100644 --- a/deploy/aks/infra/main.parameters.bicepparam +++ b/deploy/aks/infra/main.parameters.bicepparam @@ -1,103 +1,54 @@ using './main.bicep' -param environmentName = '\${AZURE_ENV_NAME}' - -param resourceGroupName = '\${AZURE_RESOURCE_GROUP}' - -param location = '\${AZURE_LOCATION}' - -param kubernetesVersion = '\${AZURE_KUBERNETES_VERSION=1.33}' - -param principalId = '\${AZURE_PRINCIPAL_ID}' - -param principalType = '\${AZURE_PRINCIPAL_TYPE=User}' - -param openAiServiceName = '\${AZURE_OPENAI_SERVICE}' - -param openAiResourceGroupName = '\${AZURE_OPENAI_RESOURCE_GROUP}' - -param customOpenAiResourceGroupLocation = '\${AZURE_OPENAI_SERVICE_LOCATION}' - +param environmentName = readEnvironmentVariable('AZURE_ENV_NAME') +param resourceGroupName = readEnvironmentVariable('AZURE_RESOURCE_GROUP') +param location = readEnvironmentVariable('AZURE_LOCATION') +param kubernetesVersion = readEnvironmentVariable('AZURE_KUBERNETES_VERSION', '1.33') +param principalId = readEnvironmentVariable('AZURE_PRINCIPAL_ID') +param principalType = readEnvironmentVariable('AZURE_PRINCIPAL_TYPE', 'User') +param openAiServiceName = readEnvironmentVariable('AZURE_OPENAI_SERVICE') +param openAiResourceGroupName = readEnvironmentVariable('AZURE_OPENAI_RESOURCE_GROUP') +param openAiResourceGroupLocation = readEnvironmentVariable('AZURE_OPENAI_RESOURCE_GROUP_LOCATION') +param customOpenAiResourceGroupLocation = readEnvironmentVariable('AZURE_OPENAI_SERVICE_LOCATION') param openAiSkuName = 'S0' - -param documentIntelligenceServiceName = '\${AZURE_DOCUMENT_INTELLIGENCE_SERVICE}' - -param documentIntelligenceResourceGroupName = '\${AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP}' - +param documentIntelligenceServiceName = readEnvironmentVariable('AZURE_DOCUMENT_INTELLIGENCE_SERVICE') +param documentIntelligenceResourceGroupName = readEnvironmentVariable('AZURE_DOCUMENT_INTELLIGENCE_RESOURCE_GROUP') param documentIntelligenceSkuName = 'S0' - -param searchIndexName = '\${AZURE_SEARCH_INDEX=gptkbindex}' - -param searchServiceName = '\${AZURE_SEARCH_SERVICE}' - -param searchServiceResourceGroupName = '\${AZURE_SEARCH_SERVICE_RESOURCE_GROUP}' - -param searchServiceLocation = '\${AZURE_SEARCH_SERVICE_LOCATION}' - -param searchServiceSkuName = '\${AZURE_SEARCH_SERVICE_SKU=standard}' - -param searchQueryLanguage = '\${AZURE_SEARCH_QUERY_LANGUAGE=en-us}' - -param searchQuerySpeller = '\${AZURE_SEARCH_QUERY_SPELLER=lexicon}' - -param storageAccountName = '\${AZURE_STORAGE_ACCOUNT}' - -param storageResourceGroupName = '\${AZURE_STORAGE_RESOURCE_GROUP}' - -param storageSkuName = '\${AZURE_STORAGE_SKU=Standard_LRS}' - -param chatGptModelName = '\${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}' - -param chatGptModelVersion = '\${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}' - -param chatGptDeploymentName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}' - -param chatGptDeploymentCapacity = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}' - -param chatGptDeploymentSkuName = '\${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}' - -param embeddingModelName = '\${AZURE_OPENAI_EMB_MODEL=text-embedding-3-large}' - -param embeddingModelVersion = '\${AZURE_OPENAI_EMB_MODEL_VERSION=1}' - -param embeddingDeploymentName = '\${AZURE_OPENAI_EMB_DEPLOYMENT=text-embedding-3-large}' - -param embeddingDeploymentSkuName = '\${AZURE_OPENAI_EMB_DEPLOYMENT_SKU=GlobalStandard}' - -param embeddingDeploymentCapacity = '\${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY=80}' - -param embeddingDimensions = '\${AZURE_OPENAI_EMB_DIMENSIONS=3072}' - -param openAiHost = '\${OPENAI_HOST=azure}' - -param openAiApiKey = '\${OPENAI_API_KEY}' - -param openAiApiOrganization = '\${OPENAI_ORGANIZATION}' - -param useApplicationInsights = '\${AZURE_USE_APPLICATION_INSIGHTS=true}' - -param useChatHistoryBrowser = '\${USE_CHAT_HISTORY_BROWSER=false}' - -param useChatHistoryCosmos = '\${USE_CHAT_HISTORY_COSMOS=false}' - -param enableGlobalDocumentAccess = '\${AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS=true}' - -param cosmosDbSkuName = '\${AZURE_COSMOSDB_SKU=serverless}' - -param cosmodDbResourceGroupName = '\${AZURE_COSMOSDB_RESOURCE_GROUP}' - -param cosmosDbLocation = '\${AZURE_COSMOSDB_LOCATION}' - -param cosmosDbAccountName = '\${AZURE_COSMOSDB_ACCOUNT}' - -param cosmosDbThroughput = '\${AZURE_COSMOSDB_THROUGHPUT}' - -param useAuthentication = '\${AZURE_USE_AUTHENTICATION=false}' - -param authTenantId = '\${AZURE_AUTH_TENANT_ID}' - -param serverAppId = '\${AZURE_SERVER_APP_ID}' - -param clientAppId = '\${AZURE_CLIENT_APP_ID}' - -param useServiceBusIndexing = '\${USE_SERVICEBUS_INDEXING=true}' +param searchIndexName = readEnvironmentVariable('AZURE_SEARCH_INDEX', 'gptkbindex') +param searchServiceName = readEnvironmentVariable('AZURE_SEARCH_SERVICE') +param searchServiceResourceGroupName = readEnvironmentVariable('AZURE_SEARCH_SERVICE_RESOURCE_GROUP') +param searchServiceLocation = readEnvironmentVariable('AZURE_SEARCH_SERVICE_LOCATION') +param searchServiceSkuName = readEnvironmentVariable('AZURE_SEARCH_SERVICE_SKU', 'standard') +param searchQueryLanguage = readEnvironmentVariable('AZURE_SEARCH_QUERY_LANGUAGE', 'en-us') +param searchQuerySpeller = readEnvironmentVariable('AZURE_SEARCH_QUERY_SPELLER', 'lexicon') +param storageAccountName = readEnvironmentVariable('AZURE_STORAGE_ACCOUNT') +param storageResourceGroupName = readEnvironmentVariable('AZURE_STORAGE_RESOURCE_GROUP') +param storageSkuName = readEnvironmentVariable('AZURE_STORAGE_SKU', 'Standard_LRS') +param chatGptModelName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_MODEL', 'gpt-4o-mini') +param chatGptModelVersion = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_VERSION', '2024-07-18') +param chatGptDeploymentName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT', 'gpt-4o-mini') +param chatGptDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY', '80')) +param chatGptDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME', 'Standard') +param embeddingModelName = readEnvironmentVariable('AZURE_OPENAI_EMB_MODEL', 'text-embedding-3-large') +param embeddingModelVersion = readEnvironmentVariable('AZURE_OPENAI_EMB_MODEL_VERSION', '1') +param embeddingDeploymentName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT', 'text-embedding-3-large') +param embeddingDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_SKU', 'GlobalStandard') +param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY', '80')) +param embeddingDimensions = int(readEnvironmentVariable('AZURE_OPENAI_EMB_DIMENSIONS', '3072')) +param openAiHost = readEnvironmentVariable('OPENAI_HOST', 'azure') +param openAiApiKey = readEnvironmentVariable('OPENAI_API_KEY') +param openAiApiOrganization = readEnvironmentVariable('OPENAI_ORGANIZATION') +param useApplicationInsights = bool(readEnvironmentVariable('AZURE_USE_APPLICATION_INSIGHTS', 'true')) +param useChatHistoryBrowser = bool(readEnvironmentVariable('USE_CHAT_HISTORY_BROWSER', 'false')) +param useChatHistoryCosmos = bool(readEnvironmentVariable('USE_CHAT_HISTORY_COSMOS', 'false')) +param enableGlobalDocumentAccess = bool(readEnvironmentVariable('AZURE_ENABLE_GLOBAL_DOCUMENT_ACCESS', 'true')) +param cosmosDbSkuName = readEnvironmentVariable('AZURE_COSMOSDB_SKU', 'serverless') +param cosmodDbResourceGroupName = readEnvironmentVariable('AZURE_COSMOSDB_RESOURCE_GROUP') +param cosmosDbLocation = readEnvironmentVariable('AZURE_COSMOSDB_LOCATION') +param cosmosDbAccountName = readEnvironmentVariable('AZURE_COSMOSDB_ACCOUNT') +param cosmosDbThroughput = int(readEnvironmentVariable('AZURE_COSMOSDB_THROUGHPUT')) +param useAuthentication = bool(readEnvironmentVariable('AZURE_USE_AUTHENTICATION', 'false')) +param authTenantId = readEnvironmentVariable('AZURE_AUTH_TENANT_ID') +param serverAppId = readEnvironmentVariable('AZURE_SERVER_APP_ID') +param clientAppId = readEnvironmentVariable('AZURE_CLIENT_APP_ID') +param useServiceBusIndexing = bool(readEnvironmentVariable('USE_SERVICEBUS_INDEXING', 'true')) From 09822038f1bc00044a7c1c23ecfed27f08c4dbef Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 24 Jul 2025 10:03:21 +0000 Subject: [PATCH 4/4] Fix parameter mapping issues and remove invalid parameters from bicepparam files Co-authored-by: dantelmomsft <113094107+dantelmomsft@users.noreply.github.com> --- deploy/aca/infra/main.parameters.bicepparam | 2 +- deploy/aks/infra/main.parameters.bicepparam | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/aca/infra/main.parameters.bicepparam b/deploy/aca/infra/main.parameters.bicepparam index 22928a8..e60a724 100644 --- a/deploy/aca/infra/main.parameters.bicepparam +++ b/deploy/aca/infra/main.parameters.bicepparam @@ -24,7 +24,7 @@ param storageAccountName = readEnvironmentVariable('AZURE_STORAGE_ACCOUNT') param storageResourceGroupName = readEnvironmentVariable('AZURE_STORAGE_RESOURCE_GROUP') param storageSkuName = readEnvironmentVariable('AZURE_STORAGE_SKU', 'Standard_LRS') param chatGptModelName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_MODEL', 'gpt-4o-mini') -param chatGptModelVersion = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_VERSION', '2024-07-18') +param chatGptDeploymentVersion = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_VERSION', '2024-07-18') param chatGptDeploymentName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT', 'gpt-4o-mini') param chatGptDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY', '80')) param chatGptDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME', 'Standard') diff --git a/deploy/aks/infra/main.parameters.bicepparam b/deploy/aks/infra/main.parameters.bicepparam index 47b409a..6089972 100644 --- a/deploy/aks/infra/main.parameters.bicepparam +++ b/deploy/aks/infra/main.parameters.bicepparam @@ -30,7 +30,6 @@ param chatGptDeploymentName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPL param chatGptDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY', '80')) param chatGptDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME', 'Standard') param embeddingModelName = readEnvironmentVariable('AZURE_OPENAI_EMB_MODEL', 'text-embedding-3-large') -param embeddingModelVersion = readEnvironmentVariable('AZURE_OPENAI_EMB_MODEL_VERSION', '1') param embeddingDeploymentName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT', 'text-embedding-3-large') param embeddingDeploymentSkuName = readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_SKU', 'GlobalStandard') param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY', '80'))