refactor: modernize code with modernize and intrange

Author: alexandear

.github/workflows/lint.yml

@@ -20,4 +20,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.5
+          version: v2.8

.golangci.yml

@@ -9,12 +9,14 @@ linters:
     - gosec
     - makezero
     - misspell
+    - modernize
     - nakedret
     - revive
     - errcheck
     - staticcheck
     - govet
     - ineffassign
+    - intrange
     - unused
   exclusions:
     generated: lax
@@ -27,6 +29,11 @@ linters:
       - third_party$
       - builtin$
       - examples$
+      - internal/githubv4mock
+    rules:
+      - linters:
+          - revive
+        text: "var-naming: avoid package names that conflict with Go standard library package names"
   settings:
     staticcheck:
       checks:

cmd/github-mcp-server/generate_docs.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"slices"
 	"sort"
 	"strings"
 
@@ -234,7 +235,7 @@ func writeToolDoc(buf *strings.Builder, tool inventory.ServerTool) {
 
 		for i, propName := range paramNames {
 			prop := schema.Properties[propName]
-			required := contains(schema.Required, propName)
+			required := slices.Contains(schema.Required, propName)
 			requiredStr := "optional"
 			if required {
 				requiredStr = "required"
@@ -289,15 +290,6 @@ func scopesEqual(a, b []string) bool {
 	return true
 }
 
-func contains(slice []string, item string) bool {
-	for _, s := range slice {
-		if s == item {
-			return true
-		}
-	}
-	return false
-}
-
 // indentMultilineDescription adds the specified indent to all lines after the first line.
 // This ensures that multi-line descriptions maintain proper markdown list formatting.
 func indentMultilineDescription(description, indent string) string {
@@ -319,14 +311,14 @@ func replaceSection(content, startMarker, endMarker, newContent string) (string,
 	start := fmt.Sprintf("<!-- %s -->", startMarker)
 	end := fmt.Sprintf("<!-- %s -->", endMarker)
 
-	startIdx := strings.Index(content, start)
+	before, _, ok := strings.Cut(content, start)
 	endIdx := strings.Index(content, end)
-	if startIdx == -1 || endIdx == -1 {
+	if !ok || endIdx == -1 {
 		return "", fmt.Errorf("markers not found: %s / %s", start, end)
 	}
 
 	var buf strings.Builder
-	buf.WriteString(content[:startIdx])
+	buf.WriteString(before)
 	buf.WriteString(start)
 	buf.WriteString("\n")
 	buf.WriteString(newContent)
@@ -426,6 +418,7 @@ func generateRemoteOnlyToolsetsDoc() string {
 
 	return strings.TrimSuffix(buf.String(), "\n")
 }
+
 func generateDeprecatedAliasesDocs(docsPath string) error {
 	// Read the current file
 	content, err := os.ReadFile(docsPath) //#nosec G304

cmd/mcpcurl/main.go

@@ -73,8 +73,8 @@ type (
 
 	// RequestParams contains the tool name and arguments
 	RequestParams struct {
-		Name      string                 `json:"name"`
-		Arguments map[string]interface{} `json:"arguments"`
+		Name      string         `json:"name"`
+		Arguments map[string]any `json:"arguments"`
 	}
 
 	// Content matches the response format of a text content response
@@ -308,8 +308,8 @@ func addCommandFromTool(toolsCmd *cobra.Command, tool *Tool, prettyPrint bool) {
 }
 
 // buildArgumentsMap extracts flag values into a map of arguments
-func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{}, error) {
-	arguments := make(map[string]interface{})
+func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]any, error) {
+	arguments := make(map[string]any)
 
 	for name, prop := range tool.InputSchema.Properties {
 		switch prop.Type {
@@ -340,7 +340,7 @@ func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{},
 					}
 				case "object":
 					if jsonStr, _ := cmd.Flags().GetString(name + "-json"); jsonStr != "" {
-						var jsonArray []interface{}
+						var jsonArray []any
 						if err := json.Unmarshal([]byte(jsonStr), &jsonArray); err != nil {
 							return nil, fmt.Errorf("error parsing JSON for %s: %w", name, err)
 						}
@@ -355,7 +355,7 @@ func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{},
 }
 
 // buildJSONRPCRequest creates a JSON-RPC request with the given tool name and arguments
-func buildJSONRPCRequest(method, toolName string, arguments map[string]interface{}) (string, error) {
+func buildJSONRPCRequest(method, toolName string, arguments map[string]any) (string, error) {
 	id, err := rand.Int(rand.Reader, big.NewInt(10000))
 	if err != nil {
 		return "", fmt.Errorf("failed to generate random ID: %w", err)
@@ -432,7 +432,7 @@ func printResponse(response string, prettyPrint bool) error {
 	// Extract text from content items of type "text"
 	for _, content := range resp.Result.Content {
 		if content.Type == "text" {
-			var textContentObj map[string]interface{}
+			var textContentObj map[string]any
 			err := json.Unmarshal([]byte(content.Text), &textContentObj)
 
 			if err == nil {
@@ -445,7 +445,7 @@ func printResponse(response string, prettyPrint bool) error {
 			}
 
 			// Fallback parsing as JSONL
-			var textContentList []map[string]interface{}
+			var textContentList []map[string]any
 			if err := json.Unmarshal([]byte(content.Text), &textContentList); err != nil {
 				return fmt.Errorf("failed to parse text content as a list: %w", err)
 			}

internal/toolsnaps/toolsnaps_test.go

@@ -195,23 +195,23 @@ func TestToolSnapKeysSorted(t *testing.T) {
 
 	// Given a tool with fields that could be in any order
 	type complexTool struct {
-		Name        string                 `json:"name"`
-		Description string                 `json:"description"`
-		Properties  map[string]interface{} `json:"properties"`
-		Annotations map[string]interface{} `json:"annotations"`
+		Name        string         `json:"name"`
+		Description string         `json:"description"`
+		Properties  map[string]any `json:"properties"`
+		Annotations map[string]any `json:"annotations"`
 	}
 
 	tool := complexTool{
 		Name:        "test_tool",
 		Description: "A test tool",
-		Properties: map[string]interface{}{
+		Properties: map[string]any{
 			"zzz":   "last",
 			"aaa":   "first",
 			"mmm":   "middle",
-			"owner": map[string]interface{}{"type": "string", "description": "Owner"},
-			"repo":  map[string]interface{}{"type": "string", "description": "Repo"},
+			"owner": map[string]any{"type": "string", "description": "Owner"},
+			"repo":  map[string]any{"type": "string", "description": "Repo"},
 		},
-		Annotations: map[string]interface{}{
+		Annotations: map[string]any{
 			"readOnly": true,
 			"title":    "Test",
 		},
@@ -227,7 +227,7 @@ func TestToolSnapKeysSorted(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify that the JSON is properly sorted by checking key order
-	var parsed map[string]interface{}
+	var parsed map[string]any
 	err = json.Unmarshal(snapJSON, &parsed)
 	require.NoError(t, err)
 
@@ -285,7 +285,7 @@ func TestStructFieldOrderingSortedAlphabetically(t *testing.T) {
 	aFieldIndex := -1
 	mFieldIndex := -1
 	zFieldIndex := -1
-	for i := 0; i < len(snapStr)-7; i++ {
+	for i := range len(snapStr) - 7 {
 		switch snapStr[i : i+6] {
 		case "aField":
 			aFieldIndex = i

pkg/buffer/buffer.go

@@ -112,17 +112,14 @@ func ProcessResponseAsRingBufferToEnd(httpResp *http.Response, maxJobLogLines in
 	}
 
 	var result []string
-	linesInBuffer := totalLines
-	if linesInBuffer > maxJobLogLines {
-		linesInBuffer = maxJobLogLines
-	}
+	linesInBuffer := min(totalLines, maxJobLogLines)
 
 	startIndex := 0
 	if totalLines > maxJobLogLines {
 		startIndex = writeIndex
 	}
 
-	for i := 0; i < linesInBuffer; i++ {
+	for i := range linesInBuffer {
 		idx := (startIndex + i) % maxJobLogLines
 		if validLines[idx] {
 			result = append(result, lines[idx])

pkg/github/actions.go

@@ -339,9 +339,9 @@ func RunWorkflow(t translations.TranslationHelperFunc) inventory.ServerTool {
 			}
 
 			// Get optional inputs parameter
-			var inputs map[string]interface{}
+			var inputs map[string]any
 			if requestInputs, ok := args["inputs"]; ok {
-				if inputsMap, ok := requestInputs.(map[string]interface{}); ok {
+				if inputsMap, ok := requestInputs.(map[string]any); ok {
 					inputs = inputsMap
 				}
 			}
@@ -883,10 +883,7 @@ func downloadLogContent(ctx context.Context, logURL string, tailLines int, maxLi
 		return "", 0, httpResp, fmt.Errorf("failed to download logs: HTTP %d", httpResp.StatusCode)
 	}
 
-	bufferSize := tailLines
-	if bufferSize > maxLines {
-		bufferSize = maxLines
-	}
+	bufferSize := min(tailLines, maxLines)
 
 	processedInput, totalLines, httpResp, err := buffer.ProcessResponseAsRingBufferToEnd(httpResp, bufferSize)
 	if err != nil {
@@ -1819,9 +1816,9 @@ func ActionsRunTrigger(t translations.TranslationHelperFunc) inventory.ServerToo
 			runID, _ := OptionalIntParam(args, "run_id")
 
 			// Get optional inputs parameter
-			var inputs map[string]interface{}
+			var inputs map[string]any
 			if requestInputs, ok := args["inputs"]; ok {
-				if inputsMap, ok := requestInputs.(map[string]interface{}); ok {
+				if inputsMap, ok := requestInputs.(map[string]any); ok {
 					inputs = inputsMap
 				}
 			}
@@ -2226,7 +2223,7 @@ func getWorkflowRunUsage(ctx context.Context, client *github.Client, owner, repo
 	return utils.NewToolResultText(string(r)), nil, nil
 }
 
-func runWorkflow(ctx context.Context, client *github.Client, owner, repo, workflowID, ref string, inputs map[string]interface{}) (*mcp.CallToolResult, any, error) {
+func runWorkflow(ctx context.Context, client *github.Client, owner, repo, workflowID, ref string, inputs map[string]any) (*mcp.CallToolResult, any, error) {
 	event := github.CreateWorkflowDispatchEventRequest{
 		Ref:    ref,
 		Inputs: inputs,

pkg/github/actions_test.go

@@ -890,7 +890,7 @@ func Test_GetJobLogs(t *testing.T) {
 				assert.Contains(t, response, "logs")
 				assert.Equal(t, "Retrieved logs for 2 failed jobs", response["message"])
 
-				logs, ok := response["logs"].([]interface{})
+				logs, ok := response["logs"].([]any)
 				assert.True(t, ok)
 				assert.Len(t, logs, 2)
 			},
@@ -1227,7 +1227,7 @@ func Test_MemoryUsage_SlidingWindow_vs_NoWindow(t *testing.T) {
 	debug.SetGCPercent(-1)
 	defer debug.SetGCPercent(100)
 
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		runtime.GC()
 	}
 
@@ -1245,7 +1245,7 @@ func Test_MemoryUsage_SlidingWindow_vs_NoWindow(t *testing.T) {
 	})
 	require.NoError(t, err1)
 
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		runtime.GC()
 	}
 

pkg/github/code_scanning_test.go

@@ -41,7 +41,7 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 	tests := []struct {
 		name           string
 		mockedClient   *http.Client
-		requestArgs    map[string]interface{}
+		requestArgs    map[string]any
 		expectError    bool
 		expectedAlert  *github.Alert
 		expectedErrMsg string
@@ -51,7 +51,7 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 			mockedClient: MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
 				GetReposCodeScanningAlertsByOwnerByRepoByAlertNumber: mockResponse(t, http.StatusOK, mockAlert),
 			}),
-			requestArgs: map[string]interface{}{
+			requestArgs: map[string]any{
 				"owner":       "owner",
 				"repo":        "repo",
 				"alertNumber": float64(42),
@@ -67,7 +67,7 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 					_, _ = w.Write([]byte(`{"message": "Not Found"}`))
 				}),
 			}),
-			requestArgs: map[string]interface{}{
+			requestArgs: map[string]any{
 				"owner":       "owner",
 				"repo":        "repo",
 				"alertNumber": float64(9999),
@@ -158,7 +158,7 @@ func Test_ListCodeScanningAlerts(t *testing.T) {
 	tests := []struct {
 		name           string
 		mockedClient   *http.Client
-		requestArgs    map[string]interface{}
+		requestArgs    map[string]any
 		expectError    bool
 		expectedAlerts []*github.Alert
 		expectedErrMsg string
@@ -175,7 +175,7 @@ func Test_ListCodeScanningAlerts(t *testing.T) {
 					mockResponse(t, http.StatusOK, mockAlerts),
 				),
 			}),
-			requestArgs: map[string]interface{}{
+			requestArgs: map[string]any{
 				"owner":     "owner",
 				"repo":      "repo",
 				"ref":       "main",
@@ -194,7 +194,7 @@ func Test_ListCodeScanningAlerts(t *testing.T) {
 					_, _ = w.Write([]byte(`{"message": "Unauthorized access"}`))
 				}),
 			}),
-			requestArgs: map[string]interface{}{
+			requestArgs: map[string]any{
 				"owner": "owner",
 				"repo":  "repo",
 			},

pkg/github/context_tools.go

@@ -179,7 +179,7 @@ func GetTeams(t translations.TranslationHelperFunc) inventory.ServerTool {
 					} `graphql:"organizations(first: 100)"`
 				} `graphql:"user(login: $login)"`
 			}
-			vars := map[string]interface{}{
+			vars := map[string]any{
 				"login": githubv4.String(username),
 			}
 			if err := gqlClient.Query(ctx, &q, vars); err != nil {
@@ -262,7 +262,7 @@ func GetTeamMembers(t translations.TranslationHelperFunc) inventory.ServerTool {
 					} `graphql:"team(slug: $teamSlug)"`
 				} `graphql:"organization(login: $org)"`
 			}
-			vars := map[string]interface{}{
+			vars := map[string]any{
 				"org":      githubv4.String(org),
 				"teamSlug": githubv4.String(teamSlug),
 			}