From 81e3d1938feddb1e40096b7c242e2c1cbf446b28 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Fri, 3 Dec 2021 13:55:37 +0100
Subject: [PATCH] update depl names web rp

---
 arm/Microsoft.Web/connections/deploy.bicep         |  2 +-
 arm/Microsoft.Web/hostingEnvironments/deploy.bicep |  2 +-
 arm/Microsoft.Web/serverfarms/deploy.bicep         |  2 +-
 arm/Microsoft.Web/sites/deploy.bicep               | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arm/Microsoft.Web/connections/deploy.bicep b/arm/Microsoft.Web/connections/deploy.bicep
index ccf3fdceed..2dc6d4f27b 100644
--- a/arm/Microsoft.Web/connections/deploy.bicep
+++ b/arm/Microsoft.Web/connections/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep b/arm/Microsoft.Web/hostingEnvironments/deploy.bicep
index b6e74c2a98..4bbaf938fd 100644
--- a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep
+++ b/arm/Microsoft.Web/hostingEnvironments/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Web/serverfarms/deploy.bicep b/arm/Microsoft.Web/serverfarms/deploy.bicep
index 459dcf8946..adb0fae658 100644
--- a/arm/Microsoft.Web/serverfarms/deploy.bicep
+++ b/arm/Microsoft.Web/serverfarms/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep
index 781c3f28cb..8eb7479fc3 100644
--- a/arm/Microsoft.Web/sites/deploy.bicep
+++ b/arm/Microsoft.Web/sites/deploy.bicep
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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