Skip to content

Commit 8225194

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
fix: correct environment variable names for avm and fallback environment variable names to uppercase in scripts
2 parents 13eedaf + 2c6add2 commit 8225194

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎infra/scripts/process_custom_data.sh‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -379,23 +379,23 @@ get_values_from_az_deployment() {
379379
}
380380

381381
# Extract each value using the helper function
382-
storageAccountName=$(extract_value "storageAccountName" "storagE_ACCOUNT_NAME")
383-
fileSystem=$(extract_value "storageContainerName" "storagE_CONTAINER_NAME")
384-
sqlServerName=$(extract_value "sqlDBServer" "sqldB_SERVER")
385-
SqlDatabaseName=$(extract_value "sqlDBDatabase" "sqldB_DATABASE")
386-
backendUserMidClientId=$(extract_value "backendUserMid" "backenD_USER_MID")
387-
backendUserMidDisplayName=$(extract_value "backendUserMidName" "backenD_USER_MID_NAME")
388-
aiSearchName=$(extract_value "azureAISearchName" "azurE_AI_SEARCH_NAME")
389-
searchEndpoint=$(extract_value "azureAISearchEndpoint" "azurE_AI_SEARCH_ENDPOINT")
390-
aif_resource_id=$(extract_value "aiFoundryResourceId" "aI_FOUNDRY_RESOURCE_ID")
391-
cu_foundry_resource_id=$(extract_value "cuFoundryResourceId" "cU_FOUNDRY_RESOURCE_ID")
392-
openaiEndpoint=$(extract_value "azureOpenAIEndpoint" "azurE_OPENAI_ENDPOINT")
393-
embeddingModel=$(extract_value "azureOpenAIEmbeddingModel" "azurE_OPENAI_EMBEDDING_MODEL")
394-
cuEndpoint=$(extract_value "azureOpenAICuEndpoint" "azurE_OPENAI_CU_ENDPOINT")
395-
aiAgentEndpoint=$(extract_value "azureAiAgentEndpoint" "azurE_AI_AGENT_ENDPOINT")
396-
cuApiVersion=$(extract_value "azureContentUnderstandingApiVersion" "azurE_CONTENT_UNDERSTANDING_API_VERSION")
397-
deploymentModel=$(extract_value "azureOpenAIDeploymentModel" "azurE_OPENAI_DEPLOYMENT_MODEL")
398-
solutionName=$(extract_value "solutionName" "solutioN_NAME")
382+
storageAccountName=$(extract_value "storageAccountName" "STORAGE_ACCOUNT_NAME")
383+
fileSystem=$(extract_value "storageContainerName" "STORAGE_CONTAINER_NAME")
384+
sqlServerName=$(extract_value "sqlDBServer" "SQLDB_SERVER")
385+
SqlDatabaseName=$(extract_value "sqlDBDatabase" "SQLDB_DATABASE")
386+
backendUserMidClientId=$(extract_value "backendUserMid" "BACKEND_USER_MID")
387+
backendUserMidDisplayName=$(extract_value "backendUserMidName" "BACKEND_USER_MID_NAME")
388+
aiSearchName=$(extract_value "azureAISearchName" "AZURE_AI_SEARCH_NAME")
389+
searchEndpoint=$(extract_value "azureAISearchEndpoint" "AZURE_AI_SEARCH_ENDPOINT")
390+
aif_resource_id=$(extract_value "aiFoundryResourceId" "AI_FOUNDRY_RESOURCE_ID")
391+
cu_foundry_resource_id=$(extract_value "cuFoundryResourceId" "CU_FOUNDRY_RESOURCE_ID")
392+
openaiEndpoint=$(extract_value "azureOpenAIEndpoint" "AZURE_OPENAI_ENDPOINT")
393+
embeddingModel=$(extract_value "azureOpenAIEmbeddingModel" "AZURE_OPENAI_EMBEDDING_MODEL")
394+
cuEndpoint=$(extract_value "azureOpenAICuEndpoint" "AZURE_OPENAI_CU_ENDPOINT")
395+
aiAgentEndpoint=$(extract_value "azureAiAgentEndpoint" "AZURE_AI_AGENT_ENDPOINT")
396+
cuApiVersion=$(extract_value "azureContentUnderstandingApiVersion" "AZURE_CONTENT_UNDERSTANDING_API_VERSION")
397+
deploymentModel=$(extract_value "azureOpenAIDeploymentModel" "AZURE_OPENAI_DEPLOYMENT_MODEL")
398+
solutionName=$(extract_value "solutionName" "SOLUTION_NAME")
399399

400400
# Strip FQDN suffix from SQL server name if present (Azure CLI needs just the server name)
401401
sqlServerName="${sqlServerName%.database.windows.net}"

‎infra/scripts/process_sample_data.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -390,24 +390,24 @@ get_values_from_az_deployment() {
390390
}
391391

