Skip to content

Commit 7f122a1

Browse files
Shreyas-MicrosoftShreyas-Microsoft
committed
use role ids instead of role names
1 parent 09abf26 commit 7f122a1

3 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎infra/main.bicep‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -634,23 +634,23 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
634634
supportsHttpsTrafficOnly: true
635635
roleAssignments: [
636636
{
637-
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
637+
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
638638
principalId: appIdentity.outputs.principalId
639639
principalType: 'ServicePrincipal'
640640
}
641641
{
642-
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
642+
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
643643
principalId: appIdentity.outputs.principalId
644644
principalType: 'ServicePrincipal'
645645
}
646646
// Add deployer permissions
647647
{
648-
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
648+
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
649649
principalId: deployingUserPrincipalId
650650
principalType: deployingUserType
651651
}
652652
{
653-
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
653+
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
654654
principalId: deployingUserPrincipalId
655655
principalType: deployingUserType
656656
}
@@ -847,13 +847,13 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
847847
{
848848
principalId: appIdentity.outputs.principalId
849849
principalType: 'ServicePrincipal'
850-
roleDefinitionIdOrName: 'DocumentDB Account Contributor'
850+
roleDefinitionIdOrName: '5bd9cd88-fe45-4216-938b-f97437e15450' //'DocumentDB Account Contributor'
851851
}
852852
// Add deployer for local debugging
853853
{
854854
principalId: deployingUserPrincipalId
855855
principalType: deployingUserType
856-
roleDefinitionIdOrName: 'DocumentDB Account Contributor'
856+
roleDefinitionIdOrName: '5bd9cd88-fe45-4216-938b-f97437e15450' //'DocumentDB Account Contributor'
857857
}
858858
]
859859
// Create custom data plane role definition and assignment
@@ -935,28 +935,28 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
935935
{
936936
principalId: appIdentity.outputs.principalId
937937
principalType: 'ServicePrincipal'
938-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
938+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
939939
}
940940
{
941941
principalId: appIdentity.outputs.principalId
942942
principalType: 'ServicePrincipal'
943-
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee'
943+
roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
944944
}
945945
{
946946
principalId: appIdentity.outputs.principalId
947947
principalType: 'ServicePrincipal'
948-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d'
948+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' //'Foundry User'
949949
}
950950
// Deployer permissions
951951
{
952952
principalId: deployingUserPrincipalId
953953
principalType: deployingUserType
954-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
954+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
955955
}
956956
{
957957
principalId: deployingUserPrincipalId
958958
principalType: deployingUserType
959-
roleDefinitionIdOrName: 'Cognitive Services User'
959+
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
960960
}
961961
]
962962
}
@@ -1012,7 +1012,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
10121012
roleAssignments: [
10131013
// Service Principal permissions
10141014
{
1015-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
1015+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
10161016
principalId: appIdentity.outputs.principalId
10171017
principalType: 'ServicePrincipal'
10181018
}
@@ -1028,12 +1028,12 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
10281028
}
10291029
// Deployer permissions for local debugging
10301030
{
1031-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
1031+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
10321032
principalId: deployingUserPrincipalId
10331033
principalType: deployingUserType
10341034
}
10351035
{
1036-
roleDefinitionIdOrName: 'Cognitive Services User'
1036+
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
10371037
principalId: deployingUserPrincipalId
10381038
principalType: deployingUserType
10391039
}
@@ -1215,7 +1215,7 @@ module appConfiguration 'br/public:avm/res/app-configuration/configuration-store
12151215
{
12161216
principalId: appIdentity.outputs.principalId
12171217
principalType: 'ServicePrincipal'
1218-
roleDefinitionIdOrName: 'App Configuration Data Reader'
1218+
roleDefinitionIdOrName: '516239f1-63e1-4d78-a4de-a74fb236a071' //'App Configuration Data Reader'
12191219
}
12201220
]
12211221
enableTelemetry: enableTelemetry

