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 arm/Microsoft.Web/connections/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ resource connection_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock !
}

module connection_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-Connection-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Web/hostingEnvironments/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ resource appServiceEnvironment_diagnosticSettings 'Microsoft.Insights/diagnostic
}

module appServiceEnvironment_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${uniqueString(deployment().name, location)}-AppService-Rbac-${index}'
name: '${uniqueString(deployment().name, location)}-AppServiceEnv-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Web/serverfarms/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ resource appServicePlan_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lo
}

module appServicePlan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-AppServicePlan-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
10 changes: 5 additions & 5 deletions arm/Microsoft.Web/sites/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ resource appServicePlanExisting 'Microsoft.Web/serverfarms@2021-02-01' existing
}

module appServicePlan '.bicep/nested_serverfarms.bicep' = if (empty(appServicePlanId)) {
name: '${deployment().name}-AppServicePlan'
name: '${uniqueString(deployment().name, location)}-Site-AppServicePlan'
params: {
name: contains(appServicePlanObject, 'name') ? !empty(appServicePlanObject.name) ? appServicePlanObject.name : '${name}-asp' : '${name}-asp'
location: location
Expand All @@ -178,7 +178,7 @@ module appServicePlan '.bicep/nested_serverfarms.bicep' = if (empty(appServicePl
}

module appInsight '.bicep/nested_components.bicep' = if (!empty(appInsightObject)) {
name: '${deployment().name}-AppInsight'
name: '${uniqueString(deployment().name, location)}-Site-AppInsight'
params: {
name: contains(appInsightObject, 'name') ? !empty(appInsightObject.name) ? appInsightObject.name : '${name}-appi' : '${name}-appi'
workspaceResourceId: appInsightObject.workspaceResourceId
Expand All @@ -205,7 +205,7 @@ resource app 'Microsoft.Web/sites@2020-12-01' = {
}

module app_appsettings 'config/deploy.bicep' = {
name: '${deployment().name}-config'
name: '${uniqueString(deployment().name, location)}-Site-Config'
params: {
name: 'appsettings'
appName: app.name
Expand Down Expand Up @@ -239,7 +239,7 @@ resource app_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2017-05-0
}

module app_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${uniqueString(deployment().name, location)}-Rbac-${index}'
name: '${uniqueString(deployment().name, location)}-Site-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand All @@ -248,7 +248,7 @@ module app_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in rol
}]

module app_privateEndpoint '.bicep/nested_privateEndpoint.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
name: '${uniqueString(deployment().name, location)}-AppService-PrivateEndpoints-${index}'
name: '${uniqueString(deployment().name, location)}-Site-PrivateEndpoints-${index}'
params: {
privateEndpointResourceId: app.id
privateEndpointVnetLocation: reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
Expand Down