Draft: Add registry format converters and support for the Official MCP Registry

cmd/regup/app/update.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/stacklok/toolhive/pkg/container/verifier"
 	"github.com/stacklok/toolhive/pkg/logger"
-	"github.com/stacklok/toolhive/pkg/registry"
+	regtypes "github.com/stacklok/toolhive/pkg/registry/types"
 )
 
 var (
@@ -29,7 +29,7 @@ var (
 
 type serverWithName struct {
 	name   string
-	server *registry.ImageMetadata
+	server *regtypes.ImageMetadata
 }
 
 // ProvenanceVerificationError represents an error during provenance verification
@@ -96,31 +96,31 @@ func updateCmdFunc(_ *cobra.Command, _ []string) error {
 	return saveResults(reg, updatedServers, failedServers)
 }
 
-func loadRegistry() (*registry.Registry, error) {
+func loadRegistry() (*regtypes.Registry, error) {
 	registryPath := filepath.Join("pkg", "registry", "data", "registry.json")
 	// #nosec G304 -- This is a known file path
 	data, err := os.ReadFile(registryPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read registry file: %w", err)
 	}
 
-	var reg registry.Registry
+	var reg regtypes.Registry
 	if err := json.Unmarshal(data, &reg); err != nil {
 		return nil, fmt.Errorf("failed to parse registry: %w", err)
 	}
 
 	return &reg, nil
 }
 
-func selectServersToUpdate(reg *registry.Registry) ([]serverWithName, error) {
+func selectServersToUpdate(reg *regtypes.Registry) ([]serverWithName, error) {
 	if serverName != "" {
 		return selectSpecificServer(reg, serverName)
 	}
 
 	return selectOldestServers(reg)
 }
 
-func selectSpecificServer(reg *registry.Registry, name string) ([]serverWithName, error) {
+func selectSpecificServer(reg *regtypes.Registry, name string) ([]serverWithName, error) {
 	server, exists := reg.Servers[name]
 	if !exists {
 		return nil, fmt.Errorf("server '%s' not found in registry", name)
@@ -129,7 +129,7 @@ func selectSpecificServer(reg *registry.Registry, name string) ([]serverWithName
 	return []serverWithName{{name: name, server: server}}, nil
 }
 
-func selectOldestServers(reg *registry.Registry) ([]serverWithName, error) {
+func selectOldestServers(reg *regtypes.Registry) ([]serverWithName, error) {
 	servers := make([]serverWithName, 0, len(reg.Servers))
 	for name, server := range reg.Servers {
 		server.Name = name
@@ -151,7 +151,7 @@ func selectOldestServers(reg *registry.Registry) ([]serverWithName, error) {
 	return servers[:limit], nil
 }
 
-func isOlder(serverI, serverJ *registry.ImageMetadata) bool {
+func isOlder(serverI, serverJ *regtypes.ImageMetadata) bool {
 	var lastUpdatedI, lastUpdatedJ string
 
 	if serverI.Metadata != nil {
@@ -180,7 +180,7 @@ func isOlder(serverI, serverJ *registry.ImageMetadata) bool {
 	return timeI.Before(timeJ)
 }
 
-func updateServers(servers []serverWithName, reg *registry.Registry) ([]string, []string) {
+func updateServers(servers []serverWithName, reg *regtypes.Registry) ([]string, []string) {
 	updatedServers := make([]string, 0, len(servers))
 	failedServers := make([]string, 0)
 
@@ -209,7 +209,7 @@ func updateServers(servers []serverWithName, reg *registry.Registry) ([]string,
 	return updatedServers, failedServers
 }
 
-func saveResults(reg *registry.Registry, updatedServers []string, failedServers []string) error {
+func saveResults(reg *regtypes.Registry, updatedServers []string, failedServers []string) error {
 	// If we're in dry run mode, don't save changes
 	if dryRun {
 		logger.Info("Dry run completed, no changes made")
@@ -235,7 +235,7 @@ func saveResults(reg *registry.Registry, updatedServers []string, failedServers
 }
 
 // updateServerInfo updates the GitHub stars and pulls for a server
-func updateServerInfo(name string, server *registry.ImageMetadata) error {
+func updateServerInfo(name string, server *regtypes.ImageMetadata) error {
 	// Verify provenance if requested
 	if verifyProvenance {
 		if err := verifyServerProvenance(name, server); err != nil {
@@ -254,7 +254,7 @@ func updateServerInfo(name string, server *registry.ImageMetadata) error {
 
 	// Initialize metadata if it's nil
 	if server.Metadata == nil {
-		server.Metadata = &registry.Metadata{}
+		server.Metadata = &regtypes.Metadata{}
 	}
 
 	// Extract owner and repo from repository URL
@@ -289,7 +289,7 @@ func updateServerInfo(name string, server *registry.ImageMetadata) error {
 }
 
 // verifyServerProvenance verifies the provenance information for a server
-func verifyServerProvenance(name string, server *registry.ImageMetadata) error {
+func verifyServerProvenance(name string, server *regtypes.ImageMetadata) error {
 	// Skip if no provenance information
 	if server.Provenance == nil {
 		logger.Warnf("Server %s has no provenance information, skipping verification", name)
@@ -325,7 +325,7 @@ func verifyServerProvenance(name string, server *registry.ImageMetadata) error {
 }
 
 // removeFailedServers removes servers that failed provenance verification from the registry
-func removeFailedServers(reg *registry.Registry, failedServers []string) {
+func removeFailedServers(reg *regtypes.Registry, failedServers []string) {
 	for _, serverName := range failedServers {
 		logger.Warnf("Removing server %s from registry due to provenance verification failure", serverName)
 		delete(reg.Servers, serverName)
@@ -420,7 +420,7 @@ func getGitHubRepoInfo(owner, repo, serverName string, currentPulls int) (stars
 }
 
 // saveRegistry saves the registry to the filesystem while preserving the order of entries
-func saveRegistry(reg *registry.Registry, updatedServers []string, failedServers []string) error {
+func saveRegistry(reg *regtypes.Registry, updatedServers []string, failedServers []string) error {
 	// Find the registry file path
 	registryPath := filepath.Join("pkg", "registry", "data", "registry.json")
 

cmd/regup/app/update_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/stacklok/toolhive/pkg/logger"
-	"github.com/stacklok/toolhive/pkg/registry"
+	regtypes "github.com/stacklok/toolhive/pkg/registry/types"
 )
 
 //nolint:paralleltest // This test manages temporary directories and cannot run in parallel
@@ -141,7 +141,7 @@ func TestServerSelection(t *testing.T) {
 	data, err := os.ReadFile(registryPath)
 	require.NoError(t, err)
 
-	var reg registry.Registry
+	var reg regtypes.Registry
 	err = json.Unmarshal(data, &reg)
 	require.NoError(t, err)
 
@@ -170,15 +170,15 @@ func setupTestRegistryWithMultipleServers(t *testing.T) (string, func()) {
 	require.NoError(t, err)
 
 	// Create test registry with multiple servers
-	testRegistry := &registry.Registry{
+	testRegistry := &regtypes.Registry{
 		LastUpdated: "2025-06-16T12:00:00Z",
-		Servers: map[string]*registry.ImageMetadata{
+		Servers: map[string]*regtypes.ImageMetadata{
 			"github": {
-				BaseServerMetadata: registry.BaseServerMetadata{
+				BaseServerMetadata: regtypes.BaseServerMetadata{
 					Name:          "github",
 					Description:   "GitHub MCP server",
 					RepositoryURL: "https://github.com/github/github-mcp-server",
-					Metadata: &registry.Metadata{
+					Metadata: &regtypes.Metadata{
 						Stars:       100,
 						Pulls:       5000,
 						LastUpdated: "2025-06-16T12:00:00Z", // Older
@@ -187,11 +187,11 @@ func setupTestRegistryWithMultipleServers(t *testing.T) (string, func()) {
 				Image: "ghcr.io/github/github-mcp-server:latest",
 			},
 			"gitlab": {
-				BaseServerMetadata: registry.BaseServerMetadata{
+				BaseServerMetadata: regtypes.BaseServerMetadata{
 					Name:          "gitlab",
 					Description:   "GitLab MCP server",
 					RepositoryURL: "https://github.com/example/gitlab-mcp-server",
-					Metadata: &registry.Metadata{
+					Metadata: &regtypes.Metadata{
 						Stars:       50,
 						Pulls:       2000,
 						LastUpdated: "2025-06-17T12:00:00Z", // Newer
@@ -200,11 +200,11 @@ func setupTestRegistryWithMultipleServers(t *testing.T) (string, func()) {
 				Image: "mcp/gitlab:latest",
 			},
 			"fetch": {
-				BaseServerMetadata: registry.BaseServerMetadata{
+				BaseServerMetadata: regtypes.BaseServerMetadata{
 					Name:          "fetch",
 					Description:   "Fetch MCP server",
 					RepositoryURL: "https://github.com/example/fetch-mcp-server",
-					Metadata: &registry.Metadata{
+					Metadata: &regtypes.Metadata{
 						Stars:       25,
 						Pulls:       1000,
 						LastUpdated: "2025-06-15T12:00:00Z", // Oldest
@@ -241,9 +241,9 @@ func setupEmptyTestRegistry(t *testing.T) (string, func()) {
 	require.NoError(t, err)
 
 	// Create empty test registry
-	testRegistry := &registry.Registry{
+	testRegistry := &regtypes.Registry{
 		LastUpdated: "2025-06-16T12:00:00Z",
-		Servers:     map[string]*registry.ImageMetadata{},
+		Servers:     map[string]*regtypes.ImageMetadata{},
 	}
 
 	// Write registry file

cmd/thv-operator/pkg/filtering/filter_service.go

@@ -8,13 +8,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	mcpv1alpha1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1alpha1"
-	"github.com/stacklok/toolhive/pkg/registry"
+	regtypes "github.com/stacklok/toolhive/pkg/registry/types"
 )
 
 // FilterService coordinates name and tag filtering to apply registry filters
 type FilterService interface {
 	// ApplyFilters filters the registry based on MCPRegistry filter configuration
-	ApplyFilters(ctx context.Context, reg *registry.Registry, filter *mcpv1alpha1.RegistryFilter) (*registry.Registry, error)
+	ApplyFilters(ctx context.Context, reg *regtypes.Registry, filter *mcpv1alpha1.RegistryFilter) (*regtypes.Registry, error)
 }
 
 // DefaultFilterService implements filtering coordination using name and tag filters
@@ -49,8 +49,8 @@ func NewFilterService(nameFilter NameFilter, tagFilter TagFilter) *DefaultFilter
 // 5. Return the filtered registry
 func (s *DefaultFilterService) ApplyFilters(
 	ctx context.Context,
-	reg *registry.Registry,
-	filter *mcpv1alpha1.RegistryFilter) (*registry.Registry, error) {
+	reg *regtypes.Registry,
+	filter *mcpv1alpha1.RegistryFilter) (*regtypes.Registry, error) {
 	ctxLogger := log.FromContext(ctx)
 
 	// If no filter is specified, return original registry
@@ -64,11 +64,11 @@ func (s *DefaultFilterService) ApplyFilters(
 		"originalRemoteServerCount", len(reg.RemoteServers))
 
 	// Create a new filtered registry with same metadata
-	filteredRegistry := &registry.Registry{
+	filteredRegistry := &regtypes.Registry{
 		Version:       reg.Version,
 		LastUpdated:   reg.LastUpdated,
-		Servers:       make(map[string]*registry.ImageMetadata),
-		RemoteServers: make(map[string]*registry.RemoteServerMetadata),
+		Servers:       make(map[string]*regtypes.ImageMetadata),
+		RemoteServers: make(map[string]*regtypes.RemoteServerMetadata),
 		Groups:        reg.Groups, // Groups are not filtered for now
 	}