fix: handle NULL status values in migration 008

tadasant · tadasant · commit 076317fe93db · 2025-09-29T19:32:21.000-07:00
Fixes production deployment crash where migration 008 fails with:
"column status of relation servers contains null values"

Problem:
- 9 servers in production have explicit "status": null in their JSON
- Migration didn't handle NULL values properly when extracting to column
- When adding NOT NULL constraint, it failed

Solution:
- Add COALESCE to official metadata path (handles NULL in official meta)
- Use NULLIF to convert string 'null' to SQL NULL, then COALESCE to 'active'
- Ensures all status values are non-NULL before constraint is added

Affected servers:
- com.biodnd/agent-ip
- io.github.jkakar/cookwith-mcp
- com.joelverhagen.mcp/Knapcode.SampleMcpServer
- io.github.Lyellr88/marm-mcp-server
- com.biodnd/agent-press
- io.github.timheuer/sampledotnetmcpserver
- io.github.CodeCraftersLLC/local-voice-mcp
- com.biodnd/agent-fin
- io.github.ruvnet/ruv-swarm
diff --git a/cmd/publisher/commands/init.go b/cmd/publisher/commands/init.go
@@ -308,7 +308,7 @@ func createServerJSON(
 			URL:    repoURL,
 			Source: repoSource,
 		},
-		Version: version,
+		Version:  version,
 		Packages: []model.Package{pkg},
 	}
 }
diff --git a/cmd/publisher/commands/logout.go b/cmd/publisher/commands/logout.go
@@ -13,7 +13,7 @@ func LogoutCommand() error {
 	}
 
 	tokenPath := filepath.Join(homeDir, TokenFileName)
-	
+
 	// Check if token file exists
 	if _, err := os.Stat(tokenPath); os.IsNotExist(err) {
 		_, _ = fmt.Fprintln(os.Stdout, "Not logged in")
@@ -30,7 +30,7 @@ func LogoutCommand() error {
 		".mcpregistry_github_token",
 		".mcpregistry_registry_token",
 	}
-	
+
 	for _, file := range legacyFiles {
 		path := filepath.Join(homeDir, file)
 		if _, err := os.Stat(path); err == nil {
@@ -40,4 +40,4 @@ func LogoutCommand() error {
 
 	_, _ = fmt.Fprintln(os.Stdout, "✓ Successfully logged out")
 	return nil
-}
+}
diff --git a/cmd/publisher/main.go b/cmd/publisher/main.go
@@ -67,4 +67,4 @@ func printUsage() {
 	_, _ = fmt.Fprintln(os.Stdout, "  publish       Publish server.json to the registry")
 	_, _ = fmt.Fprintln(os.Stdout)
 	_, _ = fmt.Fprintln(os.Stdout, "Use 'mcp-publisher <command> --help' for more information about a command.")
-}
+}
diff --git a/deploy/pkg/k8s/ingress.go b/deploy/pkg/k8s/ingress.go
@@ -51,7 +51,7 @@ func SetupIngressController(ctx *pulumi.Context, cluster *providers.ProviderInfo
 		Values: pulumi.Map{
 			"controller": pulumi.Map{
 				"service": pulumi.Map{
-					"type": serviceType,
+					"type":        serviceType,
 					"annotations": pulumi.Map{},
 				},
 				"config": pulumi.Map{
diff --git a/deploy/pkg/providers/gcp/provider.go b/deploy/pkg/providers/gcp/provider.go
@@ -22,19 +22,19 @@ type Provider struct{}
 // createGCPProvider creates a GCP provider with explicit credentials if configured
 func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error) {
 	gcpConf := config.New(ctx, "gcp")
-	
+
 	// Get project ID from config
 	projectID := gcpConf.Get("project")
 	if projectID == "" {
 		return nil, fmt.Errorf("GCP project ID not configured. Set gcp:project")
 	}
-	
+
 	// Get region from config or use default
 	region := gcpConf.Get("region")
 	if region == "" {
 		region = "us-central1"
 	}
-	
+
 	// Get credentials from config (base64 encoded service account JSON)
 	credentials := gcpConf.Get("credentials")
 	if credentials != "" {
@@ -45,7 +45,7 @@ func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error)
 		}
 		credentials = string(decodedCreds)
 	}
-	
+
 	// Create a GCP provider with explicit credentials if provided
 	if credentials != "" {
 		return gcp.NewProvider(ctx, name, &gcp.ProviderArgs{
@@ -54,7 +54,7 @@ func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error)
 			Credentials: pulumi.String(credentials),
 		})
 	}
-	
+
 	return nil, nil
 }
 
diff --git a/internal/api/handlers/v0/auth/http_test.go b/internal/api/handlers/v0/auth/http_test.go
@@ -387,7 +387,6 @@ func TestDefaultHTTPKeyFetcher(t *testing.T) {
 	}
 }
 
-
 func TestHTTPAuthHandler_Permissions(t *testing.T) {
 	cfg := &config.Config{
 		JWTPrivateKey: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
@@ -738,4 +737,3 @@ func TestHTTPvsDNS_PermissionDifferences(t *testing.T) {
 		})
 	}
 }
-
diff --git a/internal/api/handlers/v0/edit.go b/internal/api/handlers/v0/edit.go
@@ -97,8 +97,8 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 
 			// Prevent undeleting servers - once deleted, they stay deleted
 			if currentServer.Meta.Official != nil &&
-			   currentServer.Meta.Official.Status == model.StatusDeleted &&
-			   newStatus != model.StatusDeleted {
+				currentServer.Meta.Official.Status == model.StatusDeleted &&
+				newStatus != model.StatusDeleted {
 				return nil, huma.Error400BadRequest("Cannot change status of deleted server. Deleted servers cannot be undeleted.")
 			}
 
diff --git a/internal/api/handlers/v0/edit_test.go b/internal/api/handlers/v0/edit_test.go
@@ -639,4 +639,4 @@ func TestEditServerEndpointEdgeCases(t *testing.T) {
 // Helper function
 func stringPtr(s string) *string {
 	return &s
-}
+}
diff --git a/internal/api/handlers/v0/publish.go b/internal/api/handlers/v0/publish.go
@@ -75,14 +75,14 @@ func buildPermissionErrorMessage(attemptedResource string, permissions []auth.Pe
 			permissionStrs = append(permissionStrs, perm.ResourcePattern)
 		}
 	}
-	
+
 	errorMsg := "You do not have permission to publish this server"
 	if len(permissionStrs) > 0 {
 		errorMsg += ". You have permission to publish: " + strings.Join(permissionStrs, ", ")
 	} else {
 		errorMsg += ". You do not have any publish permissions"
 	}
 	errorMsg += ". Attempting to publish: " + attemptedResource
-	
+
 	return errorMsg
 }
diff --git a/internal/api/handlers/v0/publish_integration_test.go b/internal/api/handlers/v0/publish_integration_test.go
@@ -162,9 +162,9 @@ func TestPublishIntegration(t *testing.T) {
 
 	t.Run("publish fails with invalid token", func(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
-			Name:          "io.github.domdomegg/test-server",
-			Description:   "Test server",
-			Version: "1.0.0",
+			Name:        "io.github.domdomegg/test-server",
+			Description: "Test server",
+			Version:     "1.0.0",
 		}
 
 		body, err := json.Marshal(publishReq)
@@ -185,7 +185,7 @@ func TestPublishIntegration(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "io.github.other/test-server",
 			Description: "A test server",
-			Version: "1.0.0",
+			Version:     "1.0.0",
 			Repository: model.Repository{
 				URL:    "https://github.com/example/test-server",
 				Source: "github",
@@ -221,7 +221,7 @@ func TestPublishIntegration(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "io.github.domdomegg/airtable-mcp-server",
 			Description: "A test server with MCPB package",
-			Version: "1.7.2",
+			Version:     "1.7.2",
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeMCPB,
diff --git a/internal/api/handlers/v0/publish_registry_validation_test.go b/internal/api/handlers/v0/publish_registry_validation_test.go
@@ -47,7 +47,7 @@ func TestPublishRegistryValidation(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "com.example/test-server-with-npm",
 			Description: "A test server with invalid npm package reference",
-			Version: "1.0.0",
+			Version:     "1.0.0",
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeNPM,
@@ -88,7 +88,7 @@ func TestPublishRegistryValidation(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "com.example/test-server-mcpb-validation",
 			Description: "A test server with MCPB package and registry validation enabled",
-			Version: "0.0.36",
+			Version:     "0.0.36",
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeMCPB,
@@ -138,7 +138,7 @@ func TestPublishRegistryValidation(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "com.example/test-server-multiple-packages",
 			Description: "A test server with multiple packages where second fails",
-			Version: "1.0.0",
+			Version:     "1.0.0",
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeMCPB,
@@ -189,7 +189,7 @@ func TestPublishRegistryValidation(t *testing.T) {
 		publishReq := apiv0.ServerJSON{
 			Name:        "com.example/test-server-first-package-fails",
 			Description: "A test server where first package fails",
-			Version: "1.0.0",
+			Version:     "1.0.0",
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeNPM,
diff --git a/internal/api/handlers/v0/publish_test.go b/internal/api/handlers/v0/publish_test.go
@@ -113,9 +113,9 @@ func TestPublishEndpoint(t *testing.T) {
 		{
 			name: "invalid authorization header format",
 			requestBody: apiv0.ServerJSON{
-				Name:          "io.github.domdomegg/test-server",
-				Description:   "Test server",
-				Version: "1.0.0",
+				Name:        "io.github.domdomegg/test-server",
+				Description: "Test server",
+				Version:     "1.0.0",
 			},
 			authHeader: "InvalidFormat",
 			setupRegistryService: func(_ service.RegistryService) {
@@ -129,7 +129,7 @@ func TestPublishEndpoint(t *testing.T) {
 			requestBody: apiv0.ServerJSON{
 				Name:        "test-server",
 				Description: "A test server",
-				Version: "1.0.0",
+				Version:     "1.0.0",
 			},
 			authHeader: "Bearer invalidToken",
 			setupRegistryService: func(_ service.RegistryService) {
@@ -143,7 +143,7 @@ func TestPublishEndpoint(t *testing.T) {
 			requestBody: apiv0.ServerJSON{
 				Name:        "io.github.other/test-server",
 				Description: "A test server",
-				Version: "1.0.0",
+				Version:     "1.0.0",
 				Repository: model.Repository{
 					URL:    "https://github.com/example/test-server",
 					Source: "github",
@@ -167,7 +167,7 @@ func TestPublishEndpoint(t *testing.T) {
 			requestBody: apiv0.ServerJSON{
 				Name:        "example/test-server",
 				Description: "A test server",
-				Version: "1.0.0",
+				Version:     "1.0.0",
 				Repository: model.Repository{
 					URL:    "https://github.com/example/test-server",
 					Source: "github",
@@ -185,7 +185,7 @@ func TestPublishEndpoint(t *testing.T) {
 				existingServer := apiv0.ServerJSON{
 					Name:        "example/test-server",
 					Description: "Existing test server",
-					Version: "1.0.0",
+					Version:     "1.0.0",
 					Repository: model.Repository{
 						URL:    "https://github.com/example/test-server-existing",
 						Source: "github",
@@ -202,7 +202,7 @@ func TestPublishEndpoint(t *testing.T) {
 			requestBody: apiv0.ServerJSON{
 				Name:        "com.example/test-server-mcpb",
 				Description: "A test server with MCPB package",
-				Version: "1.0.0",
+				Version:     "1.0.0",
 				Packages: []model.Package{
 					{
 						RegistryType: model.RegistryTypeMCPB,
@@ -499,7 +499,7 @@ func TestPublishEndpoint_MultipleSlashesEdgeCases(t *testing.T) {
 			mux.ServeHTTP(rr, req)
 
 			// Assertions
-			assert.Equal(t, tc.expectedStatus, rr.Code, 
+			assert.Equal(t, tc.expectedStatus, rr.Code,
 				"%s: expected status %d, got %d", tc.description, tc.expectedStatus, rr.Code)
 
 			if tc.expectedStatus == http.StatusBadRequest {
@@ -508,4 +508,4 @@ func TestPublishEndpoint_MultipleSlashesEdgeCases(t *testing.T) {
 			}
 		})
 	}
-}
+}
diff --git a/internal/api/handlers/v0/servers.go b/internal/api/handlers/v0/servers.go
@@ -41,6 +41,7 @@ type ServerVersionsInput struct {
 }
 
 // RegisterServersEndpoints registers all server-related endpoints
+//
 //nolint:cyclop // Multiple endpoint registrations are inherently complex
 func RegisterServersEndpoints(api huma.API, registry service.RegistryService) {
 	// List servers endpoint
diff --git a/internal/api/handlers/v0/servers_test.go b/internal/api/handlers/v0/servers_test.go
@@ -509,4 +509,4 @@ func TestServersEndpointEdgeCases(t *testing.T) {
 			assert.Contains(t, []model.Status{model.StatusActive, model.StatusDeprecated, model.StatusDeleted}, server.Meta.Official.Status)
 		}
 	})
-}
+}
diff --git a/internal/api/server.go b/internal/api/server.go
@@ -23,12 +23,12 @@ func TrailingSlashMiddleware(next http.Handler) http.Handler {
 			// Create a copy of the URL and remove the trailing slash
 			newURL := *r.URL
 			newURL.Path = strings.TrimSuffix(r.URL.Path, "/")
-			
+
 			// Use 308 Permanent Redirect to preserve the request method
 			http.Redirect(w, r, newURL.String(), http.StatusPermanentRedirect)
 			return
 		}
-		
+
 		next.ServeHTTP(w, r)
 	})
 }
diff --git a/internal/auth/blocks.go b/internal/auth/blocks.go
@@ -6,4 +6,4 @@ var BlockedNamespaces = []string{
 	// Add blocked namespaces here, e.g.:
 	// "io.github.spammer",
 	// "com.evil-domain",
-}
+}
diff --git a/internal/auth/jwt_test.go b/internal/auth/jwt_test.go
@@ -300,9 +300,9 @@ func TestJWTManager_BlockedNamespaces(t *testing.T) {
 		originalBlocked := auth.BlockedNamespaces
 		auth.BlockedNamespaces = []string{"io.github.spammer"}
 		defer func() { auth.BlockedNamespaces = originalBlocked }()
-		
+
 		jwtManager := auth.NewJWTManager(cfg)
-		
+
 		claims := auth.JWTClaims{
 			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "spammer",
@@ -325,9 +325,9 @@ func TestJWTManager_BlockedNamespaces(t *testing.T) {
 		originalBlocked := auth.BlockedNamespaces
 		auth.BlockedNamespaces = []string{"io.github.spammer"}
 		defer func() { auth.BlockedNamespaces = originalBlocked }()
-		
+
 		jwtManager := auth.NewJWTManager(cfg)
-		
+
 		claims := auth.JWTClaims{
 			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "gooduser",
@@ -349,9 +349,9 @@ func TestJWTManager_BlockedNamespaces(t *testing.T) {
 		originalBlocked := auth.BlockedNamespaces
 		auth.BlockedNamespaces = []string{"io.github.badorg"}
 		defer func() { auth.BlockedNamespaces = originalBlocked }()
-		
+
 		jwtManager := auth.NewJWTManager(cfg)
-		
+
 		claims := auth.JWTClaims{
 			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "user",
@@ -378,9 +378,9 @@ func TestJWTManager_BlockedNamespaces(t *testing.T) {
 		originalBlocked := auth.BlockedNamespaces
 		auth.BlockedNamespaces = []string{"io.github.spammer"}
 		defer func() { auth.BlockedNamespaces = originalBlocked }()
-		
+
 		jwtManager := auth.NewJWTManager(cfg)
-		
+
 		claims := auth.JWTClaims{
 			AuthMethod:        auth.MethodNone,
 			AuthMethodSubject: "admin",
diff --git a/internal/auth/types.go b/internal/auth/types.go
@@ -16,4 +16,4 @@ const (
 	MethodHTTP Method = "http"
 	// No authentication - should only be used for local development and testing
 	MethodNone Method = "none"
-)
+)
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -7,15 +7,15 @@ import (
 // Config holds the application configuration
 // See .env.example for more documentation
 type Config struct {
-	ServerAddress            string       `env:"SERVER_ADDRESS" envDefault:":8080"`
-	DatabaseURL              string       `env:"DATABASE_URL" envDefault:"postgres://localhost:5432/mcp-registry?sslmode=disable"`
-	SeedFrom                 string       `env:"SEED_FROM" envDefault:""`
-	Version                  string       `env:"VERSION" envDefault:"dev"`
-	GithubClientID           string       `env:"GITHUB_CLIENT_ID" envDefault:""`
-	GithubClientSecret       string       `env:"GITHUB_CLIENT_SECRET" envDefault:""`
-	JWTPrivateKey            string       `env:"JWT_PRIVATE_KEY" envDefault:""`
-	EnableAnonymousAuth      bool         `env:"ENABLE_ANONYMOUS_AUTH" envDefault:"false"`
-	EnableRegistryValidation bool         `env:"ENABLE_REGISTRY_VALIDATION" envDefault:"true"`
+	ServerAddress            string `env:"SERVER_ADDRESS" envDefault:":8080"`
+	DatabaseURL              string `env:"DATABASE_URL" envDefault:"postgres://localhost:5432/mcp-registry?sslmode=disable"`
+	SeedFrom                 string `env:"SEED_FROM" envDefault:""`
+	Version                  string `env:"VERSION" envDefault:"dev"`
+	GithubClientID           string `env:"GITHUB_CLIENT_ID" envDefault:""`
+	GithubClientSecret       string `env:"GITHUB_CLIENT_SECRET" envDefault:""`
+	JWTPrivateKey            string `env:"JWT_PRIVATE_KEY" envDefault:""`
+	EnableAnonymousAuth      bool   `env:"ENABLE_ANONYMOUS_AUTH" envDefault:"false"`
+	EnableRegistryValidation bool   `env:"ENABLE_REGISTRY_VALIDATION" envDefault:"true"`
 
 	// OIDC Configuration
 	OIDCEnabled      bool   `env:"OIDC_ENABLED" envDefault:"false"`
diff --git a/internal/database/migrations/008_separate_official_metadata.sql b/internal/database/migrations/008_separate_official_metadata.sql
diff --git a/internal/database/postgres_test.go b/internal/database/postgres_test.go
diff --git a/internal/importer/importer.go b/internal/importer/importer.go
diff --git a/internal/service/registry_service_test.go b/internal/service/registry_service_test.go
diff --git a/internal/validators/constants.go b/internal/validators/constants.go
diff --git a/internal/validators/utils.go b/internal/validators/utils.go
diff --git a/internal/validators/validators.go b/internal/validators/validators.go
diff --git a/internal/validators/validators_test.go b/internal/validators/validators_test.go
diff --git a/pkg/model/constants.go b/pkg/model/constants.go

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func createServerJSON(`
`308`	`308`	`URL: repoURL,`
`309`	`309`	`Source: repoSource,`
`310`	`310`	`},`
`311`		`- Version: version,`
	`311`	`+ Version: version,`
`312`	`312`	`Packages: []model.Package{pkg},`
`313`	`313`	`}`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,6 @@ func TestDefaultHTTPKeyFetcher(t *testing.T) {`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`
`390`		`-`
`391`	`390`	`func TestHTTPAuthHandler_Permissions(t *testing.T) {`
`392`	`391`	`cfg := &config.Config{`
`393`	`392`	`JWTPrivateKey: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",`
`@@ -738,4 +737,3 @@ func TestHTTPvsDNS_PermissionDifferences(t *testing.T) {`
`738`	`737`	`})`
`739`	`738`	`}`
`740`	`739`	`}`
`741`		`-`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *`
`97`	`97`
`98`	`98`	`// Prevent undeleting servers - once deleted, they stay deleted`
`99`	`99`	`if currentServer.Meta.Official != nil &&`
`100`		`- currentServer.Meta.Official.Status == model.StatusDeleted &&`
`101`		`- newStatus != model.StatusDeleted {`
	`100`	`+ currentServer.Meta.Official.Status == model.StatusDeleted &&`
	`101`	`+ newStatus != model.StatusDeleted {`
`102`	`102`	`return nil, huma.Error400BadRequest("Cannot change status of deleted server. Deleted servers cannot be undeleted.")`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,14 @@ func buildPermissionErrorMessage(attemptedResource string, permissions []auth.Pe`
`75`	`75`	`permissionStrs = append(permissionStrs, perm.ResourcePattern)`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-`
	`78`	`+`
`79`	`79`	`errorMsg := "You do not have permission to publish this server"`
`80`	`80`	`if len(permissionStrs) > 0 {`
`81`	`81`	`errorMsg += ". You have permission to publish: " + strings.Join(permissionStrs, ", ")`
`82`	`82`	`} else {`
`83`	`83`	`errorMsg += ". You do not have any publish permissions"`
`84`	`84`	`}`
`85`	`85`	`errorMsg += ". Attempting to publish: " + attemptedResource`
`86`		`-`
	`86`	`+`
`87`	`87`	`return errorMsg`
`88`	`88`	`}`