Rename registry.Server to registry.ImageMetadata (#807)

I found the previous name unclear - I thought it was referring to either the server hosting the registry, or an instance of an MCP server itself. Change the name to make its purpose as clear as possible.

Also move permissions logic into the runner package - this prevents a circular import in an upcoming change.

Author: dmjb

cmd/regup/app/update.go

@@ -26,7 +26,7 @@ var (
 
 type serverWithName struct {
 	name   string
-	server *registry.Server
+	server *registry.ImageMetadata
 }
 
 var updateCmd = &cobra.Command{
@@ -130,7 +130,7 @@ func selectOldestServers(reg *registry.Registry) ([]serverWithName, error) {
 	return servers[:limit], nil
 }
 
-func isOlder(serverI, serverJ *registry.Server) bool {
+func isOlder(serverI, serverJ *registry.ImageMetadata) bool {
 	var lastUpdatedI, lastUpdatedJ string
 
 	if serverI.Metadata != nil {
@@ -202,10 +202,10 @@ func saveResults(reg *registry.Registry, updatedServers []string) error {
 }
 
 // updateServerInfo updates the GitHub stars and pulls for a server
-func updateServerInfo(name string, server *registry.Server) error {
+func updateServerInfo(name string, server *registry.ImageMetadata) error {
 	// Skip if no repository URL
 	if server.RepositoryURL == "" {
-		logger.Warnf("Server %s has no repository URL, skipping", name)
+		logger.Warnf("ImageMetadata %s has no repository URL, skipping", name)
 		return nil
 	}
 
@@ -369,7 +369,7 @@ func saveRegistry(reg *registry.Registry, updatedServers []string) error {
 		// Get the server from the original JSON
 		serverJSON, ok := serversMap[name].(map[string]interface{})
 		if !ok {
-			logger.Warnf("Server %s not found in original registry, skipping", name)
+			logger.Warnf("ImageMetadata %s not found in original registry, skipping", name)
 			continue
 		}
 

cmd/regup/app/update_test.go

@@ -172,7 +172,7 @@ func setupTestRegistryWithMultipleServers(t *testing.T) (string, func()) {
 	// Create test registry with multiple servers
 	testRegistry := &registry.Registry{
 		LastUpdated: "2025-06-17 12:00:00",
-		Servers: map[string]*registry.Server{
+		Servers: map[string]*registry.ImageMetadata{
 			"github": {
 				Name:          "github",
 				Description:   "GitHub MCP server",
@@ -237,7 +237,7 @@ func setupEmptyTestRegistry(t *testing.T) (string, func()) {
 	// Create empty test registry
 	testRegistry := &registry.Registry{
 		LastUpdated: "2025-06-17 12:00:00",
-		Servers:     map[string]*registry.Server{},
+		Servers:     map[string]*registry.ImageMetadata{},
 	}
 
 	// Write registry file

cmd/thv/app/registry.go

@@ -93,7 +93,7 @@ func registryInfoCmdFunc(_ *cobra.Command, args []string) error {
 }
 
 // printJSONServers prints servers in JSON format
-func printJSONServers(servers []*registry.Server) error {
+func printJSONServers(servers []*registry.ImageMetadata) error {
 	// Marshal to JSON
 	jsonData, err := json.MarshalIndent(servers, "", "  ")
 	if err != nil {
@@ -106,7 +106,7 @@ func printJSONServers(servers []*registry.Server) error {
 }
 
 // printJSONServer prints a single server in JSON format
-func printJSONServer(server *registry.Server) error {
+func printJSONServer(server *registry.ImageMetadata) error {
 	// Marshal to JSON
 	jsonData, err := json.MarshalIndent(server, "", "  ")
 	if err != nil {
@@ -119,7 +119,7 @@ func printJSONServer(server *registry.Server) error {
 }
 
 // printTextServers prints servers in text format
-func printTextServers(servers []*registry.Server) {
+func printTextServers(servers []*registry.ImageMetadata) {
 	// Create a tabwriter for pretty output
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
 	fmt.Fprintln(w, "NAME\tDESCRIPTION\tTRANSPORT\tSTARS\tPULLS")
@@ -150,7 +150,7 @@ func printTextServers(servers []*registry.Server) {
 
 // printTextServerInfo prints detailed information about a server in text format
 // nolint:gocyclo
-func printTextServerInfo(name string, server *registry.Server) {
+func printTextServerInfo(name string, server *registry.ImageMetadata) {
 	fmt.Printf("Name: %s\n", server.Name)
 	fmt.Printf("Image: %s\n", server.Image)
 	fmt.Printf("Description: %s\n", server.Description)

cmd/thv/app/run.go

@@ -23,7 +23,6 @@ import (
 	"github.com/stacklok/toolhive/pkg/secrets"
 	"github.com/stacklok/toolhive/pkg/transport"
 	"github.com/stacklok/toolhive/pkg/transport/types"
-	"github.com/stacklok/toolhive/pkg/workloads"
 )
 
 var runCmd = &cobra.Command{
@@ -268,7 +267,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 		runConfig.K8sPodTemplatePatch = runK8sPodPatch
 	}
 
-	var server *registry.Server
+	var server *registry.ImageMetadata
 
 	imageManager := images.NewImageManager(ctx)
 	// Check if the serverOrImage is a protocol scheme, e.g., uvx://, npx://, or go://
@@ -288,11 +287,11 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 		// Try to find the server in the registry
 		server, err = registry.GetServer(serverOrImage)
 		if err != nil {
-			// Server isn't found in registry, treat as direct image
-			logger.Debugf("Server '%s' not found in registry: %v", serverOrImage, err)
+			// ImageMetadata isn't found in registry, treat as direct image
+			logger.Debugf("ImageMetadata '%s' not found in registry: %v", serverOrImage, err)
 			runConfig.Image = serverOrImage
 		} else {
-			// Server found in registry
+			// ImageMetadata found in registry
 			logger.Debugf("Found server '%s' in registry: %v", serverOrImage, server)
 			// Apply registry settings to runConfig
 			applyRegistrySettings(ctx, cmd, serverOrImage, server, runConfig, debugMode)
@@ -372,7 +371,7 @@ func pullImage(ctx context.Context, image string, imageManager images.ImageManag
 }
 
 // verifyImage verifies the image using the specified verification setting (warn, enabled, or disabled)
-func verifyImage(image string, server *registry.Server, verifySetting string) error {
+func verifyImage(image string, server *registry.ImageMetadata, verifySetting string) error {
 	switch verifySetting {
 	case verifyImageDisabled:
 		logger.Warn("Image verification is disabled")
@@ -414,7 +413,7 @@ func applyRegistrySettings(
 	ctx context.Context,
 	cmd *cobra.Command,
 	serverName string,
-	server *registry.Server,
+	server *registry.ImageMetadata,
 	runConfig *runner.RunConfig,
 	debugMode bool,
 ) {
@@ -456,7 +455,7 @@ func applyRegistrySettings(
 
 	// Create a temporary file for the permission profile if not explicitly provided
 	if !cmd.Flags().Changed("permission-profile") {
-		permProfilePath, err := workloads.CreatePermissionProfileFile(serverName, server.Permissions)
+		permProfilePath, err := runner.CreatePermissionProfileFile(serverName, server.Permissions)
 		if err != nil {
 			// Just log the error and continue with the default permission profile
 			logger.Warnf("Warning: Failed to create permission profile file: %v", err)

cmd/thv/app/search.go

@@ -62,7 +62,7 @@ func searchCmdFunc(_ *cobra.Command, args []string) error {
 }
 
 // printJSONSearchResults prints servers in JSON format
-func printJSONSearchResults(servers []*registry.Server) error {
+func printJSONSearchResults(servers []*registry.ImageMetadata) error {
 	// Marshal to JSON
 	jsonData, err := json.MarshalIndent(servers, "", "  ")
 	if err != nil {
@@ -75,7 +75,7 @@ func printJSONSearchResults(servers []*registry.Server) error {
 }
 
 // printTextSearchResults prints servers in text format
-func printTextSearchResults(servers []*registry.Server) {
+func printTextSearchResults(servers []*registry.ImageMetadata) {
 	// Create a tabwriter for pretty output
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
 	fmt.Fprintln(w, "NAME\tDESCRIPTION\tTRANSPORT\tSTARS\tPULLS")