revert: remove additional formatting-only changes

Remove more whitespace alignment and spacing changes that don't affect functionality.
This further reduces PR noise to focus on ServerID/VersionID consistency changes.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: tadasant

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
 }

internal/api/handlers/v0/publish_integration_test.go

@@ -160,9 +160,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)
@@ -183,7 +183,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",
@@ -219,8 +219,8 @@ 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",
-			Status:      model.StatusActive,
+			Version: "1.7.2",
+			Status: model.StatusActive,
 			Packages: []model.Package{
 				{
 					RegistryType: model.RegistryTypeMCPB,

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,

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,

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)
 	})
 }

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",

internal/service/registry_service_test.go

@@ -18,7 +18,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 		"existing1": {
 			Name:        "com.example/existing-server",
 			Description: "An existing server",
-			Version:     "1.0.0",
+			Version: "1.0.0",
 			Remotes: []model.Transport{
 				{Type: "streamable-http", URL: "https://api.example.com/mcp"},
 				{Type: "sse", URL: "https://webhook.example.com/sse"},
@@ -27,7 +27,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 		"existing2": {
 			Name:        "com.microsoft/another-server",
 			Description: "Another existing server",
-			Version:     "1.0.0",
+			Version: "1.0.0",
 			Remotes: []model.Transport{
 				{Type: "streamable-http", URL: "https://api.microsoft.com/mcp"},
 			},
@@ -55,8 +55,8 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 			serverDetail: apiv0.ServerJSON{
 				Name:        "com.example/new-server",
 				Description: "A new server with no remotes",
-				Version:     "1.0.0",
-				Remotes:     []model.Transport{},
+				Version: "1.0.0",
+				Remotes: []model.Transport{},
 			},
 			expectError: false,
 		},
@@ -65,7 +65,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 			serverDetail: apiv0.ServerJSON{
 				Name:        "com.example/new-server",
 				Description: "A new server",
-				Version:     "1.0.0",
+				Version: "1.0.0",
 				Remotes: []model.Transport{
 					{Type: "streamable-http", URL: "https://new.example.com/mcp"},
 					{Type: "sse", URL: "https://unique.example.com/sse"},
@@ -78,7 +78,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 			serverDetail: apiv0.ServerJSON{
 				Name:        "com.example/new-server",
 				Description: "A new server with duplicate URL",
-				Version:     "1.0.0",
+				Version: "1.0.0",
 				Remotes: []model.Transport{
 					{Type: "streamable-http", URL: "https://api.example.com/mcp"}, // This URL already exists
 				},
@@ -91,7 +91,7 @@ func TestValidateNoDuplicateRemoteURLs(t *testing.T) {
 			serverDetail: apiv0.ServerJSON{
 				Name:        "com.example/existing-server", // Same name as existing
 				Description: "Updated existing server",
-				Version:     "1.1.0",
+				Version: "1.1.0",
 				Remotes: []model.Transport{
 					{Type: "streamable-http", URL: "https://api.example.com/mcp"}, // Same URL as before
 				},

internal/validators/utils.go

@@ -35,7 +35,7 @@ func HasNoSpaces(s string) bool {
 func extractTemplateVariables(url string) []string {
 	re := regexp.MustCompile(`\{([^}]+)\}`)
 	matches := re.FindAllStringSubmatch(url, -1)
-
+	
 	var variables []string
 	for _, match := range matches {
 		if len(match) > 1 {
@@ -55,24 +55,24 @@ func replaceTemplateVariables(rawURL string) string {
 		"{protocol}": "http",
 		"{scheme}":   "http",
 	}
-
+	
 	result := rawURL
 	for placeholder, replacement := range templateReplacements {
 		result = strings.ReplaceAll(result, placeholder, replacement)
 	}
-
+	
 	// Handle any remaining {variable} patterns with generic placeholder
 	re := regexp.MustCompile(`\{[^}]+\}`)
 	result = re.ReplaceAllString(result, "placeholder")
-
+	
 	return result
 }
 
 // IsValidURL checks if a URL is in valid format (basic structure validation)
 func IsValidURL(rawURL string) bool {
 	// Replace template variables with placeholders for parsing
 	testURL := replaceTemplateVariables(rawURL)
-
+	
 	// Parse the URL
 	u, err := url.Parse(testURL)
 	if err != nil {
@@ -131,19 +131,19 @@ func IsValidRemoteURL(rawURL string) bool {
 	if !IsValidURL(rawURL) {
 		return false
 	}
-
+	
 	// Parse the URL to check for localhost restriction
 	u, err := url.Parse(rawURL)
 	if err != nil {
 		return false
 	}
-
+	
 	// Reject localhost URLs for remotes (security/production concerns)
 	hostname := u.Hostname()
 	if hostname == "localhost" || hostname == "127.0.0.1" || strings.HasSuffix(hostname, ".localhost") {
 		return false
 	}
-
+	
 	return true
 }
 
@@ -155,31 +155,31 @@ func IsValidTemplatedURL(rawURL string, availableVariables []string, allowTempla
 	if !IsValidURL(rawURL) {
 		return false
 	}
-
+	
 	// Extract template variables from URL
 	templateVars := extractTemplateVariables(rawURL)
-
+	
 	// If no templates are found, it's a valid static URL
 	if len(templateVars) == 0 {
 		return true
 	}
-
+	
 	// If templates are not allowed (e.g., for remotes), reject URLs with templates
 	if !allowTemplates {
 		return false
 	}
-
+	
 	// Validate that all template variables are available
 	availableSet := make(map[string]bool)
 	for _, v := range availableVariables {
 		availableSet[v] = true
 	}
-
+	
 	for _, templateVar := range templateVars {
 		if !availableSet[templateVar] {
 			return false
 		}
 	}
-
+	
 	return true
 }