Set SearchAudience based on Cloud configuration when creating Search SDK clients#2283
Merged
alzimmermsft merged 1 commit intomicrosoft:release/azure/2.xfrom Mar 30, 2026
Conversation
…SDK clients (microsoft#2278) * Set SearchAudience based on Cloud configuration when creating Search SDK clients * Update cache key to include cloud
alzimmermsft
requested review from
a team,
jongio and
pablocastro
as code owners
alzimmermsft
requested review from
KarishmaGhiya,
Copilot,
g2vinay and
hallipr
and removed request for
a team
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes Azure AI Search authentication for sovereign clouds by configuring SearchClientOptions.Audience based on the active Azure cloud configuration, ensuring OAuth token scopes match the data-plane endpoint audience.
Changes:
- Set
SearchClientOptions.Audiencewhen creatingSearchIndexClientandKnowledgeBaseRetrievalClient. - Include cloud type in Search tool cache keys to avoid cross-cloud cache reuse.
- Add an Azure MCP Server changelog entry for the bug fix.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| tools/Azure.Mcp.Tools.Search/src/Services/SearchService.cs | Sets Search SDK audience per cloud and updates cache keys to include cloud type. |
| servers/Azure.Mcp.Server/changelog-entries/1774884924148.yaml | Adds a changelog entry describing the SearchAudience fix. |
vcolin7
approved these changes
Mar 30, 2026
21 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes authentication issues with Azure AI Search tools where they weren't setting
SearchAudiencebased on the cloud configuration of Azure MCP, resulting in a mismatch audience issue.Now all Search SDKs have
SearchAudienceconfigured based on which cloud is being interacted with.GitHub issue number?
Backports fix for #2276
Pre-merge Checklist
servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentationREADME.mdchanges running the script./eng/scripts/Process-PackageReadMe.ps1. See Package READMEToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test promptsconsolidated-tools.jsonbreaking-changelabelservers/Azure.Mcp.Server/docs/azmcp-commands.md./eng/scripts/Update-AzCommandsMetadata.ps1to update tool metadata inazmcp-commands.md(required for CI)servers/Azure.Mcp.Server/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline