Skip to content
Merged
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
2 changes: 1 addition & 1 deletion infra/core/networking/private-endpoint.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-02-01' = {
properties: {
privateDnsZoneConfigs: !empty(dnsZoneId) ? [
{
name: 'config1'
name: 'config-${name}-${dnsZoneId}'
properties: {
privateDnsZoneId: dnsZoneId
}
Expand Down
3 changes: 2 additions & 1 deletion infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -1212,8 +1212,9 @@ var cognitiveServicesPrivateEndpointConnection = (usePrivateEndpoint && (!useLoc
{
groupId: 'account'
dnsZoneName: 'privatelink.cognitiveservices.azure.com'
// Only include generic Cognitive Services-based resources (Form Recognizer / Vision / Content Understanding)
// Azure OpenAI uses its own privatelink.openai.azure.com zone and already has a separate private endpoint above.
resourceIds: concat(
[openAi.outputs.resourceId],
!useLocalPdfParser ? [documentIntelligence.outputs.resourceId] : [],
useMultimodal ? [vision.outputs.resourceId] : [],
useMediaDescriberAzureCU ? [contentUnderstanding.outputs.resourceId] : []
Expand Down
6 changes: 4 additions & 2 deletions infra/private-endpoints.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ var privateEndpointInfo = [
resourceId: resourceId
})
]
module privateEndpoints './core/networking/private-endpoint.bicep' = [for privateEndpointInfo in flatten(privateEndpointInfo): {
name: '${privateEndpointInfo.name}-privateendpoint'

module privateEndpoints './core/networking/private-endpoint.bicep' = [for (privateEndpointInfo, i) in flatten(privateEndpointInfo): {
name: '${privateEndpointInfo.name}-${i}-privateendpoint'
params: {
location: location
name: '${privateEndpointInfo.name}${abbrs.privateEndpoint}${resourceToken}'
Expand Down Expand Up @@ -82,6 +83,7 @@ module monitorDnsZones './core/networking/private-dns-zones.bicep' = [for monito
virtualNetworkName: vnetName
}
}]

// Get blob DNS zone index for monitor private link
var blobEndpointInfo = filter(flatten(privateEndpointInfo), info => info.groupId == 'blob')
// Assert that blob endpoints exist (required for this application)
Expand Down
Loading