Skip to content

Fixing endpoint checking and allocation #1018

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
aaronpowell merged 5 commits into from
Dec 3, 2025
Merged

Fixing endpoint checking and allocation #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1c2bc9
Fixing endpoint checking and allocation
aaronpowell Dec 1, 2025
e106994
Merge branch 'main' into aaronpowell/issue1010
aaronpowell Dec 1, 2025
f861f67
better handling of endpoint names
aaronpowell Dec 2, 2025
4a0a88d
Merge branch 'aaronpowell/issue1010' of https://github.com/CommunityT…
aaronpowell Dec 2, 2025
f45a5a9
Fixing last test
aaronpowell Dec 2, 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
9 changes: 5 additions & 4 deletions ...tor/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5230",
"applicationUrl": "https://localhost:7295;http://localhost:5230",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:7295;http://localhost:5230",
"applicationUrl": "http://localhost:5230",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

10 changes: 9 additions & 1 deletion src/CommunityToolkit.Aspire.Hosting.McpInspector/McpInspectorResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,17 @@ internal void AddMcpServer(IResourceWithEndpoints mcpServer, bool isDefault, Mcp
throw new InvalidOperationException($"The MCP server {mcpServer.Name} is already added to the MCP Inspector resource.");
}

if (!mcpServer.TryGetEndpoints(out var endpoints) || !endpoints.Any())
{
throw new InvalidOperationException($"The MCP server {mcpServer.Name} must have at least one endpoint defined.");
}

McpServerMetadata item = new(
mcpServer.Name,
mcpServer.GetEndpoint("https") ?? mcpServer.GetEndpoint("http") ?? throw new InvalidOperationException($"The MCP server {mcpServer.Name} must have an 'https' or 'http' endpoint defined."),
mcpServer.GetEndpoint(
endpoints.FirstOrDefault(e => e.Name == "https")?.Name
?? endpoints.FirstOrDefault(e => e.Name == "http")?.Name
?? endpoints.First().Name),
transportType,
path);

Expand Down
6 changes: 2 additions & 4 deletions ...tyToolkit.Aspire.Hosting.McpInspector.Tests/McpInspectorResourceBuilderExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,7 @@ public void WithMcpServerSupportsHttpsEndpoint()
var appBuilder = DistributedApplication.CreateBuilder();

// Create a mock MCP server resource with https endpoint (uses name "https")
var mockServer = appBuilder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_McpInspector_McpServer>("mcpServer")
.WithHttpsEndpoint(name: "https");
var mockServer = appBuilder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_McpInspector_McpServer>("mcpServer");

// Act
var inspector = appBuilder.AddMcpInspector("inspector")
Expand Down Expand Up @@ -448,8 +447,7 @@ public void WithMcpServerPrefersHttpsOverHttp()

// Create a mock MCP server resource with both https and http endpoints
// AddProject creates "http" by default, we add "https" with explicit name
var mockServer = appBuilder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_McpInspector_McpServer>("mcpServer")
.WithHttpsEndpoint(name: "https");
var mockServer = appBuilder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_McpInspector_McpServer>("mcpServer");

// Act
var inspector = appBuilder.AddMcpInspector("inspector")
Expand Down
Loading