Update upstream MCP registry schema to v1.3.3 (2025-10-17)

cmd/thv-operator/pkg/sources/testutils.go

@@ -61,14 +61,16 @@ func (b *TestRegistryBuilder) WithServer(name string) *TestRegistryBuilder {
 		}
 	case mcpv1alpha1.RegistryFormatUpstream:
 		b.upstreamData = append(b.upstreamData, registry.UpstreamServerDetail{
-			Server: registry.UpstreamServer{
-				Name:        name,
-				Description: fmt.Sprintf("Test server description for %s", name),
-				Packages: []registry.UpstreamPackage{
-					{
-						RegistryName: "docker",
-						Name:         "test/image",
-						Version:      "latest",
+			Name:        name,
+			Description: fmt.Sprintf("Test server description for %s", name),
+			Version:     "1.0.0",
+			Packages: []registry.UpstreamPackage{
+				{
+					RegistryType: "oci",
+					Identifier:   "test/image",
+					Version:      "latest",
+					Transport: registry.UpstreamTransport{
+						Type: registry.UpstreamTransportTypeStdio,
 					},
 				},
 			},

cmd/thv-operator/pkg/sources/testutils_test.go

@@ -128,12 +128,12 @@ func TestTestRegistryBuilder_WithServer(t *testing.T) {
 			case mcpv1alpha1.RegistryFormatUpstream:
 				assert.Len(t, builder.upstreamData, 1)
 				serverDetail := builder.upstreamData[0]
-				assert.Equal(t, tt.expectedName, serverDetail.Server.Name)
-				assert.NotEmpty(t, serverDetail.Server.Description)
-				assert.Len(t, serverDetail.Server.Packages, 1)
-				pkg := serverDetail.Server.Packages[0]
-				assert.Equal(t, "docker", pkg.RegistryName)
-				assert.Equal(t, "test/image", pkg.Name)
+				assert.Equal(t, tt.expectedName, serverDetail.Name)
+				assert.NotEmpty(t, serverDetail.Description)
+				assert.Len(t, serverDetail.Packages, 1)
+				pkg := serverDetail.Packages[0]
+				assert.Equal(t, "oci", pkg.RegistryType)
+				assert.Equal(t, "test/image", pkg.Identifier)
 				assert.Equal(t, "latest", pkg.Version)
 			}
 		})

cmd/thv-operator/pkg/sources/types.go

@@ -117,11 +117,11 @@ func validateUpstreamFormatAndParse(data []byte) (*registry.Registry, error) {
 	}
 
 	for i, server := range upstreamServers {
-		if server.Server.Name == "" {
+		if server.Name == "" {
 			return nil, fmt.Errorf("server at index %d: name is required", i)
 		}
-		if server.Server.Description == "" {
-			return nil, fmt.Errorf("server at index %d (%s): description is required", i, server.Server.Name)
+		if server.Description == "" {
+			return nil, fmt.Errorf("server at index %d (%s): description is required", i, server.Name)
 		}
 	}
 
@@ -136,17 +136,17 @@ func validateUpstreamFormatAndParse(data []byte) (*registry.Registry, error) {
 	for _, upstreamServer := range upstreamServers {
 		serverMetadata, err := registry.ConvertUpstreamToToolhive(&upstreamServer)
 		if err != nil {
-			return nil, fmt.Errorf("failed to convert server %s: %w", upstreamServer.Server.Name, err)
+			return nil, fmt.Errorf("failed to convert server %s: %w", upstreamServer.Name, err)
 		}
 
 		// Add to appropriate map based on server type
 		switch server := serverMetadata.(type) {
 		case *registry.ImageMetadata:
-			toolhiveRegistry.Servers[upstreamServer.Server.Name] = server
+			toolhiveRegistry.Servers[upstreamServer.Name] = server
 		case *registry.RemoteServerMetadata:
-			toolhiveRegistry.RemoteServers[upstreamServer.Server.Name] = server
+			toolhiveRegistry.RemoteServers[upstreamServer.Name] = server
 		default:
-			return nil, fmt.Errorf("unknown server type for %s", upstreamServer.Server.Name)
+			return nil, fmt.Errorf("unknown server type for %s", upstreamServer.Name)
 		}
 	}
 

cmd/thv-operator/pkg/sources/types_test.go

@@ -159,23 +159,20 @@ func TestDefaultSourceDataValidator_ValidateData(t *testing.T) {
 	}`)
 
 	validUpstreamData := []byte(`[{
-		"server": {
-			"name": "test-server",
-			"description": "A test server for validation",
-			"status": "Active",
-			"version_detail": {
-				"version": "1.0.0"
-			},
-			"packages": [{
-				"registry_name": "docker",
-				"name": "test/image",
-				"version": "latest"
-			}]
-		},
-		"x-publisher": {
-			"x-dev.toolhive": {
+		"name": "test-server",
+		"description": "A test server for validation",
+		"version": "1.0.0",
+		"packages": [{
+			"registryType": "oci",
+			"identifier": "test/image",
+			"version": "latest",
+			"transport": {
+				"type": "stdio"
+			}
+		}],
+		"_meta": {
+			"dev.toolhive": {
 				"tier": "Community",
-				"transport": "stdio",
 				"tools": ["test_tool"]
 			}
 		}
@@ -238,9 +235,8 @@ func TestDefaultSourceDataValidator_ValidateData(t *testing.T) {
 		{
 			name: "upstream server missing name",
 			data: []byte(`[{
-				"server": {
-					"description": "Test server"
-				}
+				"description": "Test server",
+				"version": "1.0.0"
 			}]`),
 			format:        mcpv1alpha1.RegistryFormatUpstream,
 			expectError:   true,
@@ -249,9 +245,8 @@ func TestDefaultSourceDataValidator_ValidateData(t *testing.T) {
 		{
 			name: "upstream server missing description",
 			data: []byte(`[{
-				"server": {
-					"name": "test-server"
-				}
+				"name": "test-server",
+				"version": "1.0.0"
 			}]`),
 			format:        mcpv1alpha1.RegistryFormatUpstream,
 			expectError:   true,