‎infra/main.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.43.8.12551",
9-
"templateHash": "2561563027340256551"
8+
"version": "0.44.1.10279",
9+
"templateHash": "8615995649961363295"
1010
}
1111
},
1212
"parameters": {
@@ -4717,8 +4717,8 @@
47174717
"metadata": {
47184718
"_generator": {
47194719
"name": "bicep",
4720-
"version": "0.43.8.12551",
4721-
"templateHash": "4604761290796021104"
4720+
"version": "0.44.1.10279",
4721+
"templateHash": "8338582776365718527"
47224722
}
47234723
},
47244724
"definitions": {
@@ -21723,22 +21723,22 @@
2172321723
"roleAssignments": {
2172421724
"value": [
2172521725
{
21726-
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
21726+
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
2172721727
"principalId": "[reference('appIdentity').outputs.principalId.value]",
2172821728
"principalType": "ServicePrincipal"
2172921729
},
2173021730
{
21731-
"roleDefinitionIdOrName": "Storage Queue Data Contributor",
21731+
"roleDefinitionIdOrName": "974c5e8b-45b9-4653-ba55-5f855dd0fb88",
2173221732
"principalId": "[reference('appIdentity').outputs.principalId.value]",
2173321733
"principalType": "ServicePrincipal"
2173421734
},
2173521735
{
21736-
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
21736+
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
2173721737
"principalId": "[variables('deployingUserPrincipalId')]",
2173821738
"principalType": "[variables('deployingUserType')]"
2173921739
},
2174021740
{
21741-
"roleDefinitionIdOrName": "Storage Queue Data Contributor",
21741+
"roleDefinitionIdOrName": "974c5e8b-45b9-4653-ba55-5f855dd0fb88",
2174221742
"principalId": "[variables('deployingUserPrincipalId')]",
2174321743
"principalType": "[variables('deployingUserType')]"
2174421744
}
@@ -27476,8 +27476,8 @@
2747627476
},
2747727477
"dependsOn": [
2747827478
"appIdentity",
27479-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
2748027479
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
27480+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
2748127481
"virtualNetwork"
2748227482
]
2748327483
},
@@ -27564,12 +27564,12 @@
2756427564
{
2756527565
"principalId": "[reference('appIdentity').outputs.principalId.value]",
2756627566
"principalType": "ServicePrincipal",
27567-
"roleDefinitionIdOrName": "DocumentDB Account Contributor"
27567+
"roleDefinitionIdOrName": "5bd9cd88-fe45-4216-938b-f97437e15450"
2756827568
},
2756927569
{
2757027570
"principalId": "[variables('deployingUserPrincipalId')]",
2757127571
"principalType": "[variables('deployingUserType')]",
27572-
"roleDefinitionIdOrName": "DocumentDB Account Contributor"
27572+
"roleDefinitionIdOrName": "5bd9cd88-fe45-4216-938b-f97437e15450"
2757327573
}
2757427574
]
2757527575
},
@@ -31417,7 +31417,7 @@
3141731417
{
3141831418
"principalId": "[reference('appIdentity').outputs.principalId.value]",
3141931419
"principalType": "ServicePrincipal",
31420-
"roleDefinitionIdOrName": "Cognitive Services OpenAI Contributor"
31420+
"roleDefinitionIdOrName": "a001fd3d-188f-4b5d-821b-7da978bf7442"
3142131421
},
3142231422
{
3142331423
"principalId": "[reference('appIdentity').outputs.principalId.value]",
@@ -31432,12 +31432,12 @@
3143231432
{
3143331433
"principalId": "[variables('deployingUserPrincipalId')]",
3143431434
"principalType": "[variables('deployingUserType')]",
31435-
"roleDefinitionIdOrName": "Cognitive Services OpenAI Contributor"
31435+
"roleDefinitionIdOrName": "a001fd3d-188f-4b5d-821b-7da978bf7442"
3143631436
},
3143731437
{
3143831438
"principalId": "[variables('deployingUserPrincipalId')]",
3143931439
"principalType": "[variables('deployingUserType')]",
31440-
"roleDefinitionIdOrName": "Cognitive Services User"
31440+
"roleDefinitionIdOrName": "a97b65f3-24c7-4388-baec-2e87135dc908"
3144131441
}
3144231442
]
3144331443
}
@@ -31449,8 +31449,8 @@
3144931449
"metadata": {
3145031450
"_generator": {
3145131451
"name": "bicep",
31452-
"version": "0.43.8.12551",
31453-
"templateHash": "13516349791985095953"
31452+
"version": "0.44.1.10279",
31453+
"templateHash": "8388310902652207735"
3145431454
}
3145531455
},
3145631456
"definitions": {
@@ -31855,7 +31855,7 @@
3185531855
"roleAssignments": {
3185631856
"value": [
3185731857
{
31858-
"roleDefinitionIdOrName": "Cognitive Services OpenAI Contributor",
31858+
"roleDefinitionIdOrName": "a001fd3d-188f-4b5d-821b-7da978bf7442",
3185931859
"principalId": "[reference('appIdentity').outputs.principalId.value]",
3186031860
"principalType": "ServicePrincipal"
3186131861
},
@@ -31870,12 +31870,12 @@
3187031870
"principalType": "ServicePrincipal"
3187131871
},
3187231872
{
31873-
"roleDefinitionIdOrName": "Cognitive Services OpenAI Contributor",
31873+
"roleDefinitionIdOrName": "a001fd3d-188f-4b5d-821b-7da978bf7442",
3187431874
"principalId": "[variables('deployingUserPrincipalId')]",
3187531875
"principalType": "[variables('deployingUserType')]"
3187631876
},
3187731877
{
31878-
"roleDefinitionIdOrName": "Cognitive Services User",
31878+
"roleDefinitionIdOrName": "a97b65f3-24c7-4388-baec-2e87135dc908",
3187931879
"principalId": "[variables('deployingUserPrincipalId')]",
3188031880
"principalType": "[variables('deployingUserType')]"
3188131881
}
@@ -35199,9 +35199,9 @@
3519935199
},
3520035200
"dependsOn": [
3520135201
"aiFoundryAiServices",
35202+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3520235203
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3520335204
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
35204-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3520535205
"virtualNetwork"
3520635206
]
3520735207
},
@@ -35238,8 +35238,8 @@
3523835238
"metadata": {
3523935239
"_generator": {
3524035240
"name": "bicep",
35241-
"version": "0.43.8.12551",
35242-
"templateHash": "17583277036649944863"
35241+
"version": "0.44.1.10279",
35242+
"templateHash": "16726486764770261194"
3524335243
}
3524435244
},
3524535245
"parameters": {
@@ -35461,7 +35461,7 @@
3546135461
{
3546235462
"principalId": "[reference('appIdentity').outputs.principalId.value]",
3546335463
"principalType": "ServicePrincipal",
35464-
"roleDefinitionIdOrName": "App Configuration Data Reader"
35464+
"roleDefinitionIdOrName": "516239f1-63e1-4d78-a4de-a74fb236a071"
3546535465
}
3546635466
]
3546735467
},

