From 1ad3830721a5f4a220efe4be9132deca8ef1c2db Mon Sep 17 00:00:00 2001 From: Chenyi An Date: Thu, 11 Jun 2026 10:02:01 +0800 Subject: [PATCH] fix: include Foundry project name in resource token to avoid same-RG collisions --- infra/core/ai/ai-project.bicep | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/core/ai/ai-project.bicep b/infra/core/ai/ai-project.bicep index d6ba179..0e8eb1b 100644 --- a/infra/core/ai/ai-project.bicep +++ b/infra/core/ai/ai-project.bicep @@ -6,14 +6,14 @@ param tags object = {} @description('Main location for the resources') param location string -@description('Optional salt to diversify resource names across project recreations') -param resourceTokenSalt string = '' - -var resourceToken = empty(resourceTokenSalt) ? uniqueString(subscription().id, resourceGroup().id, location) : uniqueString(subscription().id, resourceGroup().id, location, resourceTokenSalt) - -@description('Name of the project') -param aiFoundryProjectName string - +@description('Optional salt to diversify resource names across project recreations') +param resourceTokenSalt string = '' + +@description('Name of the project') +param aiFoundryProjectName string + +var resourceToken = empty(resourceTokenSalt) ? uniqueString(subscription().id, resourceGroup().id, location, aiFoundryProjectName) : uniqueString(subscription().id, resourceGroup().id, location, aiFoundryProjectName, resourceTokenSalt) + param deployments deploymentsType @description('Id of the user or app to assign application roles') @@ -209,7 +209,7 @@ module aiConnections './connection.bicep' = [for (connection, index) in connecti // Project scope is sufficient for creating/running agents and calling models via the project endpoint. resource localUserAzureAIUserRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { scope: aiAccount::project - name: guid(subscription().id, resourceGroup().id, principalId, '53ca6127-db72-4b80-b1b0-d745d6d5456d') + name: guid(subscription().id, resourceGroup().id, principalId, '53ca6127-db72-4b80-b1b0-d745d6d5456d', aiFoundryProjectName) properties: { principalId: principalId principalType: principalType