Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
3f07477
updated linter
ahmadabdalla Dec 5, 2021
bbbde24
updated linter (#6)
ahmadabdalla Dec 5, 2021
dc69b57
test
ahmadabdalla Dec 5, 2021
4d88290
test
ahmadabdalla Dec 5, 2021
b538aa7
test
ahmadabdalla Dec 5, 2021
f438e10
test
ahmadabdalla Dec 5, 2021
86d23b6
test
ahmadabdalla Dec 5, 2021
a25769e
test
ahmadabdalla Dec 5, 2021
1942c99
test
ahmadabdalla Dec 5, 2021
4559341
test
ahmadabdalla Dec 5, 2021
ae1d362
test
ahmadabdalla Dec 5, 2021
ee61b8c
test
ahmadabdalla Dec 6, 2021
9207dfc
test
ahmadabdalla Dec 6, 2021
f1cf040
test
ahmadabdalla Dec 6, 2021
3cd5aea
test
ahmadabdalla Dec 6, 2021
655a45d
test
ahmadabdalla Dec 6, 2021
e1fafc6
test
ahmadabdalla Dec 6, 2021
cd313c7
test
ahmadabdalla Dec 6, 2021
ecd7696
test
ahmadabdalla Dec 6, 2021
6e4c238
test
ahmadabdalla Dec 6, 2021
4b91de5
test
ahmadabdalla Dec 6, 2021
e37a364
test
ahmadabdalla Dec 6, 2021
cb9f838
test
ahmadabdalla Dec 6, 2021
7e137cb
test
ahmadabdalla Dec 6, 2021
7013d57
test
ahmadabdalla Dec 6, 2021
5b7f732
test
ahmadabdalla Dec 6, 2021
4ba2074
test
ahmadabdalla Dec 6, 2021
daf26ac
test
ahmadabdalla Dec 6, 2021
bcb95c0
Merge branch 'main' of https://github.com/ahmadabdalla/ResourceModules
ahmadabdalla Dec 6, 2021
ad1755f
Merge branch 'main' into users/ahmad/links
ahmadabdalla Dec 6, 2021
3fd7486
Users/ahmad/links (#7)
ahmadabdalla Dec 6, 2021
0866798
changed on pull request
ahmadabdalla Dec 6, 2021
c59b889
Users/ahmad/links (#8)
ahmadabdalla Dec 6, 2021
b53297e
linter issues
ahmadabdalla Dec 6, 2021
ac6b9e4
Align Autoaccount deployment names (#738)
eriqua Dec 6, 2021
dd2eb7b
Align compute deployment names (#736)
eriqua Dec 6, 2021
b6b3884
Align Microsoft.ContainerRegistry deployment names (#735)
eriqua Dec 6, 2021
47ff593
Align eventgrid deployment names (#728)
eriqua Dec 6, 2021
2a6a870
Align insights deployment names (#725)
eriqua Dec 6, 2021
d3d8d63
Target NSGs in seperate resource group (#713)
jceval Dec 6, 2021
372d264
Added backup config to rsv module (#755)
AlexanderSehr Dec 6, 2021
700fd2e
Merge remote-tracking branch 'upstream/main' into users/ahmad/links
ahmadabdalla Dec 6, 2021
759e783
test
ahmadabdalla Dec 6, 2021
2f27b15
test
ahmadabdalla Dec 6, 2021
9e44d40
test
ahmadabdalla Dec 6, 2021
50feedb
Merge remote-tracking branch 'upstream/main'
ahmadabdalla Dec 6, 2021
355188b
Merge branch 'main' into users/ahmad/links
ahmadabdalla Dec 6, 2021
597d015
Users/ahmad/links (#9)
ahmadabdalla Dec 6, 2021
1696db5
test
ahmadabdalla Dec 6, 2021
c1d982b
Merge branch 'main' into users/ahmad/links
ahmadabdalla Dec 6, 2021
dd6ed2b
Users/ahmad/links (#10)
ahmadabdalla Dec 6, 2021
15f633d
Merge remote-tracking branch 'origin/main' into users/ahmad/links
ahmadabdalla Dec 6, 2021
c4b5833
test
ahmadabdalla Dec 6, 2021
17746f8
Users/ahmad/links (#11)
ahmadabdalla Dec 6, 2021
d55cc71
Merge remote-tracking branch 'origin/main' into users/ahmad/links
ahmadabdalla Dec 7, 2021
1c45261
test
ahmadabdalla Dec 7, 2021
6801c53
Users/ahmad/links (#12)
ahmadabdalla Dec 7, 2021
ba07cd0
test
ahmadabdalla Dec 7, 2021
b7ec288
test
ahmadabdalla Dec 7, 2021
dbfd0f2
Merge remote-tracking branch 'origin/main' into users/ahmad/links
ahmadabdalla Dec 7, 2021
6e64eaf
Users/ahmad/links (#13)
ahmadabdalla Dec 7, 2021
d5b51a4
test
ahmadabdalla Dec 7, 2021
e4a60b9
test
ahmadabdalla Dec 7, 2021
03c4e8a
test
ahmadabdalla Dec 7, 2021
4e48849
test
ahmadabdalla Dec 7, 2021
62a6ec0
test
ahmadabdalla Dec 7, 2021
83c00ae
test
ahmadabdalla Dec 7, 2021
e2af0cb
test
ahmadabdalla Dec 7, 2021
0f80182
test
ahmadabdalla Dec 7, 2021
dfcb5cc
test
ahmadabdalla Dec 7, 2021
4f813d3
test
ahmadabdalla Dec 7, 2021
1975e95
test
ahmadabdalla Dec 7, 2021
512718b
test
ahmadabdalla Dec 7, 2021
77572de
Merge remote-tracking branch 'origin/main' into users/ahmad/links
ahmadabdalla Dec 7, 2021
4f752e3
test
ahmadabdalla Dec 7, 2021
64a7901
Merge remote-tracking branch 'upstream/users/ahmad/linkCheck' into us…
ahmadabdalla Dec 7, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: '.Platform: Linter'

on: [pull_request]
on: workflow_dispatch

jobs:
build:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
id: checker
uses: lycheeverse/lychee-action@v1.1.1
with:
args: --verbose --no-progress **/*.md --exclude-file .lycheeignore --accept 200,201,403,429
args: --verbose --no-progress **/docs/**/*.md --accept 200,201,403,429
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Automation/automationAccounts/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ module automationAccount_jobSchedules 'jobSchedules/deploy.bicep' = [for (jobSch
}]

module automationAccount_variables 'variables/deploy.bicep' = [for (variable, index) in variables: {
name: '${uniqueString(deployment().name, location)}-AutoAccount-variable-${index}'
name: '${uniqueString(deployment().name, location)}-AutoAccount-Variable-${index}'
params: {
automationAccountName: automationAccount.name
name: variable.name
Expand Down Expand Up @@ -310,7 +310,7 @@ resource automationAccount_diagnosticSettings 'Microsoft.Insights/diagnosticSett
}

module automationAccount_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (endpoint, index) in privateEndpoints: if (!empty(privateEndpoints)) {
name: '${uniqueString(deployment().name, location)}-AutoAccount-PrivateEndpoints-${index}'
name: '${uniqueString(deployment().name, location)}-AutoAccount-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: automationAccount.id
privateEndpointVnetLocation: (empty(privateEndpoints) ? 'dummy' : reference(split(endpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/availabilitySets/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resource availabilitySet_lock 'Microsoft.Authorization/locks@2016-09-01' = if (l
}

module availabilitySet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-AvSet-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2020-12-01' = {
}

module diskEncryptionSet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-DiskEncrSet-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Compute/galleries/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ resource gallery_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != '
}

module gallery_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${uniqueString(deployment().name, location)}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-Gallery-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand All @@ -63,7 +63,7 @@ module gallery_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in

// Images
module galleries_images 'images/deploy.bicep' = [for (image, index) in images: {
name: '${uniqueString(deployment().name, location)}-Image-${index}'
name: '${uniqueString(deployment().name, location)}-Gallery-Image-${index}'
params: {
name: image.name
galleryName: gallery.name
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/galleries/images/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ resource image 'Microsoft.Compute/galleries/images@2020-09-30' = {
}

module galleryImage_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/images/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ resource image 'Microsoft.Compute/images@2021-04-01' = {
}

module image_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-Image-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource proximityPlacementGroup_lock 'Microsoft.Authorization/locks@2016-09-01'
}

module proximityPlacementGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ProxPlaceGroup-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
18 changes: 9 additions & 9 deletions arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ resource vmss 'Microsoft.Compute/virtualMachineScaleSets@2021-04-01' = {
}

module vmss_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJoinConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-DomainJoin'
name: '${uniqueString(deployment().name, location)}-VMSS-DomainJoin'
params: {
virtualMachineScaleSetName: vmss.name
name: 'DomainJoin'
Expand All @@ -464,7 +464,7 @@ module vmss_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJ
}

module vmss_microsoftAntiMalwareExtension 'extensions/deploy.bicep' = if (extensionAntiMalwareConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-MicrosoftAntiMalware'
name: '${uniqueString(deployment().name, location)}-VMSS-MicrosoftAntiMalware'
params: {
virtualMachineScaleSetName: vmss.name
name: 'MicrosoftAntiMalware'
Expand All @@ -483,7 +483,7 @@ resource vmss_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@20
}

module vmss_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (extensionMonitoringAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-MicrosoftMonitoringAgent'
name: '${uniqueString(deployment().name, location)}-VMSS-MicrosoftMonitoringAgent'
params: {
virtualMachineScaleSetName: vmss.name
name: 'MicrosoftMonitoringAgent'
Expand All @@ -502,7 +502,7 @@ module vmss_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (ex
}

module vmss_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDependencyAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-DependencyAgent'
name: '${uniqueString(deployment().name, location)}-VMSS-DependencyAgent'
params: {
virtualMachineScaleSetName: vmss.name
name: 'DependencyAgent'
Expand All @@ -515,7 +515,7 @@ module vmss_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDe
}

module vmss_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-NetworkWatcherAgent'
name: '${uniqueString(deployment().name, location)}-VMSS-NetworkWatcherAgent'
params: {
virtualMachineScaleSetName: vmss.name
name: 'NetworkWatcherAgent'
Expand All @@ -528,7 +528,7 @@ module vmss_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extensi
}

module vmss_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (extensionDSCConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-DesiredStateConfiguration'
name: '${uniqueString(deployment().name, location)}-VMSS-DesiredStateConfiguration'
params: {
virtualMachineScaleSetName: vmss.name
name: 'DesiredStateConfiguration'
Expand All @@ -543,7 +543,7 @@ module vmss_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (e
}

module vmss_customScriptExtension 'extensions/deploy.bicep' = if (extensionCustomScriptConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-CustomScriptExtension'
name: '${uniqueString(deployment().name, location)}-VMSS-CustomScriptExtension'
params: {
virtualMachineScaleSetName: vmss.name
name: 'CustomScriptExtension'
Expand All @@ -563,7 +563,7 @@ module vmss_customScriptExtension 'extensions/deploy.bicep' = if (extensionCusto
}

module vmss_diskEncryptionExtension 'extensions/deploy.bicep' = if (extensionDiskEncryptionConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vmss-DiskEncryption'
name: '${uniqueString(deployment().name, location)}-VMSS-DiskEncryption'
params: {
virtualMachineScaleSetName: vmss.name
name: 'DiskEncryption'
Expand Down Expand Up @@ -603,7 +603,7 @@ resource vmss_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-
}

module vmss_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-VMSS-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var networkSecurityGroup = {
}

module networkInterface_publicIPConfigurations 'nested_networkInterface_publicIPAddress.bicep' = [for (ipConfiguration, index) in ipConfigurationArray: if (contains(ipConfiguration, 'pipconfiguration')) {
name: '${deployment().name}-pip-${index}'
name: '${deployment().name}-PIP-${index}'
params: {
publicIPAddressName: '${virtualMachineName}${ipConfiguration.pipconfiguration.publicIpNameSuffix}'
publicIPPrefixId: (contains(ipConfiguration.pipconfiguration, 'publicIPPrefixId') ? (!(empty(ipConfiguration.pipconfiguration.publicIPPrefixId)) ? ipConfiguration.pipconfiguration.publicIPPrefixId : '') : '')
Expand Down Expand Up @@ -107,7 +107,7 @@ resource networkInterface_diagnosticSettings 'Microsoft.Insights/diagnosticsetti
}

module networkInterface_rbac 'nested_networkInterface_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource publicIpAddress_diagnosticSettings 'Microsoft.Insights/diagnosticsettin
}

module publicIpAddress_rbac 'nested_networkInterface_publicIPAddress_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
22 changes: 11 additions & 11 deletions arm/Microsoft.Compute/virtualMachines/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
}

module virtualMachine_nic '.bicep/nested_networkInterface.bicep' = [for (nicConfiguration, index) in nicConfigurations: {
name: '${uniqueString(deployment().name, location)}-vm-nic-${index}'
name: '${uniqueString(deployment().name, location)}-VM-Nic-${index}'
params: {
networkInterfaceName: '${name}${nicConfiguration.nicSuffix}'
virtualMachineName: name
Expand Down Expand Up @@ -403,7 +403,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2021-07-01' = {
}

module vm_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJoinConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-DomainJoin'
name: '${uniqueString(deployment().name, location)}-VM-DomainJoin'
params: {
virtualMachineName: virtualMachine.name
name: 'DomainJoin'
Expand All @@ -420,7 +420,7 @@ module vm_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJoi
}

module vm_microsoftAntiMalwareExtension 'extensions/deploy.bicep' = if (extensionAntiMalwareConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-MicrosoftAntiMalware'
name: '${uniqueString(deployment().name, location)}-VM-MicrosoftAntiMalware'
params: {
virtualMachineName: virtualMachine.name
name: 'MicrosoftAntiMalware'
Expand All @@ -439,7 +439,7 @@ resource vm_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021
}

module vm_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (extensionMonitoringAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-MicrosoftMonitoringAgent'
name: '${uniqueString(deployment().name, location)}-VM-MicrosoftMonitoringAgent'
params: {
virtualMachineName: virtualMachine.name
name: 'MicrosoftMonitoringAgent'
Expand All @@ -458,7 +458,7 @@ module vm_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (exte
}

module vm_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDependencyAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-DependencyAgent'
name: '${uniqueString(deployment().name, location)}-VM-DependencyAgent'
params: {
virtualMachineName: virtualMachine.name
name: 'DependencyAgent'
Expand All @@ -471,7 +471,7 @@ module vm_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDepe
}

module vm_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-NetworkWatcherAgent'
name: '${uniqueString(deployment().name, location)}-VM-NetworkWatcherAgent'
params: {
virtualMachineName: virtualMachine.name
name: 'NetworkWatcherAgent'
Expand All @@ -484,7 +484,7 @@ module vm_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extension
}

module vm_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (extensionDSCConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-DesiredStateConfiguration'
name: '${uniqueString(deployment().name, location)}-VM-DesiredStateConfiguration'
params: {
virtualMachineName: virtualMachine.name
name: 'DesiredStateConfiguration'
Expand All @@ -499,7 +499,7 @@ module vm_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (ext
}

module vm_customScriptExtension 'extensions/deploy.bicep' = if (extensionCustomScriptConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-CustomScriptExtension'
name: '${uniqueString(deployment().name, location)}-VM-CustomScriptExtension'
params: {
virtualMachineName: virtualMachine.name
name: 'CustomScriptExtension'
Expand All @@ -519,7 +519,7 @@ module vm_customScriptExtension 'extensions/deploy.bicep' = if (extensionCustomS
}

module vm_diskEncryptionExtension 'extensions/deploy.bicep' = if (extensionDiskEncryptionConfig.enabled) {
name: '${uniqueString(deployment().name, location)}-vm-DiskEncryption'
name: '${uniqueString(deployment().name, location)}-VM-DiskEncryption'
params: {
virtualMachineName: virtualMachine.name
name: 'DiskEncryption'
Expand All @@ -538,7 +538,7 @@ module vm_diskEncryptionExtension 'extensions/deploy.bicep' = if (extensionDiskE
}

module virtualMachine_backup '.bicep/nested_backup.bicep' = if (!empty(backupVaultName)) {
name: '${uniqueString(deployment().name, location)}-vm-backup'
name: '${uniqueString(deployment().name, location)}-VM-Backup'
params: {
backupResourceName: '${backupVaultName}/Azure/iaasvmcontainer;iaasvmcontainerv2;${resourceGroup().name};${virtualMachine.name}/vm;iaasvmcontainerv2;${resourceGroup().name};${virtualMachine.name}'
protectedItemType: 'Microsoft.Compute/virtualMachines'
Expand Down Expand Up @@ -568,7 +568,7 @@ resource virtualMachine_lock 'Microsoft.Authorization/locks@2017-04-01' = if (lo
}

module virtualMachine_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${uniqueString(deployment().name, location)}-vm-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-VM-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
6 changes: 3 additions & 3 deletions arm/Microsoft.ContainerRegistry/registries/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,16 @@ resource registry_diagnosticSettingName 'Microsoft.Insights/diagnosticsettings@2
}

module registry_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ContainerRegistry-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
resourceId: registry.id
}
}]

module registry_privateEndpoints '.bicep/nested_privateEndpoints.bicep' = [for privateEndpoint in privateEndpoints: {
name: '${uniqueString(deployment().name, privateEndpoint.name)}-privateEndpoint'
module registry_privateEndpoints '.bicep/nested_privateEndpoints.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
name: '${uniqueString(deployment().name, location)}-ContainerRegistry-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: registry.id
privateEndpointVnetLocation: empty(privateEndpoints) ? 'dummy' : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.EventGrid/topics/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ resource eventGrid_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@201
}

module eventGrid_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (privateEndpoint, index) in privateEndpoints: if (!empty(privateEndpoints)) {
name: '${uniqueString(deployment().name, location)}-EventGrid-PrivateEndpoints-${index}'
name: '${uniqueString(deployment().name, location)}-EventGrid-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: eventGrid.id
privateEndpointVnetLocation: (empty(privateEndpoints) ? 'dummy' : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)
Expand All @@ -132,7 +132,7 @@ module eventGrid_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (
}]

module eventGrid_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-EventGrid-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/actionGroups/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource actionGroup 'microsoft.insights/actionGroups@2019-06-01' = {
}

module actionGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ActionGroup-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = {
}

module activityLogAlert_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-ActivityLogAlert-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/components/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ resource appInsights 'Microsoft.Insights/components@2020-02-02' = {
}

module appInsights_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-AppInsights-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/metricAlerts/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = {
}

module metricAlert_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-MetricAlert-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
Loading