update Go version consistently and fix linter

Made the linter a little lax by removing `lll` and `funlen` . We can add these back at a later time if we think they are useful.

Author: sridharavinash

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  GO_VERSION: '1.23.x'
+  GO_VERSION: '1.24.x'
 
 jobs:
   # Build, Lint, and Validate

.golangci.yml

@@ -16,7 +16,6 @@ linters:
     - errorlint
     - exhaustive
     - forbidigo
-    - funlen
     - gocognit
     - goconst
     - gocritic
@@ -29,7 +28,6 @@ linters:
     - grouper
     - importas
     - ireturn
-    - lll
     - makezero
     - misspell
     - nakedret
@@ -56,6 +54,12 @@ linters:
   settings:
     cyclop:
       max-complexity: 20
+    dupl:
+      threshold: 300
+    gocognit:
+      min-complexity: 51
+    nestif:
+      min-complexity: 10
   exclusions:
     generated: lax
     presets:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 WORKDIR /app
 COPY . .
 ARG GO_BUILD_TAGS

README.md

@@ -34,7 +34,7 @@ The MCP Registry service provides a centralized repository for MCP server entrie
 
 ### Prerequisites
 
-- Go 1.23.x (required - check with `go version`)
+- Go 1.24.x (required - check with `go version`)
 - MongoDB
 - Docker (optional, but recommended for development)
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/modelcontextprotocol/registry
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/caarlos0/env/v11 v11.3.1

internal/api/handlers/v0/mocks_test.go

@@ -13,17 +13,17 @@ type MockRegistryService struct {
 }
 
 func (m *MockRegistryService) List(cursor string, limit int) ([]model.Server, string, error) {
-	args := m.Called(cursor, limit) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(cursor, limit)
 	return args.Get(0).([]model.Server), args.String(1), args.Error(2)
 }
 
 func (m *MockRegistryService) GetByID(id string) (*model.ServerDetail, error) {
-	args := m.Called(id) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(id)
 	return args.Get(0).(*model.ServerDetail), args.Error(1)
 }
 
 func (m *MockRegistryService) Publish(serverDetail *model.ServerDetail) error {
-	args := m.Called(serverDetail) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(serverDetail)
 	return args.Error(0)
 }
 
@@ -35,16 +35,16 @@ type MockAuthService struct {
 func (m *MockAuthService) StartAuthFlow(
 	ctx context.Context, method model.AuthMethod, repoRef string,
 ) (map[string]string, string, error) {
-	args := m.Called(ctx, method, repoRef) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(ctx, method, repoRef)
 	return args.Get(0).(map[string]string), args.String(1), args.Error(2)
 }
 
 func (m *MockAuthService) CheckAuthStatus(ctx context.Context, statusToken string) (string, error) {
-	args := m.Called(ctx, statusToken) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(ctx, statusToken)
 	return args.String(0), args.Error(1)
 }
 
 func (m *MockAuthService) ValidateAuth(ctx context.Context, authentication model.Authentication) (bool, error) {
-	args := m.Called(ctx, authentication) //nolint:typecheck // testify mock embedding issue
+	args := m.Called(ctx, authentication)
 	return args.Bool(0), args.Error(1)
 }

internal/api/handlers/v0/publish_test.go

@@ -374,8 +374,8 @@ func TestPublishHandler(t *testing.T) {
 			}
 
 			// Assert that all expectations were met
-			mockRegistry.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
-			mockAuthService.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+			mockRegistry.AssertExpectations(t)
+			mockAuthService.AssertExpectations(t)
 		})
 	}
 }
@@ -437,15 +437,20 @@ func TestPublishHandlerBearerTokenParsing(t *testing.T) {
 			requestBody, err := json.Marshal(serverDetail)
 			assert.NoError(t, err)
 
-			req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, "/publish", bytes.NewBuffer(requestBody))
+			req, err := http.NewRequestWithContext(
+				context.Background(),
+				http.MethodPost,
+				"/publish",
+				bytes.NewBuffer(requestBody),
+			)
 			assert.NoError(t, err)
 			req.Header.Set("Authorization", tc.authHeader)
 
 			rr := httptest.NewRecorder()
 			handler.ServeHTTP(rr, req)
 
 			assert.Equal(t, http.StatusCreated, rr.Code)
-			mockAuthService.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+			mockAuthService.AssertExpectations(t)
 		})
 	}
 }
@@ -502,15 +507,20 @@ func TestPublishHandlerAuthMethodSelection(t *testing.T) {
 			requestBody, err := json.Marshal(serverDetail)
 			assert.NoError(t, err)
 
-			req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, "/publish", bytes.NewBuffer(requestBody))
+			req, err := http.NewRequestWithContext(
+				context.Background(),
+				http.MethodPost,
+				"/publish",
+				bytes.NewBuffer(requestBody),
+			)
 			assert.NoError(t, err)
 			req.Header.Set("Authorization", "Bearer test_token")
 
 			rr := httptest.NewRecorder()
 			handler.ServeHTTP(rr, req)
 
 			assert.Equal(t, http.StatusCreated, rr.Code)
-			mockAuthService.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+			mockAuthService.AssertExpectations(t)
 		})
 	}
 }

internal/api/handlers/v0/servers_test.go

@@ -257,7 +257,7 @@ func TestServersHandler(t *testing.T) {
 			}
 
 			// Verify mock expectations
-			mockRegistry.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+			mockRegistry.AssertExpectations(t)
 		})
 	}
 }
@@ -321,7 +321,7 @@ func TestServersHandlerIntegration(t *testing.T) {
 	assert.Empty(t, paginatedResp.Metadata.NextCursor)
 
 	// Verify mock expectations
-	mockRegistry.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+	mockRegistry.AssertExpectations(t)
 }
 
 // TestServersDetailHandlerIntegration tests the servers detail handler with actual HTTP requests
@@ -387,5 +387,5 @@ func TestServersDetailHandlerIntegration(t *testing.T) {
 	assert.Equal(t, *serverDetail, serverDetailResp)
 
 	// Verify mock expectations
-	mockRegistry.AssertExpectations(t) //nolint:typecheck // testify mock embedding issue
+	mockRegistry.AssertExpectations(t)
 }

internal/database/import.go

@@ -16,11 +16,11 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
-// ReadSeedFile reads and parses seed data from either:
+// ReadSeedFile reads seed data from various sources:
 // 1. Local file paths (*.json files)
 // 2. Direct HTTP URLs to seed.json files
 // 3. Registry root URLs (automatically appends /v0/servers and paginates)
-func ReadSeedFile(path string) ([]model.ServerDetail, error) {
+func ReadSeedFile(ctx context.Context, path string) ([]model.ServerDetail, error) {
 	log.Printf("Reading seed data from %s", path)
 
 	// Set default seed file path if not provided
@@ -37,14 +37,14 @@ func ReadSeedFile(path string) ([]model.ServerDetail, error) {
 		// Determine if this is a direct seed file URL or a registry root URL
 		if strings.HasSuffix(path, ".json") || strings.Contains(path, "seed.json") {
 			// Direct seed file URL - read directly
-			fileContent, err := readFromHTTP(path)
+			fileContent, err := readFromHTTP(ctx, path)
 			if err != nil {
 				return nil, fmt.Errorf("failed to read from HTTP URL: %w", err)
 			}
 			return parseSeedJSON(fileContent)
 		}
 		// Registry root URL - paginate through /v0/servers endpoint
-		return readFromRegistry(path)
+		return readFromRegistryWithContext(ctx, path)
 	}
 	// Read from local file
 	fileContent, err := os.ReadFile(path)
@@ -55,12 +55,12 @@ func ReadSeedFile(path string) ([]model.ServerDetail, error) {
 }
 
 // readFromHTTP reads content from an HTTP URL with timeout
-func readFromHTTP(url string) ([]byte, error) {
+func readFromHTTP(ctx context.Context, url string) ([]byte, error) {
 	client := &http.Client{
 		Timeout: 30 * time.Second,
 	}
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
@@ -113,8 +113,8 @@ type Metadata struct {
 	Total      int    `json:"total,omitempty"`
 }
 
-// readFromRegistry reads all servers from a registry by paginating through /v0/servers endpoint
-func readFromRegistry(registryURL string) ([]model.ServerDetail, error) {
+// readFromRegistryWithContext reads all servers from a registry by paginating through /v0/servers endpoint
+func readFromRegistryWithContext(ctx context.Context, registryURL string) ([]model.ServerDetail, error) {
 	log.Printf("Reading from registry: %s", registryURL)
 
 	// Ensure the URL doesn't have a trailing slash
@@ -167,7 +167,11 @@ func readFromRegistry(registryURL string) ([]model.ServerDetail, error) {
 		}
 
 		// Fetch the page
-		resp, err := client.Get(serverURL)
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, serverURL, nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create request for %s: %w", serverURL, err)
+		}
+		resp, err := client.Do(req)
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch servers from %s: %w", serverURL, err)
 		}
@@ -196,7 +200,7 @@ func readFromRegistry(registryURL string) ([]model.ServerDetail, error) {
 			// Build URL for server detail
 			detailURL := registryURL + "/v0/servers/" + server.ID
 
-			detailReq, err := http.NewRequestWithContext(context.Background(), http.MethodGet, detailURL, nil)
+			detailReq, err := http.NewRequestWithContext(ctx, http.MethodGet, detailURL, nil)
 			if err != nil {
 				log.Printf("Warning: failed to create request for server %s: %v", server.ID, err)
 				// Fall back to basic server information

internal/database/import_test.go

@@ -1,6 +1,7 @@
 package database_test
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -52,7 +53,7 @@ func TestReadSeedFile_LocalFile(t *testing.T) {
 	defer os.Remove(tempFile)
 
 	// Test reading the file
-	result, err := database.ReadSeedFile(tempFile)
+	result, err := database.ReadSeedFile(context.Background(), tempFile)
 	assert.NoError(t, err)
 	assert.Len(t, result, 1)
 	assert.Equal(t, "test-server-1", result[0].Name)
@@ -79,7 +80,7 @@ func TestReadSeedFile_DirectHTTPURL(t *testing.T) {
 	defer server.Close()
 
 	// Test reading from HTTP URL ending in .json
-	result, err := database.ReadSeedFile(server.URL + "/seed.json")
+	result, err := database.ReadSeedFile(context.Background(), server.URL+"/seed.json")
 	assert.NoError(t, err)
 	assert.Len(t, result, 1)
 	assert.Equal(t, "test-server-1", result[0].Name)
@@ -155,19 +156,23 @@ func TestReadSeedFile_RegistryURL(t *testing.T) {
 	// Handle individual server detail endpoints
 	mux.HandleFunc("/v0/servers/server-1", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(serverDetail1)
+		if err := json.NewEncoder(w).Encode(serverDetail1); err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
 	})
 
 	mux.HandleFunc("/v0/servers/server-2", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(serverDetail2)
+		if err := json.NewEncoder(w).Encode(serverDetail2); err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
 	})
 
 	server := httptest.NewServer(mux)
 	defer server.Close()
 
 	// Test reading from registry root URL (this should trigger pagination)
-	result, err := database.ReadSeedFile(server.URL)
+	result, err := database.ReadSeedFile(context.Background(), server.URL)
 	assert.NoError(t, err)
 	assert.Len(t, result, 2)