updarte golangci-lint to v2

Author: metachris

.github/workflows/checks.yml

@@ -67,10 +67,7 @@ jobs:
         run: go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
 
       - name: Install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
-
-      # - name: Install NilAway
-      #   run: go install go.uber.org/nilaway/cmd/nilaway@v0.0.0-20240821220108-c91e71c080b7
+        run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.2
 
       - name: Lint
         run: make lint

.golangci.yaml

@@ -1,10 +1,10 @@
+version: "2"
 linters:
   enable-all: true
   disable:
     - cyclop
     - forbidigo
     - funlen
-    - gci
     - gochecknoglobals
     - gochecknoinits
     - gocritic
@@ -39,7 +39,6 @@ linters:
     #
     # Disabled because deprecated:
     #
-    - tenv
 
 linters-settings:
   #
@@ -87,3 +86,19 @@ linters-settings:
       - 'MockBeaconClient'
       - 'RelayAPI'
       - 'Webserver'
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

AGENTS.md

@@ -7,6 +7,8 @@
 - Go version: 1.24 (see `go.mod`). Module path: `github.com/flashbots/go-template`.
 
 ## Build, Test, and Development Commands
+- Use tab instead of spaces for indentation.
+- Always run `make fmt` and `make lint` and `make test` before committing.
 - `make build`: builds CLI and HTTP server into `build/`.
 - `make build-cli` / `make build-httpserver`: build individual binaries.
 - `make lint`: run formatters and linters (`gofmt`, `gofumpt`, `go vet`, `staticcheck`, `golangci-lint`).

database/database.go

@@ -21,9 +21,9 @@ func NewDatabaseService(dsn string) (*DatabaseService, error) {
 		return nil, err
 	}
 
-	db.DB.SetMaxOpenConns(50)
-	db.DB.SetMaxIdleConns(10)
-	db.DB.SetConnMaxIdleTime(0)
+	db.SetMaxOpenConns(50)
+	db.SetMaxIdleConns(10)
+	db.SetConnMaxIdleTime(0)
 
 	if os.Getenv("DB_DONT_APPLY_SCHEMA") == "" {
 		migrate.SetTable(vars.TableMigrations)

httpserver/handler_test.go

@@ -40,7 +40,7 @@ func Test_Handlers_Healthcheck_Drain_Undrain(t *testing.T) {
 		w := httptest.NewRecorder()
 		s.handleReadinessCheck(w, req)
 		resp := w.Result()
-		defer resp.Body.Close()
+		defer resp.Body.Close() //nolint:errcheck
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode, "Healthcheck must return `Ok` before draining")
@@ -53,7 +53,7 @@ func Test_Handlers_Healthcheck_Drain_Undrain(t *testing.T) {
 		s.handleDrain(w, req)
 		duration := time.Since(start)
 		resp := w.Result()
-		defer resp.Body.Close()
+		defer resp.Body.Close() //nolint:errcheck
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode, "Must return `Ok` for calls to `/drain`")
@@ -65,7 +65,7 @@ func Test_Handlers_Healthcheck_Drain_Undrain(t *testing.T) {
 		w := httptest.NewRecorder()
 		s.handleReadinessCheck(w, req)
 		resp := w.Result()
-		defer resp.Body.Close()
+		defer resp.Body.Close() //nolint:errcheck
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusServiceUnavailable, resp.StatusCode, "Healthcheck must return `Service Unavailable` after draining")
@@ -76,7 +76,7 @@ func Test_Handlers_Healthcheck_Drain_Undrain(t *testing.T) {
 		w := httptest.NewRecorder()
 		s.handleUndrain(w, req)
 		resp := w.Result()
-		defer resp.Body.Close()
+		defer resp.Body.Close() //nolint:errcheck
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode, "Must return `Ok` for calls to `/undrain`")
@@ -88,7 +88,7 @@ func Test_Handlers_Healthcheck_Drain_Undrain(t *testing.T) {
 		w := httptest.NewRecorder()
 		s.handleReadinessCheck(w, req)
 		resp := w.Result()
-		defer resp.Body.Close()
+		defer resp.Body.Close() //nolint:errcheck
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode, "Healthcheck must return `Ok` after undraining")