refactor: refactor codebase for improved formatting and readability

- Improve formatting by breaking up long function argument lists onto multiple lines for clarity and consistency
- Update test error reporting to use multi-line formatting for better readability
- No functional changes to logic or behavior; solely refactoring for style and maintainability

Signed-off-by: appleboy <appleboy.tw@gmail.com>

Author: appleboy

02-basic-token-passthrough/server.go

@@ -67,10 +67,13 @@ func (s *MCPServer) ServeHTTP() *server.StreamableHTTPServer {
 // ServeStdio starts the MCP server using stdio transport, injecting the
 // auth token from the environment into the context.
 func (s *MCPServer) ServeStdio() error {
-	return server.ServeStdio(s.server, server.WithStdioContextFunc(func(ctx context.Context) context.Context {
-		ctx = core.AuthFromEnv(ctx)
-		return core.WithRequestID(ctx)
-	}))
+	return server.ServeStdio(
+		s.server,
+		server.WithStdioContextFunc(func(ctx context.Context) context.Context {
+			ctx = core.AuthFromEnv(ctx)
+			return core.WithRequestID(ctx)
+		}),
+	)
 }
 
 func main() {

04-observability/server.go

@@ -100,7 +100,12 @@ func main() {
 	var addr string
 	flag.StringVar(&addr, "addr", ":8080", "address to listen on")
 	// Support both short (-t) and long (--transport) flags for convenience.
-	flag.StringVar(&transport, "t", "stdio", "Transport type (stdio or http) (alias for --transport)")
+	flag.StringVar(
+		&transport,
+		"t",
+		"stdio",
+		"Transport type (stdio or http) (alias for --transport)",
+	)
 	flag.StringVar(&transport, "transport", "stdio", "Transport type (stdio or http)")
 	flag.Parse()
 

pkg/operation/echo/echo.go

@@ -7,8 +7,11 @@ import (
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
-var EchoMessageTool = mcp.NewTool("echo_message",
-	mcp.WithDescription("Returns the input message prefixed with 'Echo: '. Useful for testing integration and server responsiveness."), // Tool description
+var EchoMessageTool = mcp.NewTool(
+	"echo_message",
+	mcp.WithDescription(
+		"Returns the input message prefixed with 'Echo: '. Useful for testing integration and server responsiveness.",
+	), // Tool description
 	mcp.WithString("message", // Tool argument name
 		mcp.Description("The message to echo back in the response."), // Argument description
 		mcp.Required(), // Argument is required
@@ -23,7 +26,10 @@ var EchoMessageTool = mcp.NewTool("echo_message",
 // Returns:
 //   - *mcp.CallToolResult: the result of the tool execution (here, a text message)
 //   - error: returns an error if the argument is invalid or processing fails
-func HandleEchoMessageTool(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+func HandleEchoMessageTool(
+	ctx context.Context,
+	req mcp.CallToolRequest,
+) (*mcp.CallToolResult, error) {
 	// Retrieve the "message" argument from arguments and check its type
 	message, ok := req.GetArguments()["message"].(string)
 	if !ok {

pkg/store/memory.go

@@ -42,7 +42,10 @@ func NewMemoryStore() *MemoryStore {
 
 // SaveAuthorizationCode stores an authorization code in memory.
 // It returns an error if the code is nil or the code string is empty.
-func (m *MemoryStore) SaveAuthorizationCode(ctx context.Context, code *core.AuthorizationCode) error {
+func (m *MemoryStore) SaveAuthorizationCode(
+	ctx context.Context,
+	code *core.AuthorizationCode,
+) error {
 	if code == nil {
 		return ErrNilAuthorizationCode
 	}
@@ -60,7 +63,10 @@ func (m *MemoryStore) SaveAuthorizationCode(ctx context.Context, code *core.Auth
 // GetAuthorizationCode retrieves an authorization code from memory by its code string.
 // It returns ErrCodeNotFound if the code does not exist.
 // If the code has expired, it will be automatically deleted and ErrCodeNotFound is returned.
-func (m *MemoryStore) GetAuthorizationCode(ctx context.Context, clientID string) (*core.AuthorizationCode, error) {
+func (m *MemoryStore) GetAuthorizationCode(
+	ctx context.Context,
+	clientID string,
+) (*core.AuthorizationCode, error) {
 	if clientID == "" {
 		return nil, ErrEmptyClientID
 	}

pkg/store/memory_test.go

@@ -91,7 +91,11 @@ func TestMemoryStore_SaveAuthorizationCode(t *testing.T) {
 					t.Errorf("Failed to retrieve saved code: %v", getErr)
 				}
 				if savedCode.Code != tt.code.Code {
-					t.Errorf("Retrieved code mismatch: got %v, want %v", savedCode.Code, tt.code.Code)
+					t.Errorf(
+						"Retrieved code mismatch: got %v, want %v",
+						savedCode.Code,
+						tt.code.Code,
+					)
 				}
 			}
 		})
@@ -182,8 +186,13 @@ func TestMemoryStore_GetAuthorizationCode(t *testing.T) {
 				t.Errorf("Expected no authorization code, but got %v", gotCode)
 			}
 
-			if tt.wantCode && gotCode != nil && tt.setupCode != nil && gotCode.Code != tt.setupCode.Code {
-				t.Errorf("GetAuthorizationCode() code = %v, want %v", gotCode.Code, tt.setupCode.Code)
+			if tt.wantCode && gotCode != nil && tt.setupCode != nil &&
+				gotCode.Code != tt.setupCode.Code {
+				t.Errorf(
+					"GetAuthorizationCode() code = %v, want %v",
+					gotCode.Code,
+					tt.setupCode.Code,
+				)
 			}
 		})
 	}
@@ -267,11 +276,19 @@ func TestMemoryStore_UpdateExistingCode(t *testing.T) {
 	}
 
 	if retrievedCode.Code != "updated_code_456" {
-		t.Errorf("Code was not updated. Got Code %v, want %v", retrievedCode.Code, "updated_code_456")
+		t.Errorf(
+			"Code was not updated. Got Code %v, want %v",
+			retrievedCode.Code,
+			"updated_code_456",
+		)
 	}
 
 	if retrievedCode.RedirectURI != "https://updated.com/callback" {
-		t.Errorf("RedirectURI was not updated. Got %v, want %v", retrievedCode.RedirectURI, "https://updated.com/callback")
+		t.Errorf(
+			"RedirectURI was not updated. Got %v, want %v",
+			retrievedCode.RedirectURI,
+			"https://updated.com/callback",
+		)
 	}
 
 	if len(retrievedCode.Scope) != 2 {
@@ -458,7 +475,11 @@ func TestMemoryStore_GetClient(t *testing.T) {
 					t.Errorf("GetClient() ID = %v, want %v", gotClient.ID, tt.setupClient.ID)
 				}
 				if gotClient.Secret != tt.setupClient.Secret {
-					t.Errorf("GetClient() Secret = %v, want %v", gotClient.Secret, tt.setupClient.Secret)
+					t.Errorf(
+						"GetClient() Secret = %v, want %v",
+						gotClient.Secret,
+						tt.setupClient.Secret,
+					)
 				}
 			}
 		})
@@ -518,7 +539,11 @@ func TestMemoryStore_CreateClient(t *testing.T) {
 					t.Errorf("Failed to retrieve created client: %v", getErr)
 				}
 				if gotClient.ID != tt.client.ID {
-					t.Errorf("Retrieved client ID mismatch: got %v, want %v", gotClient.ID, tt.client.ID)
+					t.Errorf(
+						"Retrieved client ID mismatch: got %v, want %v",
+						gotClient.ID,
+						tt.client.ID,
+					)
 				}
 			}
 		})
@@ -601,10 +626,18 @@ func TestMemoryStore_UpdateClient(t *testing.T) {
 					t.Errorf("Failed to retrieve updated client: %v", getErr)
 				}
 				if gotClient.Secret != tt.updateClient.Secret {
-					t.Errorf("Client secret was not updated. Got %v, want %v", gotClient.Secret, tt.updateClient.Secret)
+					t.Errorf(
+						"Client secret was not updated. Got %v, want %v",
+						gotClient.Secret,
+						tt.updateClient.Secret,
+					)
 				}
 				if gotClient.Scope != tt.updateClient.Scope {
-					t.Errorf("Client scope was not updated. Got %v, want %v", gotClient.Scope, tt.updateClient.Scope)
+					t.Errorf(
+						"Client scope was not updated. Got %v, want %v",
+						gotClient.Scope,
+						tt.updateClient.Scope,
+					)
 				}
 			}
 		})

pkg/store/redis.go

@@ -67,7 +67,10 @@ func (r *RedisStore) Close() {
 
 // SaveAuthorizationCode stores an authorization code in Redis with TTL.
 // It returns an error if the code is nil or the client ID is empty.
-func (r *RedisStore) SaveAuthorizationCode(ctx context.Context, code *core.AuthorizationCode) error {
+func (r *RedisStore) SaveAuthorizationCode(
+	ctx context.Context,
+	code *core.AuthorizationCode,
+) error {
 	if code == nil {
 		return ErrNilAuthorizationCode
 	}
@@ -100,7 +103,10 @@ func (r *RedisStore) SaveAuthorizationCode(ctx context.Context, code *core.Autho
 // GetAuthorizationCode retrieves an authorization code from Redis by client ID.
 // It returns ErrCodeNotFound if the code does not exist or has expired.
 // Uses client-side caching with 10 second TTL for better performance.
-func (r *RedisStore) GetAuthorizationCode(ctx context.Context, clientID string) (*core.AuthorizationCode, error) {
+func (r *RedisStore) GetAuthorizationCode(
+	ctx context.Context,
+	clientID string,
+) (*core.AuthorizationCode, error) {
 	if clientID == "" {
 		return nil, ErrEmptyClientID
 	}

pkg/store/redis_test.go

@@ -564,7 +564,11 @@ func TestRedisStore_UpdateClient(t *testing.T) {
 					t.Errorf("GetClient() after update failed: %v", err)
 				}
 				if updated.Secret != tt.client.Secret {
-					t.Errorf("UpdateClient() secret = %v, want %v", updated.Secret, tt.client.Secret)
+					t.Errorf(
+						"UpdateClient() secret = %v, want %v",
+						updated.Secret,
+						tt.client.Secret,
+					)
 				}
 			}
 		})
@@ -953,7 +957,11 @@ func TestRedisStore_GetClient_CacheInvalidation(t *testing.T) {
 		t.Fatalf("GetClient() after update failed: %v", err)
 	}
 	if retrieved2.Scope != "read write admin" {
-		t.Errorf("Retrieved client scope after update = %v, want %v", retrieved2.Scope, "read write admin")
+		t.Errorf(
+			"Retrieved client scope after update = %v, want %v",
+			retrieved2.Scope,
+			"read write admin",
+		)
 	}
 
 	t.Log("Cache invalidation working correctly after client update")