modelcontextprotocol/registry
Watch
1
0
Fork
You've already forked registry
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up schema by simplifying version structure (#379)

Browse source 
## Summary

Simplified the schema structure by:
- Replacing `version_detail.version` with direct `version` field  
- Removing unused `release_date` field from seed data
- Updating all API types, models, and tests to match new structure
- Maintaining backwards compatibility in API responses

This change makes the schema more intuitive and reduces nesting depth.
This commit is contained in:
adam jones 2025-09-08 14:32:59 -07:00 • committed by GitHub
commit f975e68cf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 540 additions and 1973 deletions
Download patch file Download diff file Expand all files Collapse all files

32
internal/api/handlers/v0/edit_test.go
View file

@ -34,9 +34,7 @@ func TestEditServerEndpoint(t *testing.T) {
Source: "github",
ID: "domdomegg/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
published, err := registryService.Publish(testServer)
assert.NoError(t, err)
@ -56,9 +54,7 @@ func TestEditServerEndpoint(t *testing.T) {
Source: "github",
ID: "other/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
otherPublished, err := registryService.Publish(otherServer)
assert.NoError(t, err)
@ -78,9 +74,7 @@ func TestEditServerEndpoint(t *testing.T) {
Source: "github",
ID: "domdomegg/deleted-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
deletedPublished, err := registryService.Publish(deletedServer)
assert.NoError(t, err)
@ -120,9 +114,7 @@ func TestEditServerEndpoint(t *testing.T) {
Source: "github",
ID: "domdomegg/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.1",
},
Version: "1.0.1",
},
serverID: testServerID,
expectedStatus: http.StatusOK,
@ -141,7 +133,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.domdomegg/test-server",
Description: "Test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: testServerID,
expectedStatus: http.StatusUnauthorized,
@ -153,7 +145,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.domdomegg/test-server",
Description: "Test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: testServerID,
expectedStatus: http.StatusUnauthorized,
@ -175,7 +167,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.domdomegg/test-server",
Description: "Updated test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: testServerID,
expectedStatus: http.StatusForbidden,
@ -197,7 +189,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.other/test-server",
Description: "Updated test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: otherServerID,
expectedStatus: http.StatusForbidden,
@ -219,7 +211,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.domdomegg/nonexistent-server",
Description: "Updated test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: "550e8400-e29b-41d4-a716-446655440999", // Non-existent ID
expectedStatus: http.StatusNotFound,
@ -241,7 +233,7 @@ func TestEditServerEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "invalid-name-format", // Missing namespace/name format
Description: "Test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
serverID: testServerID,
expectedStatus: http.StatusBadRequest,
@ -269,9 +261,7 @@ func TestEditServerEndpoint(t *testing.T) {
Source: "github",
ID: "domdomegg/deleted-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.1",
},
Version: "1.0.1",
},
serverID: deletedServerID,
expectedStatus: http.StatusBadRequest,

22
internal/api/handlers/v0/publish_integration_test.go
View file

@ -64,9 +64,7 @@ func TestPublishIntegration(t *testing.T) {
Source: "github",
ID: "testuser/test-mcp-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
// Generate valid JWT token
@ -97,7 +95,7 @@ func TestPublishIntegration(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, publishReq.Name, response.Name)
assert.Equal(t, publishReq.VersionDetail.Version, response.VersionDetail.Version)
assert.Equal(t, publishReq.Version, response.Version)
})
t.Run("successful publish with none auth (no prefix)", func(t *testing.T) {
@ -109,9 +107,7 @@ func TestPublishIntegration(t *testing.T) {
Source: "github",
ID: "example/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
// Generate valid JWT token with wildcard permission
@ -166,7 +162,7 @@ func TestPublishIntegration(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "io.github.domdomegg/test-server",
Description: "Test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
body, err := json.Marshal(publishReq)
@ -187,9 +183,7 @@ func TestPublishIntegration(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "io.github.other/test-server",
Description: "A test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Repository: model.Repository{
URL: "https://github.com/example/test-server",
Source: "github",
@ -225,9 +219,7 @@ func TestPublishIntegration(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "io.github.domdomegg/airtable-mcp-server",
Description: "A test server with MCPB package",
VersionDetail: model.VersionDetail{
Version: "1.7.2",
},
Version: "1.7.2",
Status: model.StatusActive,
Packages: []model.Package{
{
@ -269,7 +261,7 @@ func TestPublishIntegration(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, publishReq.Name, response.Name)
assert.Equal(t, publishReq.VersionDetail.Version, response.VersionDetail.Version)
assert.Equal(t, publishReq.Version, response.Version)
assert.Len(t, response.Packages, 1)
assert.Equal(t, model.RegistryTypeMCPB, response.Packages[0].RegistryType)
})

18
internal/api/handlers/v0/publish_registry_validation_test.go
View file

@ -47,9 +47,7 @@ func TestPublishRegistryValidation(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "com.example/test-server-with-npm",
Description: "A test server with invalid npm package reference",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Packages: []model.Package{
{
RegistryType: model.RegistryTypeNPM,
@ -90,9 +88,7 @@ func TestPublishRegistryValidation(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "com.example/test-server-mcpb-validation",
Description: "A test server with MCPB package and registry validation enabled",
VersionDetail: model.VersionDetail{
Version: "0.0.36",
},
Version: "0.0.36",
Packages: []model.Package{
{
RegistryType: model.RegistryTypeMCPB,
@ -133,7 +129,7 @@ func TestPublishRegistryValidation(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, publishReq.Name, response.Name)
assert.Equal(t, publishReq.VersionDetail.Version, response.VersionDetail.Version)
assert.Equal(t, publishReq.Version, response.Version)
assert.Len(t, response.Packages, 1)
assert.Equal(t, model.RegistryTypeMCPB, response.Packages[0].RegistryType)
})
@ -142,9 +138,7 @@ func TestPublishRegistryValidation(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "com.example/test-server-multiple-packages",
Description: "A test server with multiple packages where second fails",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Packages: []model.Package{
{
RegistryType: model.RegistryTypeMCPB,
@ -195,9 +189,7 @@ func TestPublishRegistryValidation(t *testing.T) {
publishReq := apiv0.ServerJSON{
Name: "com.example/test-server-first-package-fails",
Description: "A test server where first package fails",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Packages: []model.Package{
{
RegistryType: model.RegistryTypeNPM,

30
internal/api/handlers/v0/publish_test.go
View file

@ -63,9 +63,7 @@ func TestPublishEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
},
tokenClaims: &auth.JWTClaims{
AuthMethod: auth.MethodGitHubAT,
@ -89,9 +87,7 @@ func TestPublishEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-server",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
},
tokenClaims: &auth.JWTClaims{
AuthMethod: auth.MethodNone,
@ -119,7 +115,7 @@ func TestPublishEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.domdomegg/test-server",
Description: "Test server",
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
},
authHeader: "InvalidFormat",
setupRegistryService: func(_ service.RegistryService) {
@ -133,9 +129,7 @@ func TestPublishEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "test-server",
Description: "A test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
},
authHeader: "Bearer invalidToken",
setupRegistryService: func(_ service.RegistryService) {
@ -149,9 +143,7 @@ func TestPublishEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "io.github.other/test-server",
Description: "A test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Repository: model.Repository{
URL: "https://github.com/example/test-server",
Source: "github",
@ -175,9 +167,7 @@ func TestPublishEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "example/test-server",
Description: "A test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Repository: model.Repository{
URL: "https://github.com/example/test-server",
Source: "github",
@ -195,9 +185,7 @@ func TestPublishEndpoint(t *testing.T) {
existingServer := apiv0.ServerJSON{
Name: "example/test-server",
Description: "Existing test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Repository: model.Repository{
URL: "https://github.com/example/test-server-existing",
Source: "github",
@ -214,9 +202,7 @@ func TestPublishEndpoint(t *testing.T) {
requestBody: apiv0.ServerJSON{
Name: "com.example/test-server-mcpb",
Description: "A test server with MCPB package",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
Packages: []model.Package{
{
RegistryType: model.RegistryTypeMCPB,

38
internal/api/handlers/v0/servers_test.go
View file

@ -41,9 +41,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-server-1",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
server2 := apiv0.ServerJSON{
Name: "com.example/test-server-2",
@ -53,9 +51,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-server-2",
},
VersionDetail: model.VersionDetail{
Version: "2.0.0",
},
Version: "2.0.0",
}
_, _ = registry.Publish(server1)
_, _ = registry.Publish(server2)
@ -75,9 +71,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-server-3",
},
VersionDetail: model.VersionDetail{
Version: "1.5.0",
},
Version: "1.5.0",
}
_, _ = registry.Publish(server)
},
@ -139,7 +133,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/test-matching",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
server2 := apiv0.ServerJSON{
Name: "com.example/other-server",
@ -149,7 +143,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/other",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
_, _ = registry.Publish(server1)
_, _ = registry.Publish(server2)
@ -169,7 +163,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/recent",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
_, _ = registry.Publish(server)
},
@ -188,7 +182,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/versioned",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
server2 := apiv0.ServerJSON{
Name: "com.example/versioned-server",
@ -198,7 +192,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/versioned",
},
VersionDetail: model.VersionDetail{Version: "2.0.0"},
Version: "2.0.0",
}
_, _ = registry.Publish(server1)
_, _ = registry.Publish(server2) // This will be marked as latest
@ -218,7 +212,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/combined",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
server2 := apiv0.ServerJSON{
Name: "com.example/other-server",
@ -228,7 +222,7 @@ func TestServersListEndpoint(t *testing.T) {
Source: "github",
ID: "example/nomatch",
},
VersionDetail: model.VersionDetail{Version: "1.0.0"},
Version: "1.0.0",
}
_, _ = registry.Publish(server1)
_, _ = registry.Publish(server2)
@ -342,9 +336,7 @@ func TestServersDetailEndpoint(t *testing.T) {
testServer, err := registryService.Publish(apiv0.ServerJSON{
Name: "com.example/test-server",
Description: "A test server",
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
})
assert.NoError(t, err)
@ -430,9 +422,7 @@ func TestServersEndpointsIntegration(t *testing.T) {
Source: "github",
ID: "example/integration-test",
},
VersionDetail: model.VersionDetail{
Version: "1.0.0",
},
Version: "1.0.0",
}
published, err := registryService.Publish(testServer)
@ -488,7 +478,7 @@ func TestServersEndpointsIntegration(t *testing.T) {
assert.Equal(t, servers[0].Name, listResp.Servers[0].Name)
assert.Equal(t, servers[0].Description, listResp.Servers[0].Description)
assert.Equal(t, servers[0].Repository, listResp.Servers[0].Repository)
assert.Equal(t, servers[0].VersionDetail, listResp.Servers[0].VersionDetail)
assert.Equal(t, servers[0].Version, listResp.Servers[0].Version)
}
})
@ -522,7 +512,7 @@ func TestServersEndpointsIntegration(t *testing.T) {
assert.Equal(t, serverDetail.Name, serverDetailResp.Name)
assert.Equal(t, serverDetail.Description, serverDetailResp.Description)
assert.Equal(t, serverDetail.Repository, serverDetailResp.Repository)
assert.Equal(t, serverDetail.VersionDetail, serverDetailResp.VersionDetail)
assert.Equal(t, serverDetail.Version, serverDetailResp.Version)
})
// Verify mock expectations

4
internal/api/handlers/v0/telemetry_test.go
View file

@ -30,9 +30,7 @@ func TestPrometheusHandler(t *testing.T) {
Source: "github",
ID: "example/test-server",
},
VersionDetail: model.VersionDetail{
Version: "2.0.0",
},
Version: "2.0.0",
})
assert.NoError(t, err)