chore: update linter

Author: ldez

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
   pull_request:
+    branches:
+      - master
 
 jobs:
 
@@ -13,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.63.4
+      GOLANGCI_LINT_VERSION: v2.0
       CGO_ENABLED: 0
 
     steps:
@@ -34,14 +36,16 @@ jobs:
           git diff --exit-code go.mod
           git diff --exit-code go.sum
 
-      # https://golangci-lint.run/usage/install#other-ci
-      - name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }}
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
-          golangci-lint --version
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
+
+      - name: Tests
+        run: make test
 
-      - name: Make
-        run: make
+      - name: Build
+        run: make build
 
   check-local-install-script:
     name: Installation script (local)

.github/workflows/go-cross.yml

@@ -1,9 +1,12 @@
 name: Compilation
+
 on:
   push:
     branches:
       - master
   pull_request:
+    branches:
+      - master
 
 jobs:
 

.github/workflows/post-release.yml

@@ -1,4 +1,5 @@
 name: "Post release"
+
 on:
   release:
     types:
@@ -13,4 +14,4 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - run: curl -sSfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh | sh -s -- -b "./install-misspell"
+      - run: curl -sSfL https://raw.githubusercontent.com/golangci/misspell/HEAD/install-misspell.sh | sh -s -- -b "./install-misspell"

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: "Release a tag"
+
 on:
   push:
     tags:

.golangci.yml

@@ -1,96 +1,102 @@
+version: "2"
+
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+
 linters:
-  enable-all: true
+  default: all
   disable:
-    - exportloopref # deprecated
-    - rowserrcheck # not relevant (SQL)
-    - sqlclosecheck # not relevant (SQL)
     - cyclop # duplicate of gocyclo
     - dupl
+    - err113
+    - errcheck # FIXME(ldez) must be fixed
     - exhaustive
     - exhaustruct
     - forbidigo
     - gochecknoglobals
     - gochecknoinits
-    - err113
-    - mnd
+    - gosmopolitan
+    - gosec # FIXME(ldez) must be fixed
     - lll
+    - misspell
+    - mnd
+    - nakedret # FIXME(ldez) must be fixed
     - nilnil
     - nlreturn
+    - nonamedreturns # FIXME(ldez) must be fixed
     - paralleltest
     - prealloc
+    - rowserrcheck # not relevant (SQL)
+    - sqlclosecheck # not relevant (SQL)
     - testpackage
     - tparallel
     - varnamelen
     - wrapcheck
-    - wsl
-    - misspell
-    - gosec # FIXME(ldez) must be fixed
-    - errcheck # FIXME(ldez) must be fixed
-    - nonamedreturns # FIXME(ldez) must be fixed
-    - nakedret # FIXME(ldez) must be fixed
+    - wsl # FIXME(ldez) must be fixed
 
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-  gocyclo:
-    min-complexity: 16
-  goconst:
-    min-len: 3
-    min-occurrences: 3
-  misspell:
-    locale: US
-  funlen:
-    lines: -1
-    statements: 40
-  gofumpt:
-    extra-rules: true
-  depguard:
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/instana/testify
+              desc: not allowed
+            - pkg: github.com/pkg/errors
+              desc: Should be replaced by standard lib errors package
+    forbidigo:
+      forbid:
+        - pattern: ^print(ln)?$
+        - pattern: ^panic$
+        - pattern: ^spew\.Print(f|ln)?$
+        - pattern: ^spew\.Dump$
+    funlen:
+      lines: -1
+      statements: 40
+    goconst:
+      min-len: 3
+      min-occurrences: 3
+    gocritic:
+      disabled-checks:
+        - sloppyReassign
+        - rangeValCopy
+        - octalLiteral
+        - paramTypeCombine # already handle by gofumpt.extra-rules
+        - exitAfterDefer # FIXME(ldez) must be fixed
+        - ifElseChain # FIXME(ldez) must be fixed
+      enabled-tags:
+        - diagnostic
+        - style
+        - performance
+      settings:
+        hugeParam:
+          sizeThreshold: 100
+    gocyclo:
+      min-complexity: 16
+    godox:
+      keywords:
+        - FIXME
+    govet:
+      disable:
+        - fieldalignment
+      enable-all: true
+    misspell:
+      locale: US
+
+  exclusions:
+    warn-unused: true
+    presets:
+      - comments
     rules:
