Skip to content

Commit 759cdba

Browse files
authored
Remove NewUpstreamRegistryFromUpstreamServers (#2752)
Signed-off-by: Radoslav Dimitrov <[email protected]>
1 parent d3588aa commit 759cdba

File tree

2 files changed

+0
-102
lines changed

2 files changed

+0
-102
lines changed

pkg/registry/converters/registry_converters.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,12 @@ package converters
22

33
import (
44
"fmt"
5-
"time"
65

76
upstreamv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
87

98
types "github.com/stacklok/toolhive/pkg/registry/registry"
109
)
1110

12-
// NewUpstreamRegistryFromUpstreamServers creates a UpstreamRegistry from upstream ServerJSON array.
13-
// This is used when ingesting data from upstream MCP Registry API endpoints.
14-
func NewUpstreamRegistryFromUpstreamServers(servers []upstreamv0.ServerJSON) *types.UpstreamRegistry {
15-
return &types.UpstreamRegistry{
16-
Schema: "https://raw.githubusercontent.com/stacklok/toolhive/main/pkg/registry/data/upstream-registry.schema.json",
17-
Version: "1.0.0",
18-
Meta: types.UpstreamMeta{
19-
LastUpdated: time.Now().Format(time.RFC3339),
20-
},
21-
Data: types.UpstreamData{
22-
Servers: servers,
23-
Groups: []types.UpstreamGroup{},
24-
},
25-
}
26-
}
27-
2811
// NewUpstreamRegistryFromToolhiveRegistry creates a UpstreamRegistry from ToolHive Registry.
2912
// This converts ToolHive format to upstream ServerJSON using the converters package.
3013
// Used when ingesting data from ToolHive-format sources (Git, File, API).

pkg/registry/converters/registry_converters_test.go

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ package converters
22

33
import (
44
"testing"
5-
"time"
65

7-
upstreamv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
8-
"github.com/modelcontextprotocol/registry/pkg/model"
96
"github.com/stretchr/testify/assert"
10-
"github.com/stretchr/testify/require"
117

128
types "github.com/stacklok/toolhive/pkg/registry/registry"
139
)
@@ -113,84 +109,3 @@ func TestNewUpstreamRegistryFromToolhiveRegistry(t *testing.T) {
113109
})
114110
}
115111
}
116-
117-
func TestNewUpstreamRegistryFromUpstreamServers(t *testing.T) {
118-
t.Parallel()
119-
120-
tests := []struct {
121-
name string
122-
servers []upstreamv0.ServerJSON
123-
validate func(*testing.T, *types.UpstreamRegistry)
124-
}{
125-
{
126-
name: "create from upstream servers",
127-
servers: []upstreamv0.ServerJSON{
128-
{
129-
Schema: "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
130-
Name: "io.test/server1",
131-
Description: "Test server 1",
132-
Version: "1.0.0",
133-
Packages: []model.Package{
134-
{
135-
RegistryType: "oci",
136-
Identifier: "test/image:latest",
137-
Transport: model.Transport{Type: "stdio"},
138-
},
139-
},
140-
},
141-
},
142-
validate: func(t *testing.T, sr *types.UpstreamRegistry) {
143-
t.Helper()
144-
assert.Equal(t, "1.0.0", sr.Version)
145-
assert.NotEmpty(t, sr.Meta.LastUpdated)
146-
assert.Len(t, sr.Data.Servers, 1)
147-
assert.Equal(t, "io.test/server1", sr.Data.Servers[0].Name)
148-
},
149-
},
150-
{
151-
name: "create from empty slice",
152-
servers: []upstreamv0.ServerJSON{},
153-
validate: func(t *testing.T, sr *types.UpstreamRegistry) {
154-
t.Helper()
155-
assert.Empty(t, sr.Data.Servers)
156-
},
157-
},
158-
}
159-
160-
for _, tt := range tests {
161-
t.Run(tt.name, func(t *testing.T) {
162-
t.Parallel()
163-
164-
result := NewUpstreamRegistryFromUpstreamServers(tt.servers)
165-
166-
assert.NotNil(t, result)
167-
if tt.validate != nil {
168-
tt.validate(t, result)
169-
}
170-
})
171-
}
172-
}
173-
174-
func TestNewServerRegistryFromUpstream_DefaultValues(t *testing.T) {
175-
t.Parallel()
176-
177-
servers := []upstreamv0.ServerJSON{
178-
{
179-
Schema: "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
180-
Name: "io.test/server1",
181-
Description: "Test server",
182-
Version: "1.0.0",
183-
},
184-
}
185-
186-
result := NewUpstreamRegistryFromUpstreamServers(servers)
187-
188-
// Verify defaults
189-
assert.Equal(t, "1.0.0", result.Version)
190-
assert.NotEmpty(t, result.Meta.LastUpdated)
191-
192-
// Verify timestamp is recent (within last minute)
193-
parsedTime, err := time.Parse(time.RFC3339, result.Meta.LastUpdated)
194-
require.NoError(t, err)
195-
assert.WithinDuration(t, time.Now(), parsedTime, time.Minute)
196-
}

0 commit comments

Comments
 (0)