‎infra/main_custom.bicep‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,12 +612,12 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
612612
supportsHttpsTrafficOnly: true
613613
roleAssignments: [
614614
{
615-
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
615+
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' //'Storage Blob Data Contributor'
616616
principalId: appIdentity.outputs.principalId
617617
principalType: 'ServicePrincipal'
618618
}
619619
{
620-
roleDefinitionIdOrName: 'Storage Queue Data Contributor'
620+
roleDefinitionIdOrName: '974c5e8b-45b9-4653-ba55-5f855dd0fb88' //'Storage Queue Data Contributor'
621621
principalId: appIdentity.outputs.principalId
622622
principalType: 'ServicePrincipal'
623623
}
@@ -806,7 +806,7 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
806806
{
807807
principalId: appIdentity.outputs.principalId
808808
principalType: 'ServicePrincipal'
809-
roleDefinitionIdOrName: 'DocumentDB Account Contributor'
809+
roleDefinitionIdOrName: '5bd9cd88-fe45-4216-938b-f97437e15450' //'DocumentDB Account Contributor'
810810
}
811811
]
812812
// Create custom data plane role definition and assignment
@@ -902,7 +902,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
902902
{
903903
principalId: appIdentity.outputs.principalId
904904
principalType: 'ServicePrincipal'
905-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
905+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
906906
}
907907
{
908908
principalId: appIdentity.outputs.principalId
@@ -956,7 +956,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
956956
roleAssignments: [
957957
// Service Principal permissions
958958
{
959-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
959+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
960960
principalId: appIdentity.outputs.principalId
961961
principalType: 'ServicePrincipal'
962962
}
@@ -972,12 +972,12 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
972972
}
973973
// Deployer permissions for local debugging
974974
{
975-
roleDefinitionIdOrName: 'Cognitive Services OpenAI Contributor'
975+
roleDefinitionIdOrName: 'a001fd3d-188f-4b5d-821b-7da978bf7442' //'Cognitive Services OpenAI Contributor'
976976
principalId: deployingUserPrincipalId
977977
principalType: 'User'
978978
}
979979
{
980-
roleDefinitionIdOrName: 'Cognitive Services User'
980+
roleDefinitionIdOrName: 'a97b65f3-24c7-4388-baec-2e87135dc908' //'Cognitive Services User'
981981
principalId: deployingUserPrincipalId
982982
principalType: 'User'
983983
}

0 commit comments

Comments
 (0)