Skip to content

fix: updated the post deployment script for selected scenario run and WAF and EXP alignment #1015

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
TravisHilbert merged 1 commit into from
Jun 2, 2026
Merged

fix: updated the post deployment script for selected scenario run and WAF and EXP alignment #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,17 +1967,15 @@ module searchServiceIdentity 'br/public:avm/res/search/search-service:0.11.1' =
// ========== Search Service MI → AI Services Role Assignment ========== //
// The Search service system MI needs Cognitive Services OpenAI User on the AI Services account
// so that Knowledge Base MCP tools can call the model for semantic retrieval.
resource aiServicesForSearchRole 'Microsoft.CognitiveServices/accounts@2025-06-01' existing = {
name: aiFoundryAiServicesResourceName
}

resource searchServiceOpenAIRole 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(aiServicesForSearchRole.id, searchServiceName, '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd')
scope: aiServicesForSearchRole
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd') // Cognitive Services OpenAI User
principalId: searchServiceIdentity.outputs.systemAssignedMIPrincipalId!
principalType: 'ServicePrincipal'
// Deployed via a module scoped to the AI Services account's resource group so it works
// for both new and existing (cross-RG / cross-subscription) Foundry deployments.
module searchServiceOpenAIRole 'modules/search-openai-role.bicep' = {
name: take('module.search-openai-role.${solutionSuffix}', 64)
scope: resourceGroup(aiFoundryAiServicesSubscriptionId, aiFoundryAiServicesResourceGroupName)
params: {
aiFoundryAccountName: aiFoundryAiServicesResourceName
searchServicePrincipalId: searchServiceIdentity.outputs.systemAssignedMIPrincipalId!
roleNameGuidSeed: searchServiceName
}
}

Expand Down
24 changes: 24 additions & 0 deletions infra/modules/search-openai-role.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// ========================================================================
// Assigns "Cognitive Services OpenAI User" on an AI Services (Cognitive
// Services) account to the Search service's system-assigned managed identity.
// Deployed at the scope of the AI Services account's resource group so it
// works for both new and existing (cross-RG / cross-subscription) Foundry.
// ========================================================================

param aiFoundryAccountName string
param searchServicePrincipalId string
param roleNameGuidSeed string

resource aiServicesAccount 'Microsoft.CognitiveServices/accounts@2025-06-01' existing = {
name: aiFoundryAccountName
}

resource searchServiceOpenAIRole 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(aiServicesAccount.id, roleNameGuidSeed, '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd')
scope: aiServicesAccount
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd') // Cognitive Services OpenAI User
principalId: searchServicePrincipalId
principalType: 'ServicePrincipal'
}
}
Loading