chore: enable Go code formatters: gci and gofumpt

Author: alexandear

.golangci.yml

@@ -41,9 +41,12 @@ linters:
         - -QF1008
         - -ST1000
 formatters:
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule

cmd/github-mcp-server/generate_docs.go

@@ -9,11 +9,12 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/spf13/cobra"
+
 	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/translations"
-	"github.com/google/jsonschema-go/jsonschema"
-	"github.com/spf13/cobra"
 )
 
 var generateDocsCmd = &cobra.Command{
@@ -81,7 +82,7 @@ func generateReadmeDocs(readmePath string) error {
 	}
 
 	// Write back to file
-	err = os.WriteFile(readmePath, []byte(updatedContent), 0600)
+	err = os.WriteFile(readmePath, []byte(updatedContent), 0o600)
 	if err != nil {
 		return fmt.Errorf("failed to write README.md: %w", err)
 	}
@@ -110,7 +111,7 @@ func generateRemoteServerDocs(docsPath string) error {
 		return err
 	}
 
-	return os.WriteFile(docsPath, []byte(updatedContent), 0600) //#nosec G306
+	return os.WriteFile(docsPath, []byte(updatedContent), 0o600) //#nosec G306
 }
 
 // octiconImg returns an img tag for an Octicon that works with GitHub's light/dark theme.
@@ -436,7 +437,7 @@ func generateDeprecatedAliasesDocs(docsPath string) error {
 	}
 
 	// Write back to file
-	err = os.WriteFile(docsPath, []byte(updatedContent), 0600)
+	err = os.WriteFile(docsPath, []byte(updatedContent), 0o600)
 	if err != nil {
 		return fmt.Errorf("failed to write deprecated aliases docs: %w", err)
 	}

cmd/github-mcp-server/list_scopes.go

@@ -8,11 +8,12 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/translations"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 // ToolScopeInfo contains scope information for a single tool.

cmd/github-mcp-server/main.go

@@ -7,18 +7,21 @@ import (
 	"strings"
 	"time"
 
-	"github.com/github/github-mcp-server/internal/ghmcp"
-	"github.com/github/github-mcp-server/pkg/github"
-	ghhttp "github.com/github/github-mcp-server/pkg/http"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+
+	"github.com/github/github-mcp-server/internal/ghmcp"
+	"github.com/github/github-mcp-server/pkg/github"
+	ghhttp "github.com/github/github-mcp-server/pkg/http"
 )
 
 // These variables are set by the build process using ldflags.
-var version = "version"
-var commit = "commit"
-var date = "date"
+var (
+	version = "version"
+	commit  = "commit"
+	date    = "date"
+)
 
 var (
 	rootCmd = &cobra.Command{

e2e/e2e_test.go

@@ -15,12 +15,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/github/github-mcp-server/internal/ghmcp"
-	"github.com/github/github-mcp-server/pkg/github"
-	"github.com/github/github-mcp-server/pkg/translations"
 	gogithub "github.com/google/go-github/v82/github"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/github/github-mcp-server/internal/ghmcp"
+	"github.com/github/github-mcp-server/pkg/github"
+	"github.com/github/github-mcp-server/pkg/translations"
 )
 
 var (
@@ -277,7 +278,6 @@ func TestGetMe(t *testing.T) {
 	user, _, err := ghClient.Users.Get(context.Background(), "")
 	require.NoError(t, err, "expected to get user successfully")
 	require.Equal(t, trimmedContent.Login, *user.Login, "expected login to match")
-
 }
 
 func TestToolsets(t *testing.T) {
@@ -296,7 +296,7 @@ func TestToolsets(t *testing.T) {
 	// We could enumerate the tools here, but we'll need to expose that information
 	// declaratively in the MCP server, so for the moment let's just check the existence
 	// of an issue and repo tool, and the non-existence of a pull_request tool.
-	var toolsContains = func(expectedName string) bool {
+	toolsContains := func(expectedName string) bool {
 		return slices.ContainsFunc(response.Tools, func(tool *mcp.Tool) bool {
 			return tool.Name == expectedName
 		})

internal/ghmcp/server.go

@@ -12,6 +12,10 @@ import (
 	"syscall"
 	"time"
 
+	gogithub "github.com/google/go-github/v82/github"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/shurcooL/githubv4"
+
 	"github.com/github/github-mcp-server/pkg/errors"
 	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/http/transport"
@@ -22,9 +26,6 @@ import (
 	"github.com/github/github-mcp-server/pkg/scopes"
 	"github.com/github/github-mcp-server/pkg/translations"
 	"github.com/github/github-mcp-server/pkg/utils"
-	gogithub "github.com/google/go-github/v82/github"
-	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"github.com/shurcooL/githubv4"
 )
 
 // githubClients holds all the GitHub API clients created for a server instance.
@@ -235,7 +236,7 @@ func RunStdioServer(cfg StdioServerConfig) error {
 	var slogHandler slog.Handler
 	var logOutput io.Writer
 	if cfg.LogFilePath != "" {
-		file, err := os.OpenFile(cfg.LogFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
+		file, err := os.OpenFile(cfg.LogFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
 		if err != nil {
 			return fmt.Errorf("failed to open log file: %w", err)
 		}

internal/profiler/profiler.go

@@ -3,13 +3,12 @@ package profiler
 import (
 	"context"
 	"fmt"
+	"log/slog"
+	"math"
 	"os"
 	"runtime"
 	"strconv"
 	"time"
-
-	"log/slog"
-	"math"
 )
 
 // Profile represents performance metrics for an operation

internal/toolsnaps/toolsnaps.go

@@ -76,12 +76,12 @@ func writeSnap(snapPath string, contents []byte) error {
 	}
 
 	// Ensure the directory exists
-	if err := os.MkdirAll(filepath.Dir(snapPath), 0700); err != nil {
+	if err := os.MkdirAll(filepath.Dir(snapPath), 0o700); err != nil {
 		return fmt.Errorf("failed to create snapshot directory: %w", err)
 	}
 
 	// Write the snapshot file
-	if err := os.WriteFile(snapPath, sortedJSON, 0600); err != nil {
+	if err := os.WriteFile(snapPath, sortedJSON, 0o600); err != nil {
 		return fmt.Errorf("failed to write snapshot file: %w", err)
 	}
 

internal/toolsnaps/toolsnaps_test.go

@@ -65,8 +65,8 @@ func TestSnapshotExistsMatch(t *testing.T) {
 	// Given a matching snapshot file exists
 	tool := dummyTool{"foo", 42}
 	b, _ := json.MarshalIndent(tool, "", "  ")
-	require.NoError(t, os.MkdirAll("__toolsnaps__", 0700))
-	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), b, 0600))
+	require.NoError(t, os.MkdirAll("__toolsnaps__", 0o700))
+	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), b, 0o600))
 
 	// When we test the snapshot
 	err := Test("dummy", tool)
@@ -82,8 +82,8 @@ func TestSnapshotExistsDiff(t *testing.T) {
 	t.Setenv("UPDATE_TOOLSNAPS", "false")
 
 	// Given a non-matching snapshot file exists
-	require.NoError(t, os.MkdirAll("__toolsnaps__", 0700))
-	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`{"name":"foo","value":1}`), 0600))
+	require.NoError(t, os.MkdirAll("__toolsnaps__", 0o700))
+	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`{"name":"foo","value":1}`), 0o600))
 	tool := dummyTool{"foo", 2}
 
 	// When we test the snapshot
@@ -99,8 +99,8 @@ func TestUpdateToolsnaps(t *testing.T) {
 
 	// Given UPDATE_TOOLSNAPS is set, regardless of whether a matching snapshot file exists
 	t.Setenv("UPDATE_TOOLSNAPS", "true")
-	require.NoError(t, os.MkdirAll("__toolsnaps__", 0700))
-	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`{"name":"foo","value":1}`), 0600))
+	require.NoError(t, os.MkdirAll("__toolsnaps__", 0o700))
+	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`{"name":"foo","value":1}`), 0o600))
 	tool := dummyTool{"foo", 42}
 
 	// When we test the snapshot
@@ -120,8 +120,8 @@ func TestMalformedSnapshotJSON(t *testing.T) {
 	t.Setenv("UPDATE_TOOLSNAPS", "false")
 
 	// Given a malformed snapshot file exists
-	require.NoError(t, os.MkdirAll("__toolsnaps__", 0700))
-	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`not-json`), 0600))
+	require.NoError(t, os.MkdirAll("__toolsnaps__", 0o700))
+	require.NoError(t, os.WriteFile(filepath.Join("__toolsnaps__", "dummy.snap"), []byte(`not-json`), 0o600))
 	tool := dummyTool{"foo", 42}
 
 	// When we test the snapshot

pkg/errors/error.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/github/github-mcp-server/pkg/utils"
 	"github.com/google/go-github/v82/github"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
+
+	"github.com/github/github-mcp-server/pkg/utils"
 )
 
 type GitHubAPIError struct {
@@ -63,12 +64,14 @@ func (e *GitHubRawAPIError) Error() string {
 	return fmt.Errorf("%s: %w", e.Message, e.Err).Error()
 }
 
-type GitHubErrorKey struct{}
-type GitHubCtxErrors struct {
-	api     []*GitHubAPIError
-	graphQL []*GitHubGraphQLError
-	raw     []*GitHubRawAPIError
-}
+type (
+	GitHubErrorKey  struct{}
+	GitHubCtxErrors struct {
+		api     []*GitHubAPIError
+		graphQL []*GitHubGraphQLError
+		raw     []*GitHubRawAPIError
+	}
+)
 
 // ContextWithGitHubErrors updates or creates a context with a pointer to GitHub error information (to be used by middleware).
 func ContextWithGitHubErrors(ctx context.Context) context.Context {