Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ var dnsZoneIndex = {
// - Deploys all zones if no existing Foundry project is used
// - Excludes AI-related zones when using with an existing Foundry project
// ===================================================
@batchSize(5)
@batchSize(10)
module avmPrivateDnsZones './modules/private-dns-zone/private-dns-zone.bicep' = [
for (zone, i) in privateDnsZones: if (enablePrivateNetworking) {
name: 'avm.res.network.private-dns-zone.${contains(zone, 'azurecontainerapps.io') ? 'containerappenv' : split(zone, '.')[1]}'
Expand Down Expand Up @@ -989,7 +989,6 @@ module openai 'modules/core/ai/cognitiveservices.bicep' = {
: []
)
}
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
}

module computerVision 'modules/core/ai/cognitiveservices.bicep' = if (useAdvancedImageProcessing) {
Expand Down Expand Up @@ -1030,7 +1029,6 @@ module computerVision 'modules/core/ai/cognitiveservices.bicep' = if (useAdvance
: []
)
}
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
}

// The Web socket from front end application connects to Speech service over a public internet and it does not work over a Private endpoint.
Expand Down Expand Up @@ -1074,7 +1072,7 @@ module speechService 'modules/core/ai/cognitiveservices.bicep' = {
: []
)
}
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
// Speech service always uses public networking (enablePrivateNetworkingSpeech = false), no DNS zone dependency needed
}

resource search 'Microsoft.Search/searchServices@2024-06-01-preview' = if (databaseType == 'CosmosDB') {
Expand Down Expand Up @@ -1230,12 +1228,12 @@ module web 'modules/app/web.bicep' = {
{
AZURE_BLOB_ACCOUNT_NAME: storageAccountName
AZURE_BLOB_CONTAINER_NAME: blobContainerName
AZURE_FORM_RECOGNIZER_ENDPOINT: formrecognizer.outputs.endpoint
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? computerVision!.outputs.endpoint : ''
AZURE_FORM_RECOGNIZER_ENDPOINT: 'https://${formRecognizerName}.cognitiveservices.azure.com/'
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? 'https://${computerVisionName}.cognitiveservices.azure.com/' : ''
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION: computerVisionVectorizeImageApiVersion
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION: computerVisionVectorizeImageModelVersion
AZURE_CONTENT_SAFETY_ENDPOINT: contentsafety.outputs.endpoint
AZURE_KEY_VAULT_ENDPOINT: keyvault.outputs.uri
AZURE_CONTENT_SAFETY_ENDPOINT: 'https://${contentSafetyName}.cognitiveservices.azure.com/'
AZURE_KEY_VAULT_ENDPOINT: 'https://${keyVaultName}${environment().suffixes.keyvaultDns}/'
AZURE_OPENAI_RESOURCE: azureOpenAIResourceName
AZURE_OPENAI_MODEL: azureOpenAIModel
AZURE_OPENAI_MODEL_NAME: azureOpenAIModelName
Expand All @@ -1253,7 +1251,7 @@ module web 'modules/app/web.bicep' = {
AZURE_SPEECH_SERVICE_NAME: speechServiceName
AZURE_SPEECH_SERVICE_REGION: location
AZURE_SPEECH_RECOGNIZER_LANGUAGES: recognizedLanguages
AZURE_SPEECH_REGION_ENDPOINT: speechService.outputs.endpoint
AZURE_SPEECH_REGION_ENDPOINT: 'https://${speechServiceName}.cognitiveservices.azure.com/'
USE_ADVANCED_IMAGE_PROCESSING: useAdvancedImageProcessing ? 'true' : 'false'
ADVANCED_IMAGE_PROCESSING_MAX_IMAGES: string(advancedImageProcessingMaxImages)
ORCHESTRATION_STRATEGY: orchestrationStrategy
Expand Down Expand Up @@ -1333,12 +1331,12 @@ module adminweb 'modules/app/adminweb.bicep' = {
{
AZURE_BLOB_ACCOUNT_NAME: storageAccountName
AZURE_BLOB_CONTAINER_NAME: blobContainerName
AZURE_FORM_RECOGNIZER_ENDPOINT: formrecognizer.outputs.endpoint
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? computerVision!.outputs.endpoint : ''
AZURE_FORM_RECOGNIZER_ENDPOINT: 'https://${formRecognizerName}.cognitiveservices.azure.com/'
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? 'https://${computerVisionName}.cognitiveservices.azure.com/' : ''
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION: computerVisionVectorizeImageApiVersion
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION: computerVisionVectorizeImageModelVersion
AZURE_CONTENT_SAFETY_ENDPOINT: contentsafety.outputs.endpoint
AZURE_KEY_VAULT_ENDPOINT: keyvault.outputs.uri
AZURE_CONTENT_SAFETY_ENDPOINT: 'https://${contentSafetyName}.cognitiveservices.azure.com/'
AZURE_KEY_VAULT_ENDPOINT: 'https://${keyVaultName}${environment().suffixes.keyvaultDns}/'
AZURE_OPENAI_RESOURCE: azureOpenAIResourceName
AZURE_OPENAI_MODEL: azureOpenAIModel
AZURE_OPENAI_MODEL_NAME: azureOpenAIModelName
Expand Down Expand Up @@ -1440,12 +1438,12 @@ module function 'modules/app/function.bicep' = {
{
AZURE_BLOB_ACCOUNT_NAME: storageAccountName
AZURE_BLOB_CONTAINER_NAME: blobContainerName
AZURE_FORM_RECOGNIZER_ENDPOINT: formrecognizer.outputs.endpoint
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? computerVision!.outputs.endpoint : ''
AZURE_FORM_RECOGNIZER_ENDPOINT: 'https://${formRecognizerName}.cognitiveservices.azure.com/'
AZURE_COMPUTER_VISION_ENDPOINT: useAdvancedImageProcessing ? 'https://${computerVisionName}.cognitiveservices.azure.com/' : ''
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION: computerVisionVectorizeImageApiVersion
AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION: computerVisionVectorizeImageModelVersion
AZURE_CONTENT_SAFETY_ENDPOINT: contentsafety.outputs.endpoint
AZURE_KEY_VAULT_ENDPOINT: keyvault.outputs.uri
AZURE_CONTENT_SAFETY_ENDPOINT: 'https://${contentSafetyName}.cognitiveservices.azure.com/'
AZURE_KEY_VAULT_ENDPOINT: 'https://${keyVaultName}${environment().suffixes.keyvaultDns}/'
AZURE_OPENAI_MODEL: azureOpenAIModel
AZURE_OPENAI_MODEL_NAME: azureOpenAIModelName
AZURE_OPENAI_MODEL_VERSION: azureOpenAIModelVersion
Expand Down Expand Up @@ -1571,7 +1569,6 @@ module formrecognizer 'modules/core/ai/cognitiveservices.bicep' = {
: []
)
}
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
}

module contentsafety 'modules/core/ai/cognitiveservices.bicep' = {
Expand Down Expand Up @@ -1611,7 +1608,6 @@ module contentsafety 'modules/core/ai/cognitiveservices.bicep' = {
: []
)
}
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
}

// If advanced image processing is used, storage account already should be publicly accessible.
Expand Down
Loading
Loading