Skip to content

chore: Update RBAC Configuration to Reference Role IDs #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shreyas-Microsoft wants to merge 1 commit into
base: dev
Choose a base branch
from
+55 −55
Open

chore: Update RBAC Configuration to Reference Role IDs #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ module avmContainerRegistry 'modules/container-registry.bicep' = {
roleAssignments: [
{
principalId: avmContainerRegistryReader.outputs.principalId
roleDefinitionIdOrName: 'AcrPull'
roleDefinitionIdOrName: '7f951dda-4ed3-4680-a7ca-43fe172d538d' //'AcrPull'
principalType: 'ServicePrincipal'
}
]
Expand Down Expand Up @@ -620,36 +620,36 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
roleAssignments: [
{
principalId: avmManagedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalId: avmContainerApp_API.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp_API.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
Expand Down Expand Up @@ -729,32 +729,32 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
roleDefinitionIdOrName: '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd' //'Cognitive Services OpenAI User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Azure AI Developer'
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
roleDefinitionIdOrName: '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd' //'Cognitive Services OpenAI User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Azure AI Developer'
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services User'
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services User'
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
principalType: 'ServicePrincipal'
}
]
Expand Down Expand Up @@ -1316,22 +1316,22 @@ module avmAppConfig 'br/public:avm/res/app-configuration/configuration-store:0.9
roleAssignments: [
{
principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_API.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Web.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
]
Expand Down
40 changes: 20 additions & 20 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "3841741921827855283"
"templateHash": "10450741366794216818"
},
"name": "Content Processing Solution Accelerator",
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
Expand Down Expand Up @@ -23908,7 +23908,7 @@
"value": [
{
"principalId": "[reference('avmContainerRegistryReader').outputs.principalId.value]",
"roleDefinitionIdOrName": "AcrPull",
"roleDefinitionIdOrName": "7f951dda-4ed3-4680-a7ca-43fe172d538d",
"principalType": "ServicePrincipal"
}
]
Expand Down Expand Up @@ -28013,36 +28013,36 @@
"value": [
{
"principalId": "[reference('avmManagedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
"principalId": "[reference('avmContainerApp_API').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Queue Data Contributor",
"roleDefinitionIdOrName": "974c5e8b-45b9-4653-ba55-5f855dd0fb88",
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Queue Data Contributor",
"roleDefinitionIdOrName": "974c5e8b-45b9-4653-ba55-5f855dd0fb88",
"principalId": "[reference('avmContainerApp_API').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
"principalId": "[reference('avmContainerApp_Workflow').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Queue Data Contributor",
"roleDefinitionIdOrName": "974c5e8b-45b9-4653-ba55-5f855dd0fb88",
"principalId": "[reference('avmContainerApp_Workflow').outputs.systemAssignedMIPrincipalId.value]",
"principalType": "ServicePrincipal"
}
Expand Down Expand Up @@ -36185,8 +36185,8 @@
"avmContainerApp_API",
"avmContainerApp_Workflow",
"avmManagedIdentity",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"virtualNetwork"
]
},
Expand Down Expand Up @@ -36248,32 +36248,32 @@
},
{
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Cognitive Services OpenAI User",
"roleDefinitionIdOrName": "5e0bd9bd-7b93-4f28-af87-19fc36ad61bd",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Azure AI Developer",
"roleDefinitionIdOrName": "64702f94-c441-49e6-a78b-ef80e0188fee",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp_Workflow').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Cognitive Services OpenAI User",
"roleDefinitionIdOrName": "5e0bd9bd-7b93-4f28-af87-19fc36ad61bd",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp_Workflow').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Azure AI Developer",
"roleDefinitionIdOrName": "64702f94-c441-49e6-a78b-ef80e0188fee",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Cognitive Services User",
"roleDefinitionIdOrName": "a97b65f3-24c7-4388-baec-2e87135dc908",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp_Workflow').outputs.systemAssignedMIPrincipalId.value]",
"roleDefinitionIdOrName": "Cognitive Services User",
"roleDefinitionIdOrName": "a97b65f3-24c7-4388-baec-2e87135dc908",
"principalType": "ServicePrincipal"
}
]
Expand Down Expand Up @@ -56778,22 +56778,22 @@
"value": [
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader",
"roleDefinitionIdOrName": "516239f1-63e1-4d78-a4de-a74fb236a071",
"principalType": "ServicePrincipal"
},
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp_API').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader",
"roleDefinitionIdOrName": "516239f1-63e1-4d78-a4de-a74fb236a071",
"principalType": "ServicePrincipal"
},
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp_Web').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader",
"roleDefinitionIdOrName": "516239f1-63e1-4d78-a4de-a74fb236a071",
"principalType": "ServicePrincipal"
},
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp_Workflow').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader",
"roleDefinitionIdOrName": "516239f1-63e1-4d78-a4de-a74fb236a071",
"principalType": "ServicePrincipal"
}
]
Expand Down
34 changes: 17 additions & 17 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ module avmContainerRegistry 'modules/container-registry.bicep' = {
roleAssignments: [
{
principalId: avmContainerRegistryReader.outputs.principalId
roleDefinitionIdOrName: 'AcrPull'
roleDefinitionIdOrName: '7f951dda-4ed3-4680-a7ca-43fe172d538d' //'AcrPull'
principalType: 'ServicePrincipal'
}
]
Expand Down Expand Up @@ -623,26 +623,26 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
roleAssignments: [
{
principalId: avmManagedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
principalId: avmContainerApp_API.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp_API.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
Expand All @@ -652,7 +652,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
}
Expand Down Expand Up @@ -732,32 +732,32 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
roleDefinitionIdOrName: '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd' //'Cognitive Services OpenAI User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Azure AI Developer'
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
roleDefinitionIdOrName: '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd' //'Cognitive Services OpenAI User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Azure AI Developer'
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services User'
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'Cognitive Services User'
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
principalType: 'ServicePrincipal'
}
]
Expand Down Expand Up @@ -1340,22 +1340,22 @@ module avmAppConfig 'br/public:avm/res/app-configuration/configuration-store:0.9
roleAssignments: [
{
principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_API.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Web.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Workflow.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
]
Expand Down