From 53f8c942f814086a07daffeaf567420775767e12 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:02:29 +0100 Subject: [PATCH 1/7] align network deployments 01 --- arm/Microsoft.Network/applicationGateways/deploy.bicep | 2 +- .../applicationSecurityGroups/deploy.bicep | 2 +- arm/Microsoft.Network/azureFirewalls/deploy.bicep | 2 +- arm/Microsoft.Network/bastionHosts/deploy.bicep | 4 ++-- arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep | 2 +- arm/Microsoft.Network/expressRouteCircuits/deploy.bicep | 2 +- arm/Microsoft.Network/ipGroups/deploy.bicep | 2 +- arm/Microsoft.Network/loadBalancers/deploy.bicep | 2 +- arm/Microsoft.Network/localNetworkGateways/deploy.bicep | 2 +- arm/Microsoft.Network/natGateways/deploy.bicep | 2 +- arm/Microsoft.Network/networkSecurityGroups/deploy.bicep | 2 +- arm/Microsoft.Network/networkWatchers/deploy.bicep | 8 ++++---- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arm/Microsoft.Network/applicationGateways/deploy.bicep b/arm/Microsoft.Network/applicationGateways/deploy.bicep index 029502bab3..f355e88c29 100644 --- a/arm/Microsoft.Network/applicationGateways/deploy.bicep +++ b/arm/Microsoft.Network/applicationGateways/deploy.bicep @@ -415,7 +415,7 @@ resource applicationGateway_diagnosticSettingName 'Microsoft.Insights/diagnostic } module applicationGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-AppGateway-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep index a816ca558b..6f8dfe041c 100644 --- a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep @@ -43,7 +43,7 @@ resource applicationSecurityGroup_lock 'Microsoft.Authorization/locks@2016-09-01 } module applicationSecurityGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-AppSecurityGroup-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/azureFirewalls/deploy.bicep b/arm/Microsoft.Network/azureFirewalls/deploy.bicep index 1ad0af286c..ba39fa02d6 100644 --- a/arm/Microsoft.Network/azureFirewalls/deploy.bicep +++ b/arm/Microsoft.Network/azureFirewalls/deploy.bicep @@ -244,7 +244,7 @@ resource azureFirewall_diagnosticSettings 'Microsoft.Insights/diagnosticSettings } module azureFirewall_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-AzFW-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/bastionHosts/deploy.bicep b/arm/Microsoft.Network/bastionHosts/deploy.bicep index aa2569d5c5..ac42c4cb28 100644 --- a/arm/Microsoft.Network/bastionHosts/deploy.bicep +++ b/arm/Microsoft.Network/bastionHosts/deploy.bicep @@ -75,7 +75,7 @@ resource publicIPAddressExisting 'Microsoft.Network/publicIPAddresses@2021-02-01 } module publicIPAddress '.bicep/nested_publicIPAddress.bicep' = if (empty(publicIPAddressId)) { - name: '${uniqueString(deployment().name, location)}-bastion-pip' + name: '${uniqueString(deployment().name, location)}-Bastion-PIP' params: { name: contains(publicIPAddressObject, 'name') ? (!(empty(publicIPAddressObject.name)) ? publicIPAddressObject.name : '${name}-pip') : '${name}-pip' publicIPPrefixResourceId: contains(publicIPAddressObject, 'publicIPPrefixResourceId') ? (!(empty(publicIPAddressObject.publicIPPrefixResourceId)) ? publicIPAddressObject.publicIPPrefixResourceId : '') : '' @@ -151,7 +151,7 @@ resource azureBastion_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ } module azureBastion_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-bastion-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-Bastion-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep index 64ec70bcbf..e966c8771c 100644 --- a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep +++ b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep @@ -44,7 +44,7 @@ resource ddosProtectionPlan_lock 'Microsoft.Authorization/locks@2016-09-01' = if } module ddosProtectionPlan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-DDoSProtectionPlan-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep index 5327c5be27..821ee9780f 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep +++ b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep @@ -187,7 +187,7 @@ resource expressRouteCircuits_diagnosticSettings 'Microsoft.Insights/diagnosticS } module expressRouteCircuits_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-ER-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/arm/Microsoft.Network/ipGroups/deploy.bicep index 4be7106c8f..a3ab783a2e 100644 --- a/arm/Microsoft.Network/ipGroups/deploy.bicep +++ b/arm/Microsoft.Network/ipGroups/deploy.bicep @@ -49,7 +49,7 @@ resource ipGroup_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != ' } module ipGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-IpGroup-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/loadBalancers/deploy.bicep b/arm/Microsoft.Network/loadBalancers/deploy.bicep index aa7cb17d72..49dd00adf9 100644 --- a/arm/Microsoft.Network/loadBalancers/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/deploy.bicep @@ -176,7 +176,7 @@ resource loadBalancer_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ } module loadBalancer_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-LoadBalancer-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep index 3b71f11f5c..1b8e72fb03 100644 --- a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep @@ -75,7 +75,7 @@ resource localNetworkGateway_lock 'Microsoft.Authorization/locks@2016-09-01' = i } module localNetworkGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-LocalNetworkGateway-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/natGateways/deploy.bicep b/arm/Microsoft.Network/natGateways/deploy.bicep index c9181b278e..69003a877c 100644 --- a/arm/Microsoft.Network/natGateways/deploy.bicep +++ b/arm/Microsoft.Network/natGateways/deploy.bicep @@ -184,7 +184,7 @@ resource natGateway_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock ! } module natGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-NatGateway-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep index 300ba6f5d0..08731584e7 100644 --- a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep @@ -115,7 +115,7 @@ resource networkSecurityGroup_diagnosticSettings 'Microsoft.Insights/diagnosticS } module networkSecurityGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-NSG-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/networkWatchers/deploy.bicep b/arm/Microsoft.Network/networkWatchers/deploy.bicep index 3e4372b8d4..ae1b5a7fd4 100644 --- a/arm/Microsoft.Network/networkWatchers/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/deploy.bicep @@ -50,7 +50,7 @@ resource networkWatcher_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lo } module networkWatcher_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-NW-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName @@ -58,8 +58,8 @@ module networkWatcher_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, in } }] -module networkWatcher_connectionMonitors 'connectionMonitors/deploy.bicep' = [for connectionMonitor in connectionMonitors: { - name: connectionMonitor.name +module networkWatcher_connectionMonitors 'connectionMonitors/deploy.bicep' = [for (connectionMonitor, index) in connectionMonitors: { + name: '${uniqueString(deployment().name, location)}-NW-ConnectionMonitor-${index}' params: { endpoints: contains(connectionMonitor, 'endpoints') ? connectionMonitor.endpoints : [] name: connectionMonitor.name @@ -71,7 +71,7 @@ module networkWatcher_connectionMonitors 'connectionMonitors/deploy.bicep' = [fo }] module networkWatcher_flowLogs 'flowLogs/deploy.bicep' = [for (flowLog, index) in flowLogs: { - name: '${deployment().name}-flowLog-${index}' + name: '${uniqueString(deployment().name, location)}-NW-FlowLog-${index}' params: { enabled: contains(flowLog, 'enabled') ? flowLog.enabled : true formatVersion: contains(flowLog, 'formatVersion') ? flowLog.formatVersion : 2 From c69759d303f26f5edfb7c2d4e304ac32ec4c774e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:48:09 +0100 Subject: [PATCH 2/7] align network deployments 02 --- .../privateDnsZones/deploy.bicep | 4 ++-- .../privateEndpoints/deploy.bicep | 4 ++-- .../publicIPAddresses/deploy.bicep | 2 +- .../publicIPPrefixes/deploy.bicep | 2 +- .../routeTables/deploy.bicep | 2 +- .../trafficmanagerprofiles/deploy.bicep | 24 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/deploy.bicep index 5869a04486..55c377fe4c 100644 --- a/arm/Microsoft.Network/privateDnsZones/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/deploy.bicep @@ -36,7 +36,7 @@ resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' = { } module privateDnsZone_virtualNetworkLinks 'virtualNetworkLinks/deploy.bicep' = [for (virtualNetworkLinks, index) in virtualNetworkLinks: { - name: '${deployment().name}-virtualNetworkLink-${index}' + name: '${uniqueString(deployment().name, location)}-PrivateDnsZone-VirtualNetworkLink-${index}' params: { privateDnsZoneName: privateDnsZone.name name: contains(virtualNetworkLinks, 'name') ? virtualNetworkLinks.name : last(split(virtualNetworkLinks.virtualNetworkResourceId, '/')) @@ -57,7 +57,7 @@ resource privateDnsZone_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lo } module privateDnsZone_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-PrivateDnsZone-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/privateEndpoints/deploy.bicep b/arm/Microsoft.Network/privateEndpoints/deploy.bicep index 28ccf11312..a171cb9816 100644 --- a/arm/Microsoft.Network/privateEndpoints/deploy.bicep +++ b/arm/Microsoft.Network/privateEndpoints/deploy.bicep @@ -61,7 +61,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = { } module privateEndpoint_privateDnsZoneGroups 'privateDnsZoneGroups/deploy.bicep' = [for (privateDnsZoneGroup, index) in privateDnsZoneGroups: { - name: '${deployment().name}-privateDnsZoneGroup-${index}' + name: '${uniqueString(deployment().name, location)}-PrivateEndpoint-PrivateDnsZoneGroup-${index}' params: { privateDNSResourceIds: privateDnsZoneGroup.privateDNSResourceIds privateEndpointName: privateEndpoint.name @@ -78,7 +78,7 @@ resource privateEndpoint_lock 'Microsoft.Authorization/locks@2016-09-01' = if (l } module privateEndpoint_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-PrivateEndpoint-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep index 532406aaf2..b845edbce1 100644 --- a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep +++ b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep @@ -138,7 +138,7 @@ resource publicIpAddress_diagnosticSettings 'Microsoft.Insights/diagnosticSettin } module publicIpAddress_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-PIPAddress-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep index faa425ea6f..3b02f8aef7 100644 --- a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep +++ b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep @@ -55,7 +55,7 @@ resource publicIpPrefix_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lo } module publicIpPrefix_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-PIPPrefix-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/routeTables/deploy.bicep b/arm/Microsoft.Network/routeTables/deploy.bicep index ed6718d3a1..523c26479a 100644 --- a/arm/Microsoft.Network/routeTables/deploy.bicep +++ b/arm/Microsoft.Network/routeTables/deploy.bicep @@ -52,7 +52,7 @@ resource routeTable_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock ! } module routeTable_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-RouteTable-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep index edd9b82b4b..2486ba9e78 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep +++ b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep @@ -120,7 +120,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource trafficmanagerprofile 'Microsoft.Network/trafficmanagerprofiles@2018-08-01' = { +resource trafficManagerProfile 'Microsoft.Network/trafficmanagerprofiles@2018-08-01' = { name: name tags: tags location: 'global' @@ -138,17 +138,17 @@ resource trafficmanagerprofile 'Microsoft.Network/trafficmanagerprofiles@2018-08 } } -resource trafficmanagerprofile_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != 'NotSpecified') { - name: '${trafficmanagerprofile.name}-${lock}-lock' +resource trafficManagerProfile_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != 'NotSpecified') { + name: '${trafficManagerProfile.name}-${lock}-lock' properties: { level: lock notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' } - scope: trafficmanagerprofile + scope: trafficManagerProfile } -resource trafficmanagerprofile_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2017-05-01-preview' = if (!empty(diagnosticStorageAccountId) || !empty(workspaceId) || !empty(eventHubAuthorizationRuleId) || !empty(eventHubName)) { - name: '${trafficmanagerprofile.name}-diagnosticSettings' +resource trafficManagerProfile_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2017-05-01-preview' = if (!empty(diagnosticStorageAccountId) || !empty(workspaceId) || !empty(eventHubAuthorizationRuleId) || !empty(eventHubName)) { + name: '${trafficManagerProfile.name}-diagnosticSettings' properties: { storageAccountId: empty(diagnosticStorageAccountId) ? null : diagnosticStorageAccountId workspaceId: empty(workspaceId) ? null : workspaceId @@ -157,23 +157,23 @@ resource trafficmanagerprofile_diagnosticSettings 'Microsoft.Insights/diagnostic metrics: empty(diagnosticStorageAccountId) && empty(workspaceId) && empty(eventHubAuthorizationRuleId) && empty(eventHubName) ? null : diagnosticsMetrics logs: empty(diagnosticStorageAccountId) && empty(workspaceId) && empty(eventHubAuthorizationRuleId) && empty(eventHubName) ? null : diagnosticsLogs } - scope: trafficmanagerprofile + scope: trafficManagerProfile } -module trafficmanagerprofile_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' +module trafficManagerProfile_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { + name: '${uniqueString(deployment().name, resourceGroup().location)}-TrafficManager-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName - resourceId: trafficmanagerprofile.id + resourceId: trafficManagerProfile.id } }] @description('The resource ID of the traffix manager') -output trafficManagerResourceId string = trafficmanagerprofile.id +output trafficManagerResourceId string = trafficManagerProfile.id @description('The resource group the traffix manager was deployed into') output trafficManagerResourceGroup string = resourceGroup().name @description('The name of the traffix manager was deployed into') -output trafficManagerName string = trafficmanagerprofile.name +output trafficManagerName string = trafficManagerProfile.name From 33aad20b3e20f3629ccc4e1d47b06bf3951e5290 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:54:16 +0100 Subject: [PATCH 3/7] align network deployments 03 --- arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep | 2 +- arm/Microsoft.Network/virtualNetworks/deploy.bicep | 4 ++-- arm/Microsoft.Network/virtualWans/deploy.bicep | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep index 9ce1eeee50..f5ddfb3ac0 100644 --- a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep @@ -364,7 +364,7 @@ resource virtualNetworkGateway_diagnosticSettings 'Microsoft.Insights/diagnostic } module virtualNetworkGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-VNetGateway-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/deploy.bicep index 45bc866028..e72405a788 100644 --- a/arm/Microsoft.Network/virtualNetworks/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/deploy.bicep @@ -129,7 +129,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' = { } module virtualNetworkPeerings_resource 'virtualNetworkPeerings/deploy.bicep' = [for (virtualNetworkPeering, index) in virtualNetworkPeerings: { - name: '${uniqueString(deployment().name, location)}-virtualNetworkPeering-${index}' + name: '${uniqueString(deployment().name, location)}-VNet-VNetPeering-${index}' params: { localVnetName: name remoteVirtualNetworkId: virtualNetworkPeering.remoteVirtualNetworkId @@ -165,7 +165,7 @@ resource appServiceEnvironment_diagnosticSettings 'Microsoft.Insights/diagnostic } module virtualNetwork_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-Vnet-Rbac-${index}' + name: '${uniqueString(deployment().name, location)}-VNet-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName diff --git a/arm/Microsoft.Network/virtualWans/deploy.bicep b/arm/Microsoft.Network/virtualWans/deploy.bicep index 7e092fb8af..d1c436a893 100644 --- a/arm/Microsoft.Network/virtualWans/deploy.bicep +++ b/arm/Microsoft.Network/virtualWans/deploy.bicep @@ -171,7 +171,7 @@ resource vpnGateway_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock ! } module virtualWan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${deployment().name}-rbac-${index}' + name: '${uniqueString(deployment().name, location)}-VWan-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName From e9d0dd85c781cd69f333aa43c9a5afe98d66b68d Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:55:56 +0100 Subject: [PATCH 4/7] align network deployments 04 --- arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep index 2486ba9e78..21656c9419 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep +++ b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep @@ -161,7 +161,7 @@ resource trafficManagerProfile_diagnosticSettings 'Microsoft.Insights/diagnostic } module trafficManagerProfile_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, resourceGroup().location)}-TrafficManager-Rbac-${index}' + name: '${uniqueString(deployment().name, resourceGroup().location)}-TrafficManagerProfile-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName From 7e91ebe25f00bc780dbcc39123cf5c064744f3f6 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:58:27 +0100 Subject: [PATCH 5/7] align network deployments 05 --- arm/Microsoft.Network/expressRouteCircuits/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep index 821ee9780f..50ae2cfe99 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep +++ b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep @@ -187,7 +187,7 @@ resource expressRouteCircuits_diagnosticSettings 'Microsoft.Insights/diagnosticS } module expressRouteCircuits_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-ER-Rbac-${index}' + name: '${uniqueString(deployment().name, location)}-ExpRouteCircuits-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName From 29d89201e95dfbcff55358d49854b9758dc1b76a Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 15:59:18 +0100 Subject: [PATCH 6/7] align network deployments 06 --- arm/Microsoft.Network/ipGroups/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/arm/Microsoft.Network/ipGroups/deploy.bicep index a3ab783a2e..8b768638f0 100644 --- a/arm/Microsoft.Network/ipGroups/deploy.bicep +++ b/arm/Microsoft.Network/ipGroups/deploy.bicep @@ -49,7 +49,7 @@ resource ipGroup_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != ' } module ipGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-IpGroup-Rbac-${index}' + name: '${uniqueString(deployment().name, location)}-IPGroup-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName From 3818f53eb1352ad6ecdf7f464b08c4e1f8a57980 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 4 Dec 2021 16:08:47 +0100 Subject: [PATCH 7/7] align network deployments 07 --- arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep index 21656c9419..1ebf0e1fe0 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep +++ b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep @@ -161,7 +161,7 @@ resource trafficManagerProfile_diagnosticSettings 'Microsoft.Insights/diagnostic } module trafficManagerProfile_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, resourceGroup().location)}-TrafficManagerProfile-Rbac-${index}' + name: '${uniqueString(deployment().name)}-TrafficManagerProfile-Rbac-${index}' params: { principalIds: roleAssignment.principalIds roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName