Enforce schema validation on the publish and edit API level (#598)
<!-- Provide a brief summary of your changes --> ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> The following PR: * Enforces schema validation on the API level (requests without schema or older schema will fail) * Updates the unit tests and examples to match that ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> ## Breaking Changes <!-- Will users need to update their code or configurations? --> **Note this can be considered breaking if clients have not included it before.** ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [ ] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions --> --------- Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
This commit is contained in:
Radoslav Dimitrov
GitHub
parent
e0f30f1a29
commit
44950c23bb
1 changed files with 244 additions and 21 deletions
|
|
@ -22,6 +22,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
// Create test data
|
||||
existingServers := map[string]*apiv0.ServerJSON{
|
||||
"existing1": {
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/existing-server",
|
||||
Description: "An existing server",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -31,6 +32,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
},
|
||||
},
|
||||
"existing2": {
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.microsoft/another-server",
|
||||
Description: "Another existing server",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -58,6 +60,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
{
|
||||
name: "no remote URLs - should pass",
|
||||
serverDetail: apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/new-server",
|
||||
Description: "A new server with no remotes",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -68,6 +71,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
{
|
||||
name: "new unique remote URLs - should pass",
|
||||
serverDetail: apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/new-server-unique",
|
||||
Description: "A new server",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -81,6 +85,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
{
|
||||
name: "duplicate remote URL - should fail",
|
||||
serverDetail: apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/new-server-duplicate",
|
||||
Description: "A new server with duplicate URL",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -94,6 +99,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
|
|||
{
|
||||
name: "updating same server with same URLs - should pass",
|
||||
serverDetail: apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/existing-server", // Same name as existing
|
||||
Description: "Updated existing server",
|
||||
Version: "1.1.0", // Different version
|
||||
|
|
@ -128,6 +134,7 @@ func TestGetServerByName(t *testing.T) {
|
|||
|
||||
// Create multiple versions of the same server
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/test-server",
|
||||
Description: "Test server v1",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -135,6 +142,7 @@ func TestGetServerByName(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
_, err = service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/test-server",
|
||||
Description: "Test server v2",
|
||||
Version: "2.0.0",
|
||||
|
|
@ -197,6 +205,7 @@ func TestGetServerByNameAndVersion(t *testing.T) {
|
|||
|
||||
// Create multiple versions of the same server
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Versioned server v1",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -204,6 +213,7 @@ func TestGetServerByNameAndVersion(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
_, err = service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Versioned server v2",
|
||||
Version: "2.0.0",
|
||||
|
|
@ -288,6 +298,7 @@ func TestGetAllVersionsByServerName(t *testing.T) {
|
|||
|
||||
// Create multiple versions of the same server
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Multi-version server v1",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -295,6 +306,7 @@ func TestGetAllVersionsByServerName(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
_, err = service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Multi-version server v2",
|
||||
Version: "2.0.0",
|
||||
|
|
@ -302,6 +314,7 @@ func TestGetAllVersionsByServerName(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
_, err = service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Multi-version server v2.1",
|
||||
Version: "2.1.0",
|
||||
|
|
@ -388,6 +401,7 @@ func TestCreateServerConcurrentVersionsNoRace(t *testing.T) {
|
|||
go func(idx int) {
|
||||
defer wg.Done()
|
||||
result, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: fmt.Sprintf("Version %d", idx),
|
||||
Version: fmt.Sprintf("1.0.%d", idx),
|
||||
|
|
@ -437,6 +451,7 @@ func TestUpdateServer(t *testing.T) {
|
|||
|
||||
// Create initial server
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Original description",
|
||||
Version: version,
|
||||
|
|
@ -461,6 +476,7 @@ func TestUpdateServer(t *testing.T) {
|
|||
serverName: serverName,
|
||||
version: version,
|
||||
updatedServer: &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Updated description",
|
||||
Version: version,
|
||||
|
|
@ -482,6 +498,7 @@ func TestUpdateServer(t *testing.T) {
|
|||
serverName: serverName,
|
||||
version: version,
|
||||
updatedServer: &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Updated with status change",
|
||||
Version: version,
|
||||
|
|
@ -499,6 +516,7 @@ func TestUpdateServer(t *testing.T) {
|
|||
serverName: "com.example/non-existent",
|
||||
version: "1.0.0",
|
||||
updatedServer: &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/non-existent",
|
||||
Description: "Should fail",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -540,6 +558,7 @@ func TestUpdateServer_SkipValidationForDeletedServers(t *testing.T) {
|
|||
|
||||
// Create server with invalid package configuration (this would fail registry validation)
|
||||
invalidServer := &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Server with invalid package for testing validation skip",
|
||||
Version: version,
|
||||
|
|
@ -572,6 +591,7 @@ func TestUpdateServer_SkipValidationForDeletedServers(t *testing.T) {
|
|||
|
||||
// Now try to update a deleted server - validation should be skipped
|
||||
updatedInvalidServer := &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: "Updated description for deleted server",
|
||||
Version: version,
|
||||
|
|
@ -594,6 +614,7 @@ func TestUpdateServer_SkipValidationForDeletedServers(t *testing.T) {
|
|||
|
||||
// Test updating a server being set to deleted status
|
||||
activeServer := &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: "com.example/being-deleted-test",
|
||||
Description: "Server being deleted",
|
||||
Version: "1.0.0",
|
||||
|
|
@ -639,6 +660,7 @@ func TestListServers(t *testing.T) {
|
|||
|
||||
for _, server := range testServers {
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: server.name,
|
||||
Description: server.description,
|
||||
Version: server.version,
|
||||
|
|
@ -736,6 +758,7 @@ func TestVersionComparison(t *testing.T) {
|
|||
time.Sleep(v.delay)
|
||||
}
|
||||
_, err := service.CreateServer(ctx, &apiv0.ServerJSON{
|
||||
Schema: model.CurrentSchemaURL,
|
||||
Name: serverName,
|
||||
Description: v.description,
|
||||
Version: v.version,
|
||||
|
|
|
|||
Loading…
Reference in a new issue