From d1aedf3a6dd9ccb54a6c0d15178c5fd1d29773d7 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Sat, 4 Dec 2021 18:34:58 +0100
Subject: [PATCH] Align insights deployment names

---
 arm/Microsoft.Insights/actionGroups/deploy.bicep        | 2 +-
 arm/Microsoft.Insights/activityLogAlerts/deploy.bicep   | 2 +-
 arm/Microsoft.Insights/components/deploy.bicep          | 2 +-
 arm/Microsoft.Insights/metricAlerts/deploy.bicep        | 2 +-
 arm/Microsoft.Insights/privateLinkScopes/deploy.bicep   | 6 +++---
 arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arm/Microsoft.Insights/actionGroups/deploy.bicep b/arm/Microsoft.Insights/actionGroups/deploy.bicep
index e0474a0671..08c650ab9b 100644
--- a/arm/Microsoft.Insights/actionGroups/deploy.bicep
+++ b/arm/Microsoft.Insights/actionGroups/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
index 34b01321c3..404c0d8f50 100644
--- a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
+++ b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Insights/components/deploy.bicep b/arm/Microsoft.Insights/components/deploy.bicep
index bcfd1f2934..a9fac14def 100644
--- a/arm/Microsoft.Insights/components/deploy.bicep
+++ b/arm/Microsoft.Insights/components/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Insights/metricAlerts/deploy.bicep b/arm/Microsoft.Insights/metricAlerts/deploy.bicep
index 071eb9ae53..47e9428de0 100644
--- a/arm/Microsoft.Insights/metricAlerts/deploy.bicep
+++ b/arm/Microsoft.Insights/metricAlerts/deploy.bicep
@@ -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
diff --git a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
index 5a95a5f04c..da84b93f41 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
+++ b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
@@ -41,7 +41,7 @@ resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-previ
 }
 
 module privateLinkScope_scopedResource 'scopedResources/deploy.bicep' = [for (scopedResource, index) in scopedResources: {
-  name: '${uniqueString(deployment().name, location)}-Insights-ScpdRes-${index}'
+  name: '${uniqueString(deployment().name, location)}-PvtLinkScope-ScopedRes-${index}'
   params: {
     name: scopedResource.name
     privateLinkScopeName: privateLinkScope.name
@@ -59,7 +59,7 @@ resource privateLinkScope_lock 'Microsoft.Authorization/locks@2016-09-01' = if (
 }
 
 module privateLinkScope_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (endpoint, index) in privateEndpoints: {
-  name: '${uniqueString(deployment().name, location)}-Insights-PvtEndPnt-${index}'
+  name: '${uniqueString(deployment().name, location)}-PvtLinkScope-PrivateEndpoint-${index}'
   params: {
     privateEndpointResourceId: privateLinkScope.id
     privateEndpointVnetLocation: reference(split(endpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
@@ -69,7 +69,7 @@ module privateLinkScope_privateEndpoints '.bicep/nested_privateEndpoint.bicep' =
 }]
 
 module privateLinkScope_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-PvtLinkScope-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
index f7be392ff3..6dbc6368bc 100644
--- a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
+++ b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
@@ -99,7 +99,7 @@ resource queryRule 'Microsoft.Insights/scheduledQueryRules@2021-02-01-preview' =
 }
 
 module queryRule_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-QueryRule-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName