Merge pull request #28 from fabnord/main

BugFix: customRole to use TenantId as unique identifier
CrowdStrike · Jan 24, 2025 · a402816 · a402816
2 parents 1163628 + b50bb13
commit a402816
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/iom/azureRoleDefinitionAssignableScope.bicep b/modules/iom/azureRoleDefinitionAssignableScope.bicep
@@ -3,7 +3,7 @@ targetScope = 'subscription'
 param customRoleName string
 
 resource existingCustomRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
-  name: guid(customRoleName, subscription().id)
+  name: guid(customRoleName, tenant().tenantId)
 }
 
 output assignableScopes array = existingCustomRoleDefinition.properties.assignableScopes
diff --git a/modules/iom/azureSubscriptionExistingRoleDefinition.bicep b/modules/iom/azureSubscriptionExistingRoleDefinition.bicep
@@ -27,7 +27,7 @@ module assignableScope 'azureRoleDefinitionAssignableScope.bicep' = {
     }
 
 resource modifyExistingCustomRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' = {
-  name: guid(customRole.roleName, subscription().id)
+  name: guid(customRole.roleName, tenant().tenantId)
   properties: {
     assignableScopes: union(assignableScope.outputs.assignableScopes,[subscriptionId])
     description: customRole.roleDescription

diff --git a/modules/iom/azureSubscriptionRoleDefinition.bicep b/modules/iom/azureSubscriptionRoleDefinition.bicep
@@ -17,7 +17,7 @@ var customRole = {
 }
 
 resource customRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' = {
-  name: guid(customRole.roleName, subscription().id,'test')
+  name: guid(customRole.roleName, tenant().tenantId)
   properties: {
     assignableScopes: [subscription().id]
     description: customRole.roleDescription
@@ -32,4 +32,4 @@ resource customRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-0
   }
 }
 
-output customRoleDefinitionId string = customRoleDefinition.id
+output customRoleDefinitionId string = customRoleDefinition.id