88 "testing"
99 "time"
1010
11- "github.com/stacklok/toolhive/pkg/registry"
11+ toolhivetypes "github.com/stacklok/toolhive/pkg/registry/types "
1212 "github.com/stretchr/testify/assert"
1313 "github.com/stretchr/testify/require"
1414 "go.uber.org/mock/gomock"
@@ -233,12 +233,12 @@ const testRegistryJSON = `{
233233
234234// realisticRegistryProvider implements RegistryDataProvider for testing with our realistic test data
235235type realisticRegistryProvider struct {
236- data * registry .Registry
236+ data * toolhivetypes .Registry
237237}
238238
239239// newRealisticRegistryProvider creates a provider with our representative test data
240240func newRealisticRegistryProvider () (* realisticRegistryProvider , error ) {
241- var data registry .Registry
241+ var data toolhivetypes .Registry
242242 if err := json .Unmarshal ([]byte (testRegistryJSON ), & data ); err != nil {
243243 return nil , err
244244 }
@@ -249,7 +249,7 @@ func newRealisticRegistryProvider() (*realisticRegistryProvider, error) {
249249}
250250
251251// GetRegistryData implements RegistryDataProvider.GetRegistryData
252- func (p * realisticRegistryProvider ) GetRegistryData (_ context.Context ) (* registry .Registry , error ) {
252+ func (p * realisticRegistryProvider ) GetRegistryData (_ context.Context ) (* toolhivetypes .Registry , error ) {
253253 return p .data , nil
254254}
255255
@@ -321,14 +321,14 @@ func TestRegistryRouter(t *testing.T) {
321321
322322 mockSvc := mocks .NewMockRegistryService (ctrl )
323323 // Set up expectations for all routes
324- mockSvc .EXPECT ().GetRegistry (gomock .Any ()).Return (& registry .Registry {
324+ mockSvc .EXPECT ().GetRegistry (gomock .Any ()).Return (& toolhivetypes .Registry {
325325 Version : "1.0.0" ,
326326 LastUpdated : time .Now ().Format (time .RFC3339 ),
327- Servers : make (map [string ]* registry .ImageMetadata ),
327+ Servers : make (map [string ]* toolhivetypes .ImageMetadata ),
328328 }, "test" , nil ).AnyTimes ()
329- mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]registry .ServerMetadata {}, nil ).AnyTimes ()
330- mockSvc .EXPECT ().GetServer (gomock .Any (), "test-server" ).Return (& registry .ImageMetadata {
331- BaseServerMetadata : registry .BaseServerMetadata {
329+ mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]toolhivetypes .ServerMetadata {}, nil ).AnyTimes ()
330+ mockSvc .EXPECT ().GetServer (gomock .Any (), "test-server" ).Return (& toolhivetypes .ImageMetadata {
331+ BaseServerMetadata : toolhivetypes .BaseServerMetadata {
332332 Name : "test-server" ,
333333 },
334334 }, nil ).AnyTimes ()
@@ -402,7 +402,7 @@ func TestListServers_FormatParameter(t *testing.T) {
402402
403403 mockSvc := mocks .NewMockRegistryService (ctrl )
404404 // Expect successful calls for toolhive format only
405- mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]registry .ServerMetadata {}, nil ).Times (2 ) // default and explicit toolhive
405+ mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]toolhivetypes .ServerMetadata {}, nil ).Times (2 ) // default and explicit toolhive
406406
407407 router := v0 .Router (mockSvc )
408408
@@ -481,14 +481,14 @@ func TestNewServer(t *testing.T) {
481481
482482 // Set up expectations for all test routes
483483 mockSvc .EXPECT ().CheckReadiness (gomock .Any ()).Return (nil ).AnyTimes ()
484- mockSvc .EXPECT ().GetRegistry (gomock .Any ()).Return (& registry .Registry {
484+ mockSvc .EXPECT ().GetRegistry (gomock .Any ()).Return (& toolhivetypes .Registry {
485485 Version : "1.0.0" ,
486486 LastUpdated : time .Now ().Format (time .RFC3339 ),
487- Servers : make (map [string ]* registry .ImageMetadata ),
487+ Servers : make (map [string ]* toolhivetypes .ImageMetadata ),
488488 }, "test" , nil ).AnyTimes ()
489- mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]registry .ServerMetadata {}, nil ).AnyTimes ()
490- mockSvc .EXPECT ().GetServer (gomock .Any (), "test" ).Return (& registry .ImageMetadata {
491- BaseServerMetadata : registry .BaseServerMetadata {
489+ mockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]toolhivetypes .ServerMetadata {}, nil ).AnyTimes ()
490+ mockSvc .EXPECT ().GetServer (gomock .Any (), "test" ).Return (& toolhivetypes .ImageMetadata {
491+ BaseServerMetadata : toolhivetypes .BaseServerMetadata {
492492 Name : "test" ,
493493 },
494494 }, nil ).AnyTimes ()
@@ -588,12 +588,12 @@ func TestNewServer_WithMiddleware(t *testing.T) {
588588
589589// fileBasedRegistryProvider implements RegistryDataProvider for testing with embedded registry data
590590type fileBasedRegistryProvider struct {
591- data * registry .Registry
591+ data * toolhivetypes .Registry
592592}
593593
594594// newFileBasedRegistryProvider creates a new provider with embedded registry data
595595func newFileBasedRegistryProvider () (* fileBasedRegistryProvider , error ) {
596- var data registry .Registry
596+ var data toolhivetypes .Registry
597597 if err := json .Unmarshal ([]byte (testRegistryJSON ), & data ); err != nil {
598598 return nil , err
599599 }
@@ -604,7 +604,7 @@ func newFileBasedRegistryProvider() (*fileBasedRegistryProvider, error) {
604604}
605605
606606// GetRegistryData implements RegistryDataProvider.GetRegistryData
607- func (p * fileBasedRegistryProvider ) GetRegistryData (_ context.Context ) (* registry .Registry , error ) {
607+ func (p * fileBasedRegistryProvider ) GetRegistryData (_ context.Context ) (* toolhivetypes .Registry , error ) {
608608 return p .data , nil
609609}
610610
@@ -619,11 +619,11 @@ func (*fileBasedRegistryProvider) GetRegistryName() string {
619619}
620620
621621// Helper functions for testing the response conversion functions
622- func newServerSummaryResponseForTesting (server registry .ServerMetadata ) v0.ServerSummaryResponse {
622+ func newServerSummaryResponseForTesting (server toolhivetypes .ServerMetadata ) v0.ServerSummaryResponse {
623623 return v0 .NewServerSummaryResponseForTesting (server )
624624}
625625
626- func newServerDetailResponseForTesting (server registry .ServerMetadata ) v0.ServerDetailResponse {
626+ func newServerDetailResponseForTesting (server toolhivetypes .ServerMetadata ) v0.ServerDetailResponse {
627627 return v0 .NewServerDetailResponseForTesting (server )
628628}
629629
@@ -1396,8 +1396,8 @@ func TestHelperFunctions(t *testing.T) {
13961396 t .Parallel ()
13971397
13981398 // Test data setup
1399- testImageMetadata := & registry .ImageMetadata {
1400- BaseServerMetadata : registry .BaseServerMetadata {
1399+ testImageMetadata := & toolhivetypes .ImageMetadata {
1400+ BaseServerMetadata : toolhivetypes .BaseServerMetadata {
14011401 Name : "test-server" ,
14021402 Description : "Test server" ,
14031403 Tier : "Community" ,
@@ -1408,8 +1408,8 @@ func TestHelperFunctions(t *testing.T) {
14081408 Image : "test-image:latest" ,
14091409 }
14101410
1411- testRemoteMetadata := & registry .RemoteServerMetadata {
1412- BaseServerMetadata : registry .BaseServerMetadata {
1411+ testRemoteMetadata := & toolhivetypes .RemoteServerMetadata {
1412+ BaseServerMetadata : toolhivetypes .BaseServerMetadata {
14131413 Name : "remote-server" ,
14141414 Description : "Remote test server" ,
14151415 Tier : "Official" ,
@@ -1522,7 +1522,7 @@ func TestErrorScenarios(t *testing.T) {
15221522 t .Parallel ()
15231523 // This test needs its own mock since it calls ListServers (chi routes /servers/ to list endpoint)
15241524 emptyNameMockSvc := mocks .NewMockRegistryService (ctrl )
1525- emptyNameMockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]registry .ServerMetadata {}, nil )
1525+ emptyNameMockSvc .EXPECT ().ListServers (gomock .Any ()).Return ([]toolhivetypes .ServerMetadata {}, nil )
15261526
15271527 router := v0 .Router (emptyNameMockSvc )
15281528
0 commit comments