rebased :(

dmartinol · dmartinol · commit 170eaf17f3ee · 2025-11-18T09:24:30.000+01:00
diff --git a/internal/app/builder.go b/internal/app/builder.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stacklok/toolhive-registry-server/internal/api"
 	"github.com/stacklok/toolhive-registry-server/internal/config"
 	"github.com/stacklok/toolhive-registry-server/internal/service"
-	sources2 "github.com/stacklok/toolhive-registry-server/internal/sources"
+	"github.com/stacklok/toolhive-registry-server/internal/sources"
 	"github.com/stacklok/toolhive-registry-server/internal/status"
 	pkgsync "github.com/stacklok/toolhive-registry-server/internal/sync"
 	"github.com/stacklok/toolhive-registry-server/internal/sync/coordinator"
@@ -41,8 +41,8 @@ type registryAppConfig struct {
 	config *config.Config
 
 	// Optional component overrides (primarily for testing)
-	sourceHandlerFactory sources2.SourceHandlerFactory
-	storageManager       sources2.StorageManager
+	sourceHandlerFactory sources.SourceHandlerFactory
+	storageManager       sources.StorageManager
 	statusPersistence    status.StatusPersistence
 	syncManager          pkgsync.Manager
 	registryProvider     service.RegistryDataProvider
@@ -184,15 +184,15 @@ func WithDataDirectory(dir string) RegistryAppOptions {
 }
 
 // WithSourceHandlerFactory allows injecting a custom source handler factory (for testing)
-func WithSourceHandlerFactory(factory sources2.SourceHandlerFactory) RegistryAppOptions {
+func WithSourceHandlerFactory(factory sources.SourceHandlerFactory) RegistryAppOptions {
 	return func(cfg *registryAppConfig) error {
 		cfg.sourceHandlerFactory = factory
 		return nil
 	}
 }
 
 // WithStorageManager allows injecting a custom storage manager (for testing)
-func WithStorageManager(sm sources2.StorageManager) RegistryAppOptions {
+func WithStorageManager(sm sources.StorageManager) RegistryAppOptions {
 	return func(cfg *registryAppConfig) error {
 		cfg.storageManager = sm
 		return nil
@@ -239,7 +239,7 @@ func buildSyncComponents(
 
 	// Build source handler factory
 	if b.sourceHandlerFactory == nil {
-		b.sourceHandlerFactory = sources2.NewSourceHandlerFactory()
+		b.sourceHandlerFactory = sources.NewSourceHandlerFactory()
 	}
 
 	// Build storage manager
@@ -248,7 +248,7 @@ func buildSyncComponents(
 		if err := os.MkdirAll(b.dataDir, 0750); err != nil {
 			return nil, fmt.Errorf("failed to create data directory %s: %w", b.dataDir, err)
 		}
-		b.storageManager = sources2.NewFileStorageManager(b.dataDir)
+		b.storageManager = sources.NewFileStorageManager(b.dataDir)
 	}
 
 	// Build status persistence
diff --git a/internal/registry/server_registry.go b/internal/registry/server_registry.go
diff --git a/internal/registry/server_registry_test.go b/internal/registry/server_registry_test.go
diff --git a/internal/service/file_provider_test.go b/internal/service/file_provider_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
-	sourcesmocks "github.com/stacklok/toolhive-registry-server/pkg/sources/mocks"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
+	sourcesmocks "github.com/stacklok/toolhive-registry-server/internal/sources/mocks"
 )
 
 func TestFileRegistryDataProvider_GetRegistryData(t *testing.T) {
diff --git a/internal/sources/api_toolhive.go b/internal/sources/api_toolhive.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/stacklok/toolhive-registry-server/internal/config"
 	"github.com/stacklok/toolhive-registry-server/internal/httpclient"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 // ToolHiveAPIHandler handles registry data from ToolHive Registry API endpoints
diff --git a/internal/sources/git_test.go b/internal/sources/git_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/git"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/git"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 const (
diff --git a/internal/sources/mocks/mock_source_handler.go b/internal/sources/mocks/mock_source_handler.go
diff --git a/internal/sources/mocks/mock_storage_manager.go b/internal/sources/mocks/mock_storage_manager.go
diff --git a/internal/sources/storage_manager.go b/internal/sources/storage_manager.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 const (
diff --git a/internal/sources/storage_manager_test.go b/internal/sources/storage_manager_test.go
@@ -9,7 +9,7 @@ import (
 	toolhivetypes "github.com/stacklok/toolhive/pkg/registry/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 func TestFileStorageManager_StoreAndGet(t *testing.T) {
diff --git a/internal/sources/types.go b/internal/sources/types.go
@@ -9,8 +9,8 @@ import (
 	toolhiveregistry "github.com/stacklok/toolhive/pkg/registry"
 	toolhivetypes "github.com/stacklok/toolhive/pkg/registry/types"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 // SourceDataValidator is an interface for validating registry source configurations
diff --git a/internal/sources/types_test.go b/internal/sources/types_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
 )
 
 func TestNewFetchResult(t *testing.T) {
diff --git a/internal/sync/manager.go b/internal/sync/manager.go
@@ -10,10 +10,11 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/stacklok/toolhive-registry-server/pkg/config"
-	"github.com/stacklok/toolhive-registry-server/pkg/filtering"
-	"github.com/stacklok/toolhive-registry-server/pkg/registry"
-	"github.com/stacklok/toolhive-registry-server/pkg/status"
+	"github.com/stacklok/toolhive-registry-server/internal/config"
+	"github.com/stacklok/toolhive-registry-server/internal/filtering"
+	"github.com/stacklok/toolhive-registry-server/internal/registry"
+	"github.com/stacklok/toolhive-registry-server/internal/sources"
+	"github.com/stacklok/toolhive-registry-server/internal/status"
 )
 
 // Result contains the result of a successful sync operation
@@ -127,16 +128,16 @@ type AutomaticSyncChecker interface {
 
 // DefaultSyncManager is the default implementation of Manager
 type DefaultSyncManager struct {
-	sourceHandlerFactory sources2.SourceHandlerFactory
-	storageManager       sources2.StorageManager
+	sourceHandlerFactory sources.SourceHandlerFactory
+	storageManager       sources.StorageManager
 	filterService        filtering.FilterService
 	dataChangeDetector   DataChangeDetector
 	automaticSyncChecker AutomaticSyncChecker
 }
 
 // NewDefaultSyncManager creates a new DefaultSyncManager
 func NewDefaultSyncManager(
-	sourceHandlerFactory sources2.SourceHandlerFactory, storageManager sources2.StorageManager) *DefaultSyncManager {
+	sourceHandlerFactory sources.SourceHandlerFactory, storageManager sources.StorageManager) *DefaultSyncManager {
 	return &DefaultSyncManager{
 		sourceHandlerFactory: sourceHandlerFactory,
 		storageManager:       storageManager,
@@ -293,7 +294,7 @@ func (s *DefaultSyncManager) Delete(ctx context.Context, cfg *config.Config) err
 // fetchAndProcessRegistryData handles source handler creation, validation, fetch, and filtering
 func (s *DefaultSyncManager) fetchAndProcessRegistryData(
 	ctx context.Context,
-	cfg *config.Config) (*sources2.FetchResult, *Error) {
+	cfg *config.Config) (*sources.FetchResult, *Error) {
 	ctxLogger := log.FromContext(ctx)
 
 	// Get source handler
@@ -349,7 +350,7 @@ func (s *DefaultSyncManager) fetchAndProcessRegistryData(
 func (s *DefaultSyncManager) applyFilteringIfConfigured(
 	ctx context.Context,
 	cfg *config.Config,
-	fetchResult *sources2.FetchResult) *Error {
+	fetchResult *sources.FetchResult) *Error {
 	ctxLogger := log.FromContext(ctx)
 
 	if cfg.Filter != nil {
@@ -412,7 +413,7 @@ func (s *DefaultSyncManager) applyFilteringIfConfigured(
 func (s *DefaultSyncManager) storeRegistryData(
 	ctx context.Context,
 	cfg *config.Config,
-	fetchResult *sources2.FetchResult) *Error {
+	fetchResult *sources.FetchResult) *Error {
 	ctxLogger := log.FromContext(ctx)
 
 	if err := s.storageManager.Store(ctx, cfg, fetchResult.Registry); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`"github.com/stacklok/toolhive-registry-server/internal/config"`
`17`	`17`	`"github.com/stacklok/toolhive-registry-server/internal/httpclient"`
`18`		`- "github.com/stacklok/toolhive-registry-server/pkg/registry"`
	`18`	`+ "github.com/stacklok/toolhive-registry-server/internal/registry"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// ToolHiveAPIHandler handles registry data from ToolHive Registry API endpoints`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
`9`	`9`
`10`		`- "github.com/stacklok/toolhive-registry-server/pkg/config"`
`11`		`- "github.com/stacklok/toolhive-registry-server/pkg/registry"`
	`10`	`+ "github.com/stacklok/toolhive-registry-server/internal/config"`
	`11`	`+ "github.com/stacklok/toolhive-registry-server/internal/registry"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`toolhivetypes "github.com/stacklok/toolhive/pkg/registry/types"`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`	`11`
`12`		`- "github.com/stacklok/toolhive-registry-server/pkg/registry"`
	`12`	`+ "github.com/stacklok/toolhive-registry-server/internal/registry"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestFileStorageManager_StoreAndGet(t *testing.T) {`