Skip to content

Commit e3d0972

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
code updated for role assignment
1 parent 2bc82e9 commit e3d0972

File tree

2 files changed

+32
-45
lines changed

2 files changed

+32
-45
lines changed

‎infra/main.bicep‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ param azureopenaiVersion string = '2025-01-01-preview'
2323
//Get the current deployer's information
2424
var deployerInfo = deployer()
2525
var deployingUserPrincipalId = deployerInfo.objectId
26-
var enableUserRoleAssignment = !empty(deployingUserPrincipalId)
2726

2827
// Restricting deployment to only supported Azure OpenAI regions validated with GPT-4o model
2928
@metadata({
@@ -818,7 +817,7 @@ module cogServiceRoleAssignmentsExisting './modules/role.bicep' = if(useExisting
818817
}
819818

820819
// User Role Assignment for Azure OpenAI - New Resources
821-
module userOpenAiRoleAssignment './modules/role.bicep' = if (enableUserRoleAssignment && aiFoundryAIservicesEnabled && !useExistingResourceId) {
820+
module userOpenAiRoleAssignment './modules/role.bicep' = if (aiFoundryAIservicesEnabled && !useExistingResourceId) {
822821
name: take('user-openai-${uniqueString(deployingUserPrincipalId, aiFoundryAiServicesResourceName)}', 64)
823822
params: {
824823
name: 'user-openai-${uniqueString(deployingUserPrincipalId, aiFoundryAiServicesResourceName)}'
@@ -833,7 +832,7 @@ module userOpenAiRoleAssignment './modules/role.bicep' = if (enableUserRoleAssig
833832
}
834833

835834
// User Role Assignment for Azure OpenAI - Existing Resources
836-
module userOpenAiRoleAssignmentExisting './modules/role.bicep' = if (enableUserRoleAssignment && aiFoundryAIservicesEnabled && useExistingResourceId) {
835+
module userOpenAiRoleAssignmentExisting './modules/role.bicep' = if (aiFoundryAIservicesEnabled && useExistingResourceId) {
837836
name: take('user-openai-existing-${uniqueString(deployingUserPrincipalId, aiFoundryAiServicesResourceName)}', 64)
838837
params: {
839838
name: 'user-openai-existing-${uniqueString(deployingUserPrincipalId, aiFoundryAiServicesResourceName)}'
@@ -924,7 +923,7 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.12.0' = if (co
924923

925924
sqlRoleAssignmentsPrincipalIds: concat(
926925
[containerApp.outputs.?systemAssignedMIPrincipalId],
927-
enableUserRoleAssignment ? [deployingUserPrincipalId] : []
926+
[deployingUserPrincipalId]
928927
)
929928
sqlRoleDefinitions: [
930929
{
@@ -1776,6 +1775,3 @@ output AZURE_AI_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeploymen
17761775
output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
17771776
output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiServices.outputs.aiProjectInfo.apiEndpoint
17781777
output APP_ENV string = 'Prod'
1779-
1780-
output deployerInfo object = deployerInfo
1781-
output userRoleAssignmentStatus string = enableUserRoleAssignment ? 'User ${deployingUserPrincipalId} (${deployerInfo.?userPrincipalName ?? 'N/A'}) has been granted access to Cosmos DB and Azure OpenAI' : 'No user role assignment configured.'

‎infra/main.json‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.36.177.2456",
9-
"templateHash": "13921386221810214912"
8+
"version": "0.37.4.10188",
9+
"templateHash": "4538882606243490469"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
1212
"description": "This module contains the resources required to deploy the Multi-Agent Custom Automation Engine solution accelerator for both Sandbox environments and WAF aligned environments."
@@ -2129,7 +2129,6 @@
21292129
"variables": {
21302130
"deployerInfo": "[deployer()]",
21312131
"deployingUserPrincipalId": "[variables('deployerInfo').objectId]",
2132-
"enableUserRoleAssignment": "[not(empty(variables('deployingUserPrincipalId')))]",
21332132
"logAnalyticsWorkspaceEnabled": "[coalesce(tryGet(parameters('logAnalyticsWorkspaceConfiguration'), 'enabled'), true())]",
21342133
"logAnalyticsWorkspaceResourceName": "[coalesce(tryGet(parameters('logAnalyticsWorkspaceConfiguration'), 'name'), format('log-{0}', parameters('solutionPrefix')))]",
21352134
"existingWorkspaceResourceId": "[coalesce(tryGet(parameters('logAnalyticsWorkspaceConfiguration'), 'existingWorkspaceResourceId'), '')]",
@@ -21014,8 +21013,8 @@
2101421013
"metadata": {
2101521014
"_generator": {
2101621015
"name": "bicep",
21017-
"version": "0.36.177.2456",
21018-
"templateHash": "13834495711247855962"
21016+
"version": "0.37.4.10188",
21017+
"templateHash": "1902495734992871360"
2101921018
},
2102021019
"name": "Cognitive Services",
2102121020
"description": "This module deploys a Cognitive Service."
@@ -22264,8 +22263,8 @@
2226422263
"metadata": {
2226522264
"_generator": {
2226622265
"name": "bicep",
22267-
"version": "0.36.177.2456",
22268-
"templateHash": "11270933172961789567"
22266+
"version": "0.37.4.10188",
22267+
"templateHash": "9510507771164523365"
2226922268
}
2227022269
},
2227122270
"definitions": {
@@ -24073,8 +24072,8 @@
2407324072
"metadata": {
2407424073
"_generator": {
2407524074
"name": "bicep",
24076-
"version": "0.36.177.2456",
24077-
"templateHash": "9150529619101779014"
24075+
"version": "0.37.4.10188",
24076+
"templateHash": "2491273843075489892"
2407824077
}
2407924078
},
2408024079
"definitions": {
@@ -24227,8 +24226,8 @@
2422724226
"metadata": {
2422824227
"_generator": {
2422924228
"name": "bicep",
24230-
"version": "0.36.177.2456",
24231-
"templateHash": "18131656256983910282"
24229+
"version": "0.37.4.10188",
24230+
"templateHash": "13991828250771551903"
2423224231
}
2423324232
},
2423424233
"definitions": {
@@ -24445,8 +24444,8 @@
2444524444
"metadata": {
2444624445
"_generator": {
2444724446
"name": "bicep",
24448-
"version": "0.36.177.2456",
24449-
"templateHash": "11270933172961789567"
24447+
"version": "0.37.4.10188",
24448+
"templateHash": "9510507771164523365"
2445024449
}
2445124450
},
2445224451
"definitions": {
@@ -26254,8 +26253,8 @@
2625426253
"metadata": {
2625526254
"_generator": {
2625626255
"name": "bicep",
26257-
"version": "0.36.177.2456",
26258-
"templateHash": "9150529619101779014"
26256+
"version": "0.37.4.10188",
26257+
"templateHash": "2491273843075489892"
2625926258
}
2626026259
},
2626126260
"definitions": {
@@ -26408,8 +26407,8 @@
2640826407
"metadata": {
2640926408
"_generator": {
2641026409
"name": "bicep",
26411-
"version": "0.36.177.2456",
26412-
"templateHash": "18131656256983910282"
26410+
"version": "0.37.4.10188",
26411+
"templateHash": "13991828250771551903"
2641326412
}
2641426413
},
2641526414
"definitions": {
@@ -26680,8 +26679,8 @@
2668026679
"metadata": {
2668126680
"_generator": {
2668226681
"name": "bicep",
26683-
"version": "0.36.177.2456",
26684-
"templateHash": "4773661831619894722"
26682+
"version": "0.37.4.10188",
26683+
"templateHash": "3261324722163967354"
2668526684
}
2668626685
},
2668726686
"parameters": {
@@ -26786,8 +26785,8 @@
2678626785
"metadata": {
2678726786
"_generator": {
2678826787
"name": "bicep",
26789-
"version": "0.36.177.2456",
26790-
"templateHash": "4773661831619894722"
26788+
"version": "0.37.4.10188",
26789+
"templateHash": "3261324722163967354"
2679126790
}
2679226791
},
2679326792
"parameters": {
@@ -26864,7 +26863,7 @@
2686426863
]
2686526864
},
2686626865
"userOpenAiRoleAssignment": {
26867-
"condition": "[and(and(variables('enableUserRoleAssignment'), variables('aiFoundryAIservicesEnabled')), not(variables('useExistingResourceId')))]",
26866+
"condition": "[and(variables('aiFoundryAIservicesEnabled'), not(variables('useExistingResourceId')))]",
2686826867
"type": "Microsoft.Resources/deployments",
2686926868
"apiVersion": "2022-09-01",
2687026869
"name": "[take(format('user-openai-{0}', uniqueString(variables('deployingUserPrincipalId'), variables('aiFoundryAiServicesResourceName'))), 64)]",
@@ -26895,8 +26894,8 @@
2689526894
"metadata": {
2689626895
"_generator": {
2689726896
"name": "bicep",
26898-
"version": "0.36.177.2456",
26899-
"templateHash": "4773661831619894722"
26897+
"version": "0.37.4.10188",
26898+
"templateHash": "3261324722163967354"
2690026899
}
2690126900
},
2690226901
"parameters": {
@@ -26972,7 +26971,7 @@
2697226971
]
2697326972
},
2697426973
"userOpenAiRoleAssignmentExisting": {
26975-
"condition": "[and(and(variables('enableUserRoleAssignment'), variables('aiFoundryAIservicesEnabled')), variables('useExistingResourceId'))]",
26974+
"condition": "[and(variables('aiFoundryAIservicesEnabled'), variables('useExistingResourceId'))]",
2697626975
"type": "Microsoft.Resources/deployments",
2697726976
"apiVersion": "2022-09-01",
2697826977
"name": "[take(format('user-openai-existing-{0}', uniqueString(variables('deployingUserPrincipalId'), variables('aiFoundryAiServicesResourceName'))), 64)]",
@@ -27003,8 +27002,8 @@
2700327002
"metadata": {
2700427003
"_generator": {
2700527004
"name": "bicep",
27006-
"version": "0.36.177.2456",
27007-
"templateHash": "4773661831619894722"
27005+
"version": "0.37.4.10188",
27006+
"templateHash": "3261324722163967354"
2700827007
}
2700927008
},
2701027009
"parameters": {
@@ -30190,7 +30189,7 @@
3019030189
]
3019130190
},
3019230191
"sqlRoleAssignmentsPrincipalIds": {
30193-
"value": "[concat(createArray(tryGet(tryGet(reference('containerApp').outputs, 'systemAssignedMIPrincipalId'), 'value')), if(variables('enableUserRoleAssignment'), createArray(variables('deployingUserPrincipalId')), createArray()))]"
30192+
"value": "[concat(createArray(tryGet(tryGet(reference('containerApp').outputs, 'systemAssignedMIPrincipalId'), 'value')), createArray(variables('deployingUserPrincipalId')))]"
3019430193
},
3019530194
"sqlRoleDefinitions": {
3019630195
"value": [
@@ -34117,8 +34116,8 @@
3411734116
"metadata": {
3411834117
"_generator": {
3411934118
"name": "bicep",
34120-
"version": "0.36.177.2456",
34121-
"templateHash": "13903155529874160708"
34119+
"version": "0.37.4.10188",
34120+
"templateHash": "12060379214971977883"
3412234121
}
3412334122
},
3412434123
"parameters": {
@@ -42605,14 +42604,6 @@
4260542604
"APP_ENV": {
4260642605
"type": "string",
4260742606
"value": "Prod"
42608-
},
42609-
"deployerInfo": {
42610-
"type": "object",
42611-
"value": "[variables('deployerInfo')]"
42612-
},
42613-
"userRoleAssignmentStatus": {
42614-
"type": "string",
42615-
"value": "[if(variables('enableUserRoleAssignment'), format('User {0} ({1}) has been granted access to Cosmos DB and Azure OpenAI', variables('deployingUserPrincipalId'), coalesce(tryGet(variables('deployerInfo'), 'userPrincipalName'), 'N/A')), 'No user role assignment configured.')]"
4261642607
}
4261742608
}
4261842609
}

0 commit comments

Comments
 (0)