Skip to content

fix: ignore inactive remote URL conflicts #1317

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

Open
he-yufeng wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −0
Open

fix: ignore inactive remote URL conflicts #1317

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
3 changes: 3 additions & 0 deletions internal/service/registry_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@ func (s *registryServiceImpl) validateNoDuplicateRemoteURLs(ctx context.Context,

// Check if any conflicting server has a different name
for _, conflictingServer := range conflictingServers {
if conflictingServer.Meta.Official != nil && conflictingServer.Meta.Official.Status != model.StatusActive {
continue
}
if conflictingServer.Server.Name != serverDetail.Name {
return fmt.Errorf("remote URL %s is already used by server %s", remote.URL, conflictingServer.Server.Name)
}
Expand Down
26 changes: 26 additions & 0 deletions internal/service/registry_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
_, err := service.CreateServer(ctx, server)
require.NoError(t, err, "failed to create server: %v", err)
}
deprecatedServer := &apiv0.ServerJSON{
Schema: model.CurrentSchemaURL,
Name: "com.example/deprecated-server",
Description: "A deprecated server",
Version: "1.0.0",
Remotes: []model.Transport{
{Type: "streamable-http", URL: "https://old.example.com/mcp"},
},
}
_, err := service.CreateServer(ctx, deprecatedServer)
require.NoError(t, err)
_, err = service.UpdateServerStatus(ctx, deprecatedServer.Name, deprecatedServer.Version, &StatusChangeRequest{NewStatus: model.StatusDeprecated})
require.NoError(t, err)

tests := []struct {
name string
Expand Down Expand Up @@ -97,6 +110,19 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
expectError: true,
errorMsg: "remote URL https://api.example.com/mcp is already used by server com.example/existing-server",
},
{
name: "duplicate remote URL on deprecated server - should pass",
serverDetail: apiv0.ServerJSON{
Schema: model.CurrentSchemaURL,
Name: "com.example/replacement-server",
Description: "A replacement server",
Version: "1.0.0",
Remotes: []model.Transport{
{Type: "streamable-http", URL: "https://old.example.com/mcp"},
},
},
expectError: false,
},
{
name: "updating same server with same URLs - should pass",
serverDetail: apiv0.ServerJSON{
Expand Down
Loading