[MCP] Fix for inconsistent MCP enabled check#3303
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes inconsistent MCP enablement behavior so the /mcp endpoint is registered by default when the runtime.mcp block is omitted, aligning runtime behavior with mcp.enabled defaulting to true in config/model layers (closes #3284).
Changes:
- Default MCP options resolution now falls back to
new McpRuntimeOptions()whenruntime.mcpis absent, enabling endpoint registration by default. - REST routing guard now throws
GlobalMcpEndpointDisabledonly when MCP is actually disabled. - Added unit tests covering MCP enabled/disabled routing guard behavior and config defaulting of
IsMcpEnabled/McpPath.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| src/Azure.DataApiBuilder.Mcp/Core/McpEndpointRouteBuilderExtensions.cs | Ensures MCP endpoints are mapped by default when runtime.mcp is omitted. |
| src/Core/Services/RestService.cs | Gates the MCP-disabled 404 guard behind IsMcpEnabled. |
| src/Service.Tests/UnitTests/RestServiceUnitTests.cs | Adds unit tests for MCP path guard behavior in GetRouteAfterPathBase. |
| src/Service.Tests/Configuration/McpRuntimeOptionsSerializationTests.cs | Adds tests verifying IsMcpEnabled/McpPath defaults when runtime/mcp blocks are omitted. |
souvikghosh04
requested review from
Alekhya-Polavarapu,
Aniruddh25,
JerryNixon,
RubenCerna2079,
aaronburtle,
anushakolan,
rusamant,
sourabh1007,
stuartpa and
vadeveka
as code owners
Contributor
|
|
aaronburtle
approved these changes
Mar 24, 2026
Contributor
aaronburtle
left a comment
aaronburtle
left a comment
There was a problem hiding this comment.
Looks good, just needs the same fix in Cli.ConfigGenerator
…a-api-builder into Usr/sogh/mcpenabledfix
Contributor
Author
Added a fix. |
RubenCerna2079
approved these changes
Mar 25, 2026
Contributor
RubenCerna2079
left a comment
RubenCerna2079
left a comment
There was a problem hiding this comment.
LGTM! Just needs a few comments to be addressed.
RubenCerna2079
approved these changes
Mar 25, 2026
github-project-automation
Bot
moved this from Review In Progress
to Done
in Data API builder
RubenCerna2079
added a commit
that referenced
this pull request
May 6, 2026
Cherry-picks MCP bug fixes from main to release/2.0: - f6dd0df [MCP] Bug-fix- aggregate_records always requires groupby (#3294) - 2811fba [MCP] Fix for inconsistent MCP enabled check (#3303) --------- Co-authored-by: Aniruddh Munde <anmunde@microsoft.com> Co-authored-by: RubenCerna2079 <32799214+RubenCerna2079@users.noreply.github.com>
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.
Why make this change?
mcp.enableddefaults are not working #3284MCP endpoint returns 404 when the mcp config block is omitted, despite mcp.enabled defaulting to true across schema, CLI, and model layers.
What is this change?
McpEndpointRouteBuilderExtensions.TryGetMcpOptions: Falls back to newMcpRuntimeOptions()whenRuntime.Mcpisnull, so the/mcpendpoint is registered by default.RestService.GetRouteAfterPathBase: Guards theGlobalMcpEndpointDisabledexception with anIsMcpEnabledcheck so MCP path requests are not unconditionally rejected.How was this tested?
Sample Request(s)
/mcp
/health