392392
# Extract each value using the helper function
393-
storageAccountName=$(extract_value "storageAccountName" "storagE_ACCOUNT_NAME")
394-
fileSystem=$(extract_value "storageContainerName" "storagE_CONTAINER_NAME")
395-
sqlServerName=$(extract_value "sqlDBServer" "sqldB_SERVER")
396-
SqlDatabaseName=$(extract_value "sqlDBDatabase" "sqldB_DATABASE")
397-
backendUserMidClientId=$(extract_value "backendUserMid" "backenD_USER_MID")
398-
backendUserMidDisplayName=$(extract_value "backendUserMidName" "backenD_USER_MID_NAME")
399-
aiSearchName=$(extract_value "azureAISearchName" "azurE_AI_SEARCH_NAME")
400-
searchEndpoint=$(extract_value "azureAISearchEndpoint" "azurE_AI_SEARCH_ENDPOINT")
401-
aif_resource_id=$(extract_value "aiFoundryResourceId" "aI_FOUNDRY_RESOURCE_ID")
402-
cu_foundry_resource_id=$(extract_value "cuFoundryResourceId" "cU_FOUNDRY_RESOURCE_ID")
403-
openaiEndpoint=$(extract_value "azureOpenAIEndpoint" "azurE_OPENAI_ENDPOINT")
404-
embeddingModel=$(extract_value "azureOpenAIEmbeddingModel" "azurE_OPENAI_EMBEDDING_MODEL")
405-
cuEndpoint=$(extract_value "azureOpenAICuEndpoint" "azurE_OPENAI_CU_ENDPOINT")
406-
aiAgentEndpoint=$(extract_value "azureAiAgentEndpoint" "azurE_AI_AGENT_ENDPOINT")
407-
cuApiVersion=$(extract_value "azureContentUnderstandingApiVersion" "azurE_CONTENT_UNDERSTANDING_API_VERSION")
408-
deploymentModel=$(extract_value "azureOpenAIDeploymentModel" "azurE_OPENAI_DEPLOYMENT_MODEL")
409-
usecase=$(extract_value "useCase" "usE_CASE")
410-
solutionName=$(extract_value "solutionName" "solutioN_NAME")
393+
storageAccountName=$(extract_value "storageAccountName" "STORAGE_ACCOUNT_NAME")
394+
fileSystem=$(extract_value "storageContainerName" "STORAGE_CONTAINER_NAME")
395+
sqlServerName=$(extract_value "sqlDBServer" "SQLDB_SERVER")
396+
SqlDatabaseName=$(extract_value "sqlDBDatabase" "SQLDB_DATABASE")
397+
backendUserMidClientId=$(extract_value "backendUserMid" "BACKEND_USER_MID")
398+
backendUserMidDisplayName=$(extract_value "backendUserMidName" "BACKEND_USER_MID_NAME")
399+
aiSearchName=$(extract_value "azureAISearchName" "AZURE_AI_SEARCH_NAME")
400+
searchEndpoint=$(extract_value "azureAISearchEndpoint" "AZURE_AI_SEARCH_ENDPOINT")
401+
aif_resource_id=$(extract_value "aiFoundryResourceId" "AI_FOUNDRY_RESOURCE_ID")
402+
cu_foundry_resource_id=$(extract_value "cuFoundryResourceId" "CU_FOUNDRY_RESOURCE_ID")
403+
openaiEndpoint=$(extract_value "azureOpenAIEndpoint" "AZURE_OPENAI_ENDPOINT")
404+
embeddingModel=$(extract_value "azureOpenAIEmbeddingModel" "AZURE_OPENAI_EMBEDDING_MODEL")
405+
cuEndpoint=$(extract_value "azureOpenAICuEndpoint" "AZURE_OPENAI_CU_ENDPOINT")
406+
aiAgentEndpoint=$(extract_value "azureAiAgentEndpoint" "AZURE_AI_AGENT_ENDPOINT")
407+
cuApiVersion=$(extract_value "azureContentUnderstandingApiVersion" "AZURE_CONTENT_UNDERSTANDING_API_VERSION")
408+
deploymentModel=$(extract_value "azureOpenAIDeploymentModel" "AZURE_OPENAI_DEPLOYMENT_MODEL")
409+
usecase=$(extract_value "useCase" "USE_CASE")
410+
solutionName=$(extract_value "solutionName" "SOLUTION_NAME")
411411

412412
# Strip FQDN suffix from SQL server name if present (Azure CLI needs just the server name)
413413
sqlServerName="${sqlServerName%.database.windows.net}"

‎infra/scripts/run_create_agents_scripts.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ get_values_from_az_deployment() {
138138
}
139139

140140
# Extract each value using the helper function
141-
projectEndpoint=$(extract_value "azureAiAgentEndpoint" "azurE_AI_AGENT_ENDPOINT")
142-
solutionName=$(extract_value "solutionName" "solutioN_NAME")
143-
gptModelName=$(extract_value "azureAIAgentModelDeploymentName" "azurE_AI_AGENT_MODEL_DEPLOYMENT_NAME")
144-
aiFoundryResourceId=$(extract_value "aiFoundryResourceId" "aI_FOUNDRY_RESOURCE_ID")
145-
apiAppName=$(extract_value "apiAppName" "apI_APP_NAME")
146-
aiSearchConnectionName=$(extract_value "azureAISearchConnectionName" "azurE_AI_SEARCH_CONNECTION_NAME")
147-
aiSearchIndex=$(extract_value "azureAISearchIndex" "azurE_AI_SEARCH_INDEX")
141+
projectEndpoint=$(extract_value "azureAiAgentEndpoint" "AZURE_AI_AGENT_ENDPOINT")
142+
solutionName=$(extract_value "solutionName" "SOLUTION_NAME")
143+
gptModelName=$(extract_value "azureAiAgentModelDeploymentName" "AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME")
144+
aiFoundryResourceId=$(extract_value "aiFoundryResourceId" "AI_FOUNDRY_RESOURCE_ID")
145+
apiAppName=$(extract_value "apiAppName" "API_APP_NAME")
146+
aiSearchConnectionName=$(extract_value "azureAISearchConnectionName" "AZURE_AI_SEARCH_CONNECTION_NAME")
147+
aiSearchIndex=$(extract_value "azureAISearchIndex" "AZURE_AI_SEARCH_INDEX")
148148

149149
# Define required values with their display names for error reporting
150150
declare -A required_values=(

0 commit comments

Comments
 (0)