-      main:
-        deny:
-          - pkg: "github.com/instana/testify"
-            desc: not allowed
-          - pkg: "github.com/pkg/errors"
-            desc: Should be replaced by standard lib errors package
-  godox:
-    keywords:
-      - FIXME
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - style
-      - performance
-    disabled-checks:
-      - sloppyReassign
-      - rangeValCopy
-      - octalLiteral
-      - paramTypeCombine # already handle by gofumpt.extra-rules
-      - exitAfterDefer # FIXME(ldez) must be fixed
-      - ifElseChain # FIXME(ldez) must be fixed
-    settings:
-      hugeParam:
-        sizeThreshold: 100
-  forbidigo:
-    forbid:
-      - '^print(ln)?$'
-      - '^panic$'
-      - '^spew\.Print(f|ln)?$'
-      - '^spew\.Dump$'
+      - linters:
+          - funlen
+          - goconst
+        path: .*_test.go
 
 issues:
-  exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude:
-    - 'ST1000: at least one file in a package should have a package comment'
-    - 'package-comments: should have a package comment'
-  exclude-rules:
-    - path: .*_test.go
-      linters:
-        - funlen
-        - goconst
-
-run:
-  timeout: 2m

ascii.go

@@ -32,7 +32,7 @@ func StringEqualFold(s1, s2 string) bool {
 	if len(s1) != len(s2) {
 		return false
 	}
-	for i := 0; i < len(s1); i++ {
+	for i := range len(s1) {
 		c1 := s1[i]
 		c2 := s2[i]
 		// c1 & c2

benchmark_test.go

@@ -34,7 +34,7 @@ func BenchmarkCleanString(b *testing.B) {
 	var updated string
 	var diffs []Diff
 	var count int
-	for n := 0; n < b.N; n++ {
+	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		updated, diffs = rep.Replace(sampleClean)
 		count += len(diffs)
 	}
@@ -55,7 +55,7 @@ func BenchmarkCleanStream(b *testing.B) {
 	tmpCount = 0
 	buf := bytes.NewBufferString(sampleClean)
 	out := bytes.NewBuffer(make([]byte, 0, len(sampleClean)+100))
-	for n := 0; n < b.N; n++ {
+	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		buf.Reset()
 		buf.WriteString(sampleClean)
 		out.Reset()
@@ -70,7 +70,7 @@ func BenchmarkCleanStreamDiscard(b *testing.B) {
 
 	buf := bytes.NewBufferString(sampleClean)
 	tmpCount = 0
-	for n := 0; n < b.N; n++ {
+	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		buf.Reset()
 		buf.WriteString(sampleClean)
 		rep.ReplaceReader(buf, io.Discard, discardDiff)
@@ -84,7 +84,7 @@ func BenchmarkDirtyString(b *testing.B) {
 	var updated string
 	var diffs []Diff
 	var count int
-	for n := 0; n < b.N; n++ {
+	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		updated, diffs = rep.Replace(sampleDirty)
 		count += len(diffs)
 	}
@@ -98,7 +98,7 @@ func BenchmarkCompile(b *testing.B) {
 	r := New()
 	b.ReportAllocs()
 	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
+	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		r.Compile()
 	}
 }

case.go

@@ -21,7 +21,7 @@ func CaseStyle(word string) WordCase {
 	lowerCount := 0
 
 	// this iterates over RUNES not BYTES
-	for i := 0; i < len(word); i++ {
+	for i := range len(word) {
 		ch := word[i]
 		switch {
 		case ch >= 'a' && ch <= 'z':

case_test.go

@@ -19,7 +19,6 @@ func TestCaseStyle(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.word, func(t *testing.T) {
 			t.Parallel()
 
@@ -40,7 +39,6 @@ func TestCaseVariations(t *testing.T) {
 	}
 
 	for _, test := range testCases {
-		test := test
 		t.Run(test.word, func(t *testing.T) {
 			t.Parallel()
 

cmd/misspell/main.go

@@ -164,10 +164,10 @@ func main() {
 		log.Fatal(err)
 	}
 
-	switch {
-	case *format == outputFormatCSV:
+	switch *format {
+	case outputFormatCSV:
 		output.Println(csvHeader)
-	case *format == outputFormatSQLite || *format == outputFormatSQLite3:
+	case outputFormatSQLite, outputFormatSQLite3:
 		output.Println(sqliteHeader)
 	}
 
@@ -241,7 +241,7 @@ func main() {
 	c := make(chan string, 64)
 	results := make(chan int, *workers)
 
-	for i := 0; i < *workers; i++ {
+	for range *workers {
 		go worker(*writeit, &r, *mode, c, results)
 	}
 
@@ -256,7 +256,7 @@ func main() {
 	close(c)
 
 	count := 0
-	for i := 0; i < *workers; i++ {
+	for range *workers {
 		changed := <-results
 		count += changed
 	}