Skip to content

chore: Reuse AI Foundry Project #161

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
Roopan-Microsoft merged 3 commits into from
Jul 10, 2025
Merged

chore: Reuse AI Foundry Project #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92bbcef
Merge pull request #160 from microsoft/dev
Roopan-Microsoft Jul 8, 2025
4acbde2
merge down for reuse aif
Jul 9, 2025
0481bd8
build main bicep
Jul 9, 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
36 changes: 28 additions & 8 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ param imageVersion string = 'latest'
@description('Version of the GPT model to deploy:')
param gptModelVersion string = '2024-08-06'

@description('Use this parameter to use an existing AI project resource ID')
param azureExistingAIProjectResourceId string = ''

param existingLogAnalyticsWorkspaceId string = ''

var allTags = union(
Expand Down Expand Up @@ -221,23 +224,40 @@ module network 'modules/network.bicep' = if (enablePrivateNetworking) {
}

module aiServices 'modules/ai-foundry/main.bicep' = {
name: take('aiservices-${resourcesName}-deployment', 64)
name: take('avm.res.cognitive-services.account.${resourcesName}', 64)
#disable-next-line no-unnecessary-dependson
dependsOn: [logAnalyticsWorkspace, network] // required due to optional flags that could change dependency
params: {
name: '${abbrs.ai.aiFoundry}${resourcesName}'
location: aiDeploymentsLocation
sku: 'S0'
kind: 'AIServices'
deployments: [modelDeployment]
deployments: [ modelDeployment ]
projectName: '${abbrs.ai.aiFoundryProject}${resourcesName}'
projectDescription: '${abbrs.ai.aiFoundryProject}${resourcesName}'
logAnalyticsWorkspaceResourceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
privateNetworking: enablePrivateNetworking
? {
virtualNetworkResourceId: network.outputs.vnetResourceId
subnetResourceId: network.outputs.subnetPrivateEndpointsResourceId
}
: null
existingFoundryProjectResourceId: azureExistingAIProjectResourceId
disableLocalAuth: true //Should be set to true for WAF aligned configuration
customSubDomainName: 'ais-${resourcesName}'
apiProperties: {
//staticsEnabled: false
}
allowProjectManagement: true
managedIdentities: {
systemAssigned: true
}
publicNetworkAccess: 'Enabled'
networkAcls: {
bypass: 'AzureServices'
defaultAction: 'Allow'
}
privateEndpoints: []
roleAssignments: [
{
principalId: appIdentity.outputs.principalId
Expand Down Expand Up @@ -314,9 +334,9 @@ module keyVault 'modules/keyVault.bicep' = {
: null
roleAssignments: [
{
principalId: aiServices.outputs.?systemAssignedMIPrincipalId ?? ''
principalId: aiServices.outputs.?systemAssignedMIPrincipalId ?? appIdentity.outputs.principalId
principalType: 'ServicePrincipal'
roleDefinitionIdOrName: 'Key Vault Reader'
roleDefinitionIdOrName: 'Key Vault Administrator'
}
]
tags: allTags
Expand Down Expand Up @@ -473,15 +493,15 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.17.0' = {
}
{
name: 'AI_PROJECT_ENDPOINT'
value: aiServices.outputs.project.apiEndpoint // or equivalent
value: aiServices.outputs.aiProjectInfo.apiEndpoint // or equivalent
}
{
name: 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING' // This was not really used in code.
value: aiServices.outputs.project.apiEndpoint
value: aiServices.outputs.aiProjectInfo.apiEndpoint
}
{
name: 'AZURE_AI_AGENT_PROJECT_NAME'
value: aiServices.outputs.project.name
value: aiServices.outputs.aiProjectInfo.name
}
{
name: 'AZURE_AI_AGENT_RESOURCE_GROUP_NAME'
Expand All @@ -493,7 +513,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.17.0' = {
}
{
name: 'AZURE_AI_AGENT_ENDPOINT'
value: aiServices.outputs.project.apiEndpoint
value: aiServices.outputs.aiProjectInfo.apiEndpoint
}
{
name: 'AZURE_CLIENT_ID'
Expand Down
Loading