Skip to content

fix: add principalType as 'ServicePrincipal' for role assignments #224

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

Merged
Prajwal-Microsoft merged 2 commits into from
Jul 22, 2025
Merged

fix: add principalType as 'ServicePrincipal' for role assignments #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aed550f
Add principalType 'ServicePrincipal' to role assignments in Bicep mod…
Abdul-Microsoft Jul 18, 2025
bb6780e
update mainjson file
Abdul-Microsoft Jul 18, 2025
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
6 changes: 6 additions & 0 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ module avmKeyVault './modules/key-vault.bicep' = {
{
principalId: avmManagedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Key Vault Administrator'
principalType: 'ServicePrincipal'
}
]
enablePurgeProtection: false
Expand Down Expand Up @@ -503,6 +504,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
{
principalId: avmManagedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
principalType: 'ServicePrincipal'
}
{
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
Expand Down Expand Up @@ -598,6 +600,7 @@ module avmAiServices 'modules/account/main.bicep' = {
{
principalId: avmManagedIdentity.outputs.principalId
roleDefinitionIdOrName: '8e3af657-a8ff-443c-a75c-2fe8c4bcb635' // Owner role
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
Expand Down Expand Up @@ -1089,14 +1092,17 @@ module avmAppConfig 'br/public:avm/res/app-configuration/configuration-store:0.6
{
principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_API.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
{
principalId: avmContainerApp_Web.outputs.?systemAssignedMIPrincipalId!
roleDefinitionIdOrName: 'App Configuration Data Reader'
principalType: 'ServicePrincipal'
}
]
keyValues: [
Expand Down
60 changes: 33 additions & 27 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -935,7 +935,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -1680,7 +1680,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -2360,7 +2360,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -3045,7 +3045,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -11024,15 +11024,15 @@
"outputs": {
"resourceId": {
"type": "string",
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), reference('logAnalyticsWorkspace').outputs.resourceId.value)]"
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').resourceId)]"
},
"logAnalyticsWorkspaceId": {
"type": "string",
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value)]"
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId)]"
},
"primarySharedKey": {
"type": "securestring",
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey)]"
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey)]"
}
}
}
Expand All @@ -11055,12 +11055,12 @@
"value": "[parameters('location')]"
},
"workspaceResourceId": {
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
},
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
Expand Down Expand Up @@ -12335,7 +12335,8 @@
"value": [
{
"principalId": "[reference('avmManagedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Key Vault Administrator"
"roleDefinitionIdOrName": "Key Vault Administrator",
"principalType": "ServicePrincipal"
}
]
},
Expand Down Expand Up @@ -12368,7 +12369,7 @@
},
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
"logAnalyticsWorkspaceResourceId": {
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
},
"networkAcls": {
"value": {
Expand Down Expand Up @@ -19157,7 +19158,8 @@
"value": [
{
"principalId": "[reference('avmManagedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Storage Blob Data Contributor"
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"principalType": "ServicePrincipal"
},
{
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
Expand Down Expand Up @@ -24952,15 +24954,16 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
}
]
},
"roleAssignments": {
"value": [
{
"principalId": "[reference('avmManagedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "8e3af657-a8ff-443c-a75c-2fe8c4bcb635"
"roleDefinitionIdOrName": "8e3af657-a8ff-443c-a75c-2fe8c4bcb635",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
Expand Down Expand Up @@ -26259,7 +26262,7 @@
"_generator": {
"name": "bicep",
"version": "0.36.177.2456",
"templateHash": "11270933172961789567"
"templateHash": "4128376395637895528"
}
},
"definitions": {
Expand Down Expand Up @@ -28068,7 +28071,7 @@
"_generator": {
"name": "bicep",
"version": "0.36.177.2456",
"templateHash": "9150529619101779014"
"templateHash": "1200612323329026557"
}
},
"definitions": {
Expand Down Expand Up @@ -30643,9 +30646,9 @@
"dependsOn": [
"avmContainerApp",
"avmManagedIdentity",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"avmVirtualNetwork",
"logAnalyticsWorkspace"
Expand Down Expand Up @@ -33020,8 +33023,8 @@
"value": {
"destination": "log-analytics",
"logAnalyticsConfiguration": {
"customerId": "[reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value]",
"sharedKey": "[listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey]"
"customerId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId]",
"sharedKey": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').primarySharedKey]"
}
}
},
Expand Down Expand Up @@ -42901,7 +42904,7 @@
"diagnosticSettings": {
"value": [
{
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]",
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]",
"logCategoriesAndGroups": [
{
"categoryGroup": "allLogs",
Expand All @@ -42919,15 +42922,18 @@
"value": [
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader"
"roleDefinitionIdOrName": "App Configuration Data Reader",
"principalType": "ServicePrincipal"
},
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp_API').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader"
"roleDefinitionIdOrName": "App Configuration Data Reader",
"principalType": "ServicePrincipal"
},
{
"principalId": "[tryGet(tryGet(reference('avmContainerApp_Web').outputs, 'systemAssignedMIPrincipalId'), 'value')]",
"roleDefinitionIdOrName": "App Configuration Data Reader"
"roleDefinitionIdOrName": "App Configuration Data Reader",
"principalType": "ServicePrincipal"
}
]
},
Expand Down Expand Up @@ -42999,19 +43005,19 @@
},
{
"name": "APP_STORAGE_BLOB_URL",
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.blob]"
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.blob]"
},
{
"name": "APP_STORAGE_QUEUE_URL",
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.queue]"
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.queue]"
},
{
"name": "APP_AI_PROJECT_ENDPOINT",
"value": "[reference('avmAiServices').outputs.aiProjectInfo.value.apiEndpoint]"
},
{
"name": "APP_COSMOS_CONNSTR",
"value": "[listOutputsWithSecureValues('avmCosmosDB', '2022-09-01').primaryReadWriteConnectionString]"
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'cosmos-')), '2022-09-01').primaryReadWriteConnectionString]"
}
]
},
Expand Down
Loading