fix guid for role assignments

globalbao · Dec 11, 2021 · 389cb71 · 389cb71
1 parent e0c7a26
commit 389cb71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Bicep/modules/assignments/sub_assignments.bicep b/Bicep/modules/assignments/sub_assignments.bicep
@@ -180,7 +180,7 @@ resource tagging_roleassignment 'Microsoft.Authorization/roleAssignments@2020-04
 }
 
 resource monitoring_roleassignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
-  name: guid(monitoring_assignment.name, monitoring_assignment.type)
+  name: guid(monitoring_assignment.name, monitoring_assignment.type, subscription().subscriptionId)
   properties: {
     principalId: monitoring_assignment.identity.principalId
     principalType: 'ServicePrincipal'
@@ -189,7 +189,7 @@ resource monitoring_roleassignment 'Microsoft.Authorization/roleAssignments@2020
 }
 
 resource dp_roleassignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
-  name: guid(dp_assignment.name, dp_assignment.type)
+  name: guid(dp_assignment.name, dp_assignment.type, subscription().subscriptionId)
   properties: {
     principalId: dp_assignment.identity.principalId
     principalType: 'ServicePrincipal'

diff --git a/Bicep/modules/sub_main.json b/Bicep/modules/sub_main.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.4.1008.15138",
-      "templateHash": "2628997391571807231"
+      "templateHash": "4337484099195058772"
     }
   },
   "parameters": {
@@ -1849,7 +1849,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.4.1008.15138",
-              "templateHash": "9643589475006069147"
+              "templateHash": "4659925975839164403"
             }
           },
           "parameters": {
@@ -2066,7 +2066,7 @@
             {
               "type": "Microsoft.Authorization/roleAssignments",
               "apiVersion": "2020-04-01-preview",
-              "name": "[guid('monitoring_assignment', 'Microsoft.Authorization/policyAssignments')]",
+              "name": "[guid('monitoring_assignment', 'Microsoft.Authorization/policyAssignments', subscription().subscriptionId)]",
               "properties": {
                 "principalId": "[reference(subscriptionResourceId('Microsoft.Authorization/policyAssignments', 'monitoring_assignment'), '2020-09-01', 'full').identity.principalId]",
                 "principalType": "ServicePrincipal",
@@ -2079,7 +2079,7 @@
             {
               "type": "Microsoft.Authorization/roleAssignments",
               "apiVersion": "2020-04-01-preview",
-              "name": "[guid('dp_assignment', 'Microsoft.Authorization/policyAssignments')]",
+              "name": "[guid('dp_assignment', 'Microsoft.Authorization/policyAssignments', subscription().subscriptionId)]",
               "properties": {
                 "principalId": "[reference(subscriptionResourceId('Microsoft.Authorization/policyAssignments', 'dp_assignment'), '2020-09-01', 'full').identity.principalId]",
                 "principalType": "ServicePrincipal",
@@ -2105,8 +2105,8 @@
               "type": "array",
               "value": [
                 "[subscriptionResourceId('Microsoft.Authorization/roleAssignments', guid('tagging_assignment', 'Microsoft.Authorization/policyAssignments', subscription().subscriptionId))]",
-                "[subscriptionResourceId('Microsoft.Authorization/roleAssignments', guid('monitoring_assignment', 'Microsoft.Authorization/policyAssignments'))]",
-                "[subscriptionResourceId('Microsoft.Authorization/roleAssignments', guid('dp_assignment', 'Microsoft.Authorization/policyAssignments'))]"
+                "[subscriptionResourceId('Microsoft.Authorization/roleAssignments', guid('monitoring_assignment', 'Microsoft.Authorization/policyAssignments', subscription().subscriptionId))]",
+                "[subscriptionResourceId('Microsoft.Authorization/roleAssignments', guid('dp_assignment', 'Microsoft.Authorization/policyAssignments', subscription().subscriptionId))]"
               ]
             }
           }