golangci-lint v2 (#46)

Author: leclark

.github/workflows/build.yml

@@ -25,6 +25,4 @@ jobs:
         with:
           files: ./coverage.txt
       - name: lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: latest
+        uses: golangci/golangci-lint-action@v7

.golangci.yaml

@@ -1,50 +1,64 @@
+version: "2"
 run:
   go: "1.23"
   tests: false
-issues:
-  exclude-files:
-    - ".*_gen.go$"
-  exclude-dirs:
-    - temp
 linters:
-  enable-all: true
+  default: all
   disable:
-    - gochecknoglobals
-    - ireturn
+    - depguard
     - exhaustruct
+    - gochecknoglobals
     - gocognit
-    - depguard
-    - intrange #pending 1.57.3
-    - tenv
-linters-settings:
-  cyclop:
-    max-complexity: 18
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/bir/iken)
-  varnamelen:
-    max-distance: 10
-    ignore-type-assert-ok: true
-    ignore-map-index-ok: true
-    ignore-decls:
-      - ok bool
-      - i int
-      - n int
-      - e error
-      - h http.Handler
-      - t time.Time
-      - v reflect.Value
-      - w io.Writer
-      - w http.ResponseWriter
-      - rw http.ResponseWriter
-      - r *http.Request
-      - wg sync.WaitGroup
-      - c chan
-      - op string
-      - l zerolog.Logger
-      - r io.Reader
-      - l zerolog.Context
-      - s string
-      - l string
+    - intrange
+    - ireturn
+  settings:
+    cyclop:
+      max-complexity: 18
+    varnamelen:
+      max-distance: 10
+      ignore-type-assert-ok: true
+      ignore-map-index-ok: true
+      ignore-decls:
+        - ok bool
+        - i int
+        - n int
+        - e error
+        - h http.Handler
+        - t time.Time
+        - v reflect.Value
+        - w io.Writer
+        - w http.ResponseWriter
+        - rw http.ResponseWriter
+        - r *http.Request
+        - wg sync.WaitGroup
+        - c chan
+        - op string
+        - l zerolog.Logger
+        - r io.Reader
+        - l zerolog.Context
+        - s string
+        - l string
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - .*_gen.go$
+      - temp
+formatters:
+  enable:
+    - goimports
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule
+      custom-order: true
+  exclusions:
+    generated: disable

Makefile

@@ -1,5 +1,5 @@
 lint:
-	golangci-lint run --sort-results
+	golangci-lint run
 
 test:
 	go test -race ./...
@@ -17,14 +17,10 @@ updateAll:
 	go get -u ./...
 
 fmt:
-	gofumpt -l -w .
-	gci write . -s standard -s default -s "prefix(github.com/bir/iken)"
+	golangci-lint fmt
 
 tools:
-	go install golang.org/x/tools/cmd/goimports@latest
-	go install mvdan.cc/gofumpt@latest
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-	go install github.com/daixiang0/gci@latest
+	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 
 .PHONY: lint test cover tidy update updateAll fmt tools
 

httputil/wrap_writer.go

@@ -125,7 +125,7 @@ func (f *fancyWriter) Flush() {
 var ErrUnsupported = errors.New("not implemented")
 
 func (f *fancyWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	hj, ok := f.basicWriter.ResponseWriter.(http.Hijacker)
+	hj, ok := f.ResponseWriter.(http.Hijacker)
 	if !ok {
 		return nil, nil, ErrUnsupported // Ignore coverage - unlikely to error
 	}
@@ -134,16 +134,16 @@ func (f *fancyWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 }
 
 func (f *fancyWriter) ReadFrom(r io.Reader) (int64, error) {
-	if f.basicWriter.tee != nil {
+	if f.tee != nil {
 		return io.Copy(&f.basicWriter, r) //nolint:wrapcheck // just a proxy
 	}
 
-	rf, ok := f.basicWriter.ResponseWriter.(io.ReaderFrom)
+	rf, ok := f.ResponseWriter.(io.ReaderFrom)
 	if !ok {
 		return 0, ErrUnsupported // Ignore coverage - unlikely to error
 	}
 
-	f.basicWriter.maybeWriteHeader()
+	f.maybeWriteHeader()
 
 	n, err := rf.ReadFrom(r)
 	f.bytes += int(n)

params/params_test.go

@@ -361,8 +361,10 @@ const (
 	ParamSourceCookie
 )
 
-var ParamSources = []ParamSource{ParamSourcePath, ParamSourceQuery, ParamSourceHeader, ParamSourceCookie}
-var ParamSourceNames = []string{"Path", "Query", "Header", "Cookie"}
+var (
+	ParamSources     = []ParamSource{ParamSourcePath, ParamSourceQuery, ParamSourceHeader, ParamSourceCookie}
+	ParamSourceNames = []string{"Path", "Query", "Header", "Cookie"}
+)
 
 // This abomination of a test function exists to run the same tests against all the different types
 // that can be retrieved from a param and all the different ways a param can be passed. The