Review remarks

Azure · Nov 4, 2024 · 07d1822 · 07d1822
1 parent 6e500c6
commit 07d1822
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/dev-infrastructure/modules/maestro/maestro-infra.bicep b/dev-infrastructure/modules/maestro/maestro-infra.bicep
@@ -254,14 +254,5 @@ resource maestroConsumersPublishTopicspacePermissionBinding 'Microsoft.EventGrid
   }
 }
 
-var privateDnsZoneName = 'privatelink.ts.eventgrid.azure.net'
-
-// TODO: find a place for this
-resource eventGridPrivateEndpointDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
-  name: privateDnsZoneName
-  location: 'global'
-  properties: {}
-}
-
 output keyVaultName string = kv.name
 output eventGridNamespaceName string = eventGridNamespace.name
diff --git a/dev-infrastructure/modules/private-endpoint.bicep b/dev-infrastructure/modules/private-endpoint.bicep
@@ -11,8 +11,10 @@ param privateEndpointDnsZoneName string
 
 param vnetId string
 
-resource privateEndpointDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = {
+resource eventGridPrivateEndpointDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
   name: privateEndpointDnsZoneName
+  location: 'global'
+  properties: {}
 }
 
 resource eventGridPrivatEndpoint 'Microsoft.Network/privateEndpoints@2023-09-01' = [
@@ -38,14 +40,14 @@ resource eventGridPrivatEndpoint 'Microsoft.Network/privateEndpoints@2023-09-01'
 
 resource privateEndpointDnsGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2023-09-01' = [
   for index in range(0, length(subnetIds)): {
-    name: '${serviceType}-dns-group'
+    name: '${serviceType}-${uniqueString(subnetIds[index])}'
     parent: eventGridPrivatEndpoint[index]
     properties: {
       privateDnsZoneConfigs: [
         {
           name: 'config1'
           properties: {
-            privateDnsZoneId: privateEndpointDnsZone.id
+            privateDnsZoneId: eventGridPrivateEndpointDnsZone.id
           }
         }
       ]
@@ -55,7 +57,7 @@ resource privateEndpointDnsGroup 'Microsoft.Network/privateEndpoints/privateDnsZ
 
 resource eventGridPrivateDnsZoneVnetLink 'Microsoft.Network/privateDnsZones/virtualNetworkLinks@2020-06-01' = {
   name: uniqueString('eventgrid-${uniqueString(vnetId)}')
-  parent: privateEndpointDnsZone
+  parent: eventGridPrivateEndpointDnsZone
   location: 'global'
   properties: {
     registrationEnabled: false