From 414b40d35723e6bd4b62031e5d1b6fe6ce7da0f3 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Sat, 4 Dec 2021 19:29:25 +0100
Subject: [PATCH] Align avd deployment names

---
 .../applicationgroups/deploy.bicep                            | 4 ++--
 arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep    | 2 +-
 arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
index 85dee69594..5b0032b19b 100644
--- a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep
@@ -122,7 +122,7 @@ resource appGroup_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2017
 }
 
 module appGroup_applications 'applications/deploy.bicep' = [for (application, index) in applications: {
-  name: '${uniqueString(deployment().name, location)}-application-${index}'
+  name: '${uniqueString(deployment().name, location)}-AppGroup-App-${index}'
   params: {
     name: application.name
     appGroupName: appGroup.name
@@ -138,7 +138,7 @@ module appGroup_applications 'applications/deploy.bicep' = [for (application, in
 }]
 
 module appGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-AppGroup-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
index 2040b47157..27e66eb050 100644
--- a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
+++ b/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep
@@ -181,7 +181,7 @@ resource hostPool_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2017
 }
 
 module hostPool_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${uniqueString(deployment().name, location)}-Rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-HostPool-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
index e6a9bd89c7..1b3e137d1f 100644
--- a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
+++ b/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep
@@ -108,7 +108,7 @@ resource workspace_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@201
 }
 
 module workspace_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${uniqueString(deployment().name, location)}-Rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-Workspace-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName