Skip to content

Commit f736f36

Browse files
AjitPadhi-MicrosoftAjitPadhi-Microsoft
committed
Updated Foundry Roles name
1 parent 4450802 commit f736f36

6 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎docs/LocalDevelopmentSetup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ az cosmosdb sql role assignment create --resource-group <solution-accelerator-rg
273273
**Assign the required roles:**
274274

275275
```bash
276-
# Azure AI User role
277-
az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
276+
# Foundry User role
277+
az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
278278
```
279279

280280
```bash

‎docs/re-use-foundry-project.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Replace `<Existing Foundry Project Resource ID>` with the value obtained from St
4444
Proceed with the next steps in the [deployment guide](DeploymentGuide.md#deployment-steps).
4545

4646
> **Note:**
47-
> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Azure AI User** or **Azure AI Developer** role for the Foundry resource.
47+
> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Foundry User** or **Azure AI Developer** role for the Foundry resource.
4848
> You can do this in the Azure Portal under the Foundry resource's "Access control (IAM)" section,
4949
> **or** run the following command in your terminal (replace `<aad-user-upn>` with your Azure AD user principal name and `<resource-id>` with the Resource ID you copied in Step 5):
5050
> ```bash
51-
> az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope <resource-id>
51+
> az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope <resource-id>
5252
> ```

‎infra/main.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
854854
]
855855
roleAssignments: [
856856
{
857-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
857+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
858858
principalId: userAssignedIdentity.outputs.principalId
859859
principalType: 'ServicePrincipal'
860860
}
@@ -935,7 +935,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
935935
managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
936936
roleAssignments: [
937937
{
938-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
938+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
939939
principalId: userAssignedIdentity.outputs.principalId
940940
principalType: 'ServicePrincipal'
941941
}
@@ -950,7 +950,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
950950
principalType: 'ServicePrincipal'
951951
}
952952
{
953-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
953+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
954954
principalId: deployingUserPrincipalId
955955
principalType: deployerPrincipalType
956956
}

‎infra/main.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.42.1.51946",
9-
"templateHash": "8490920419623942773"
8+
"version": "0.43.8.12551",
9+
"templateHash": "12475542446442392463"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
12-
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\r\n\r\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\r\n"
12+
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
1313
},
1414
"parameters": {
1515
"solutionName": {
@@ -4991,8 +4991,8 @@
49914991
"metadata": {
49924992
"_generator": {
49934993
"name": "bicep",
4994-
"version": "0.42.1.51946",
4995-
"templateHash": "4286500745908716598"
4994+
"version": "0.43.8.12551",
4995+
"templateHash": "9540091515555271756"
49964996
}
49974997
},
49984998
"definitions": {
@@ -24308,8 +24308,8 @@
2430824308
"metadata": {
2430924309
"_generator": {
2431024310
"name": "bicep",
24311-
"version": "0.42.1.51946",
24312-
"templateHash": "6570260143045999127"
24311+
"version": "0.43.8.12551",
24312+
"templateHash": "7866379492866507946"
2431324313
}
2431424314
},
2431524315
"definitions": {
@@ -28012,8 +28012,8 @@
2801228012
"metadata": {
2801328013
"_generator": {
2801428014
"name": "bicep",
28015-
"version": "0.42.1.51946",
28016-
"templateHash": "14513113443903512301"
28015+
"version": "0.43.8.12551",
28016+
"templateHash": "2868048678223903575"
2801728017
}
2801828018
},
2801928019
"parameters": {
@@ -42561,8 +42561,8 @@
4256142561
"metadata": {
4256242562
"_generator": {
4256342563
"name": "bicep",
42564-
"version": "0.42.1.51946",
42565-
"templateHash": "15053339789155096730"
42564+
"version": "0.43.8.12551",
42565+
"templateHash": "18345308984648474640"
4256642566
}
4256742567
},
4256842568
"definitions": {
@@ -43593,8 +43593,8 @@
4359343593
"metadata": {
4359443594
"_generator": {
4359543595
"name": "bicep",
43596-
"version": "0.42.1.51946",
43597-
"templateHash": "16493651611122310009"
43596+
"version": "0.43.8.12551",
43597+
"templateHash": "1009721598684973971"
4359843598
},
4359943599
"name": "Site App Settings",
4360043600
"description": "This module deploys a Site App Setting."
@@ -54840,8 +54840,8 @@
5484054840
"metadata": {
5484154841
"_generator": {
5484254842
"name": "bicep",
54843-
"version": "0.42.1.51946",
54844-
"templateHash": "4859654437121510695"
54843+
"version": "0.43.8.12551",
54844+
"templateHash": "9739523049889844356"
5484554845
}
5484654846
},
5484754847
"parameters": {

‎infra/main_custom.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
853853
]
854854
roleAssignments: [
855855
{
856-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
856+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
857857
principalId: userAssignedIdentity.outputs.principalId
858858
principalType: 'ServicePrincipal'
859859
}
@@ -934,7 +934,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
934934
managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
935935
roleAssignments: [
936936
{
937-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
937+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
938938
principalId: userAssignedIdentity.outputs.principalId
939939
principalType: 'ServicePrincipal'
940940
}
@@ -949,7 +949,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
949949
principalType: 'ServicePrincipal'
950950
}
951951
{
952-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
952+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
953953
principalId: deployingUserPrincipalId
954954
principalType: deployerPrincipalType
955955
}

‎infra/scripts/assign_azure_ai_user_role.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ fi
2525

2626
IFS=',' read -r -a principal_ids_array <<< $principal_ids
2727

28-
echo "Assigning Azure AI User role role to users"
28+
echo "Assigning Foundry User role to users"
2929

3030
echo "Using provided Azure AI resource id: $aif_resource_id"
3131

3232
for principal_id in "${principal_ids_array[@]}"; do
3333

34-
# Check if the user has the Azure AI User role
35-
echo "Checking if user - ${principal_id} has the Azure AI User role"
34+
# Check if the user has the Foundry User role
35+
echo "Checking if user - ${principal_id} has the Foundry User role"
3636
role_assignment=$(MSYS_NO_PATHCONV=1 az role assignment list --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --assignee $principal_id --query "[].roleDefinitionId" -o tsv)
3737
if [ -z "$role_assignment" ]; then
38-
echo "User - ${principal_id} does not have the Azure AI User role. Assigning the role."
38+
echo "User - ${principal_id} does not have the Foundry User role. Assigning the role."
3939
MSYS_NO_PATHCONV=1 az role assignment create --assignee $principal_id --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --output none
4040
if [ $? -eq 0 ]; then
41-
echo "Azure AI User role assigned successfully."
41+
echo "Foundry User role assigned successfully."
4242
else
43-
echo "Failed to assign Azure AI User role."
43+
echo "Failed to assign Foundry User role."
4444
exit 1
4545
fi
4646
else
47-
echo "User - ${principal_id} already has the Azure AI User role."
47+
echo "User - ${principal_id} already has the Foundry User role."
4848
fi
4949
done

0 commit comments

Comments
 (0)