Fix linting errors

Signed-off-by: Radoslav Dimitrov <[email protected]>

Author: rdimitrov

cmd/registry-builder/main.go

@@ -86,7 +86,8 @@ func init() {
 
 	// Build command flags
 	buildCmd.Flags().StringVarP(&outputDir, "output-dir", "o", "build", "Output directory for built registry files")
-	buildCmd.Flags().StringVarP(&outputFormat, "format", "f", "toolhive", fmt.Sprintf("Output format (%s, %s, %s)", RegistryToolHiveFormat, RegistryOfficialMCPRegistry, RegistryAllFormats))
+	buildCmd.Flags().StringVarP(&outputFormat, "format", "f", "toolhive",
+		fmt.Sprintf("Output format (%s, %s, %s)", RegistryToolHiveFormat, RegistryOfficialMCPRegistry, RegistryAllFormats))
 
 	// Add commands
 	rootCmd.AddCommand(buildCmd)

pkg/registry/official.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stacklok/toolhive-registry/pkg/types"
 )
 
+// OfficialRegistry handles building and writing the toolhive MCP registry based on the official server format
 type OfficialRegistry struct {
 	loader *Loader
 }
@@ -26,12 +27,10 @@ func NewOfficialRegistry(loader *Loader) *OfficialRegistry {
 	}
 }
 
+// WriteJSON builds the official MCP registry and writes it to the specified path
 func (or *OfficialRegistry) WriteJSON(path string) error {
 	// Build the registry structure
-	registry, err := or.build()
-	if err != nil {
-		return fmt.Errorf("failed to build official registry: %w", err)
-	}
+	registry := or.build()
 
 	// Create the directory if it doesn't exist
 	dir := filepath.Dir(path)
@@ -54,7 +53,7 @@ func (or *OfficialRegistry) WriteJSON(path string) error {
 }
 
 // build creates the ToolHiveRegistryType structure from loaded entries
-func (or *OfficialRegistry) build() (*ToolHiveRegistryType, error) {
+func (or *OfficialRegistry) build() *ToolHiveRegistryType {
 	entries := or.loader.GetEntries()
 
 	// Get sorted entry names for consistent output
@@ -68,10 +67,7 @@ func (or *OfficialRegistry) build() (*ToolHiveRegistryType, error) {
 	var servers []upstream.ServerJSON
 	for _, name := range names {
 		entry := entries[name]
-		serverJSON, err := or.transformEntry(name, entry)
-		if err != nil {
-			return nil, fmt.Errorf("failed to transform entry %s: %w", name, err)
-		}
+		serverJSON := or.transformEntry(name, entry)
 		servers = append(servers, serverJSON)
 	}
 
@@ -87,11 +83,11 @@ func (or *OfficialRegistry) build() (*ToolHiveRegistryType, error) {
 		},
 	}
 
-	return registry, nil
+	return registry
 }
 
 // transformEntry converts a ToolHive RegistryEntry to an official MCP ServerJSON
-func (or *OfficialRegistry) transformEntry(name string, entry *types.RegistryEntry) (upstream.ServerJSON, error) {
+func (or *OfficialRegistry) transformEntry(name string, entry *types.RegistryEntry) upstream.ServerJSON {
 	// Create the flattened server JSON with _meta extensions
 	serverJSON := upstream.ServerJSON{
 		Name:          name,
@@ -105,7 +101,7 @@ func (or *OfficialRegistry) transformEntry(name string, entry *types.RegistryEnt
 			// They are generated by the registry system.
 			// We include them here so we can start using them in toolhive,
 			// and they are available when we support an official MCP registry.
-			IOModelContextProtocolRegistry: or.createRegistryExtensions(name, entry),
+			IOModelContextProtocolRegistry: or.createRegistryExtensions(),
 		},
 	}
 
@@ -119,11 +115,11 @@ func (or *OfficialRegistry) transformEntry(name string, entry *types.RegistryEnt
 		serverJSON.Remotes = or.createRemotes(entry)
 	}
 
-	return serverJSON, nil
+	return serverJSON
 }
 
 // createRepository creates repository information from entry
-func (or *OfficialRegistry) createRepository(entry *types.RegistryEntry) model.Repository {
+func (*OfficialRegistry) createRepository(entry *types.RegistryEntry) model.Repository {
 	var repositoryURL string
 
 	if entry.IsImage() && entry.ImageMetadata.RepositoryURL != "" {
@@ -143,14 +139,14 @@ func (or *OfficialRegistry) createRepository(entry *types.RegistryEntry) model.R
 }
 
 // createVersionDetail creates version information (fixed at 1.0.0 for now)
-func (or *OfficialRegistry) createVersionDetail() model.VersionDetail {
+func (*OfficialRegistry) createVersionDetail() model.VersionDetail {
 	return model.VersionDetail{
 		Version: "1.0.0",
 	}
 }
 
 // createPackages creates Package entries for image-based servers
-func (or *OfficialRegistry) createPackages(entry *types.RegistryEntry) []model.Package {
+func (*OfficialRegistry) createPackages(entry *types.RegistryEntry) []model.Package {
 	if !entry.IsImage() || entry.Image == "" {
 		return nil
 	}
@@ -181,7 +177,7 @@ func (or *OfficialRegistry) createPackages(entry *types.RegistryEntry) []model.P
 }
 
 // createRemotes creates Remote entries for remote servers
-func (or *OfficialRegistry) createRemotes(entry *types.RegistryEntry) []model.Remote {
+func (*OfficialRegistry) createRemotes(entry *types.RegistryEntry) []model.Remote {
 	if !entry.IsRemote() || entry.URL == "" {
 		return nil
 	}
@@ -211,7 +207,7 @@ func (or *OfficialRegistry) createRemotes(entry *types.RegistryEntry) []model.Re
 }
 
 // createRegistryExtensions creates registry-generated metadata
-func (or *OfficialRegistry) createRegistryExtensions(name string, entry *types.RegistryEntry) *upstream.RegistryExtensions {
+func (*OfficialRegistry) createRegistryExtensions() *upstream.RegistryExtensions {
 	now := time.Now().UTC()
 	return &upstream.RegistryExtensions{
 		ID:          uuid.NewString(),
@@ -275,7 +271,7 @@ func (or *OfficialRegistry) createToolHiveExtensions(entry *types.RegistryEntry)
 }
 
 // addImageSpecificExtensions adds image-specific ToolHive extensions
-func (or *OfficialRegistry) addImageSpecificExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
+func (*OfficialRegistry) addImageSpecificExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
 	if entry.ImageMetadata == nil {
 		return
 	}
@@ -307,7 +303,7 @@ func (or *OfficialRegistry) addImageSpecificExtensions(extensions map[string]int
 }
 
 // addRemoteSpecificExtensions adds remote-specific ToolHive extensions
-func (or *OfficialRegistry) addRemoteSpecificExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
+func (*OfficialRegistry) addRemoteSpecificExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
 	if entry.RemoteServerMetadata == nil {
 		return
 	}
@@ -329,7 +325,7 @@ func (or *OfficialRegistry) addRemoteSpecificExtensions(extensions map[string]in
 }
 
 // addCommonExtensions adds extensions common to both image and remote servers
-func (or *OfficialRegistry) addCommonExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
+func (*OfficialRegistry) addCommonExtensions(extensions map[string]interface{}, entry *types.RegistryEntry) {
 	// Add examples if present
 	if len(entry.Examples) > 0 {
 		extensions["examples"] = entry.Examples
@@ -342,7 +338,7 @@ func (or *OfficialRegistry) addCommonExtensions(extensions map[string]interface{
 }
 
 // convertStatus converts ToolHive status to MCP model.Status
-func (or *OfficialRegistry) convertStatus(status string) model.Status {
+func (*OfficialRegistry) convertStatus(status string) model.Status {
 	switch status {
 	case types.StatusActive, "":
 		return model.StatusActive

pkg/registry/official_types.go

@@ -18,11 +18,13 @@ type ToolHiveRegistryType struct {
 type Group struct {
 }
 
+// Data holds the servers and groups in the registry
 type Data struct {
 	Servers []upstream.ServerJSON `json:"servers" yaml:"servers"`
 	Groups  []Group               `json:"groups" yaml:"groups"`
 }
 
+// Meta contains metadata about the registry
 type Meta struct {
 	// LastUpdated is the timestamp when the registry was last updated, in RFC3339 format
 	LastUpdated string `json:"last_updated" yaml:"last_updated"`

pkg/registry/toolhive.go

@@ -8,9 +8,10 @@ import (
 	"sort"
 	"time"
 
-	"github.com/stacklok/toolhive-registry/pkg/types"
 	"github.com/stacklok/toolhive/pkg/permissions"
 	toolhiveRegistry "github.com/stacklok/toolhive/pkg/registry"
+
+	"github.com/stacklok/toolhive-registry/pkg/types"
 )
 
 // Builder builds the final registry JSON from loaded entries