ref: to golangci lint v2

Author: sshaplygin

.github/workflows/go.yml

@@ -5,9 +5,9 @@ name: Go
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 permissions:
   contents: read
@@ -17,42 +17,38 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-
-    - name: Build
-      run: go build -v ./...
-
-    - name: Go Format
-      run: gofmt -s -w . && git diff --exit-code
-
-    - name: Go Tidy
-      run: go mod tidy && git diff --exit-code
-
-    - name: Go mod verify
-      run: go mod verify
-
-    - name: Run linter
-      uses: golangci/golangci-lint-action@v3
-      with:
-        version: latest
-        skip-cache: true
-        skip-pkg-cache: true
-        skip-build-cache: true
-        args: --timeout 3m --verbose
-
-    - name: Test
-      run: go test -v ./...
-    
-    - name: Update coverage report
-      uses: ncruces/go-coverage-report@v0
-      with:
-        report: true
-        chart: true
-        amend: true
-      if: github.event_name == 'push'  
-      continue-on-error: true
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25"
+
+      - name: Build
+        run: go build -v ./...
+
+      - name: Go Format
+        run: gofmt -s -w . && git diff --exit-code
+
+      - name: Go Tidy
+        run: go mod tidy && git diff --exit-code
+
+      - name: Go mod verify
+        run: go mod verify
+
+      - name: Run linter
+        uses: golangci/golangci-lint-action@v9
+        with:
+          args: --timeout 3m --verbose
+
+      - name: Test
+        run: go test -v ./... -count=10
+
+      - name: Update coverage report
+        uses: ncruces/go-coverage-report@v0
+        with:
+          report: true
+          chart: true
+          amend: true
+        if: github.event_name == 'push'
+        continue-on-error: true

.golangci.yml

@@ -1,48 +1,42 @@
 # More info on config here: https://github.com/golangci/golangci-lint#config-file
+version: "2"
+
 run:
-  deadline: 10s
-  issues-exit-code: 1
+  timeout: 10s
   tests: true
-  skip-dirs-use-default: true
-  skip-dirs:
-    - bin
-    - vendor
-    - tests
 
 output:
-  format: colored-line-number
-  print-issued-lines: true
-  print-linter-name: true
-
-linters-settings:
-  govet:
-    check-shadowing: true
-  golint:
-    min-confidence: 0
-  dupl:
-    threshold: 100
-  goconst:
-    min-len:         2
-    min-occurrences: 2
-
+  formats:
+    text:
+      path: stdout
+      print-linter-name: true
+      colors: true
 
 linters:
-  disable-all: true
+  default: none
   enable:
     - unused
-    - stylecheck
-    - gosimple
     - govet
     - errcheck
     - ineffassign
-    - typecheck
     - dupl
     - goconst
-    - goimports
-    - megacheck
     - gosec
     - gocritic
     - staticcheck
+  settings:
+    govet:
+      enable:
+        - shadow
+    dupl:
+      threshold: 100
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+
+formatters:
+  enable:
+    - goimports
 
 issues:
   exclude-use-default: false

bik/bik_test.go

@@ -40,8 +40,6 @@ func TestValidate(t *testing.T) {
 		}
 
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			if err != nil {
 				require.ErrorAs(t, err, &tc.Error, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
@@ -87,8 +85,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			if err != nil {
 				require.ErrorAs(t, err, &tc.Error, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
@@ -102,7 +98,7 @@ func TestValidate(t *testing.T) {
 }
 
 func Test_Generate(t *testing.T) {
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		bik := Generate()
 		isValid, err := Validate(bik)
 		require.NoError(t, err, fmt.Sprintf("invalid bik value: %s", bik))
@@ -119,12 +115,12 @@ func Test_Exists(t *testing.T) {
 }
 
 func BenchmarkValidateCorrect(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_, _ = Validate("044525225")
 	}
 }
 func BenchmarkGenerate(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		Generate()
 	}
 }

inn/inn_test.go

@@ -40,8 +40,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, tc.IsValid, isValid, tc.Code)
 			if err != nil {
@@ -83,8 +81,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, tc.IsValid, isValid, tc.Code)
 			if err != nil {
@@ -102,7 +98,7 @@ func TestGenerate(t *testing.T) {
 	t.Run("generate legal inn", func(t *testing.T) {
 		var inn string
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			inn = GenerateLegal()
 			isValid, err := Validate(inn)
 			require.NoError(t, err, inn)
@@ -114,7 +110,7 @@ func TestGenerate(t *testing.T) {
 	t.Run("generate physical inn", func(t *testing.T) {
 		var inn string
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			inn = GeneratePhysical()
 			isValid, err := Validate(inn)
 			require.NoError(t, err, inn)
@@ -126,7 +122,7 @@ func TestGenerate(t *testing.T) {
 	t.Run("generate random inn", func(t *testing.T) {
 		var inn string
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			inn = Generate()
 			isValid, err := Validate(inn)
 			require.NoError(t, err, inn)
@@ -137,31 +133,31 @@ func TestGenerate(t *testing.T) {
 }
 
 func BenchmarkValidateCorrectLegal(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_, _ = Validate("7707083893")
 	}
 }
 
 func BenchmarkValidateCorrectPhysical(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_, _ = Validate("526317984689")
 	}
 }
 
 func BenchmarkGenerate(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		Generate()
 	}
 }
 
 func BenchmarkGenerateLegal(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		GenerateLegal()
 	}
 }
 
 func BenchmarkGeneratePhysical(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		GeneratePhysical()
 	}
 }

kpp/kpp_test.go

@@ -44,8 +44,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, isValid, tc.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
 			if err != nil {
@@ -86,8 +84,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, isValid, tc.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
 			if err != nil {
@@ -116,8 +112,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, isValid, tc.IsValid, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
 			if err != nil {
@@ -130,7 +124,7 @@ func TestValidate(t *testing.T) {
 }
 
 func Test_Generate(t *testing.T) {
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		kpp := Generate()
 		isValid, err := Validate(kpp)
 		require.NoError(t, err, fmt.Sprintf("invalid kpp value: %s", kpp))
@@ -140,12 +134,12 @@ func Test_Generate(t *testing.T) {
 }
 
 func BenchmarkValidateCorrect(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_, _ = Validate("775001001")
 	}
 }
 func BenchmarkGenerate(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		Generate()
 	}
 }

ogrn/models.go

@@ -175,7 +175,6 @@ func ParseOGRN(requiredType OGRNType, ogrn string) (*OGRNStruct, error) {
 	}
 
 	if requiredType == Physical && len(ogrn) != physicalLength {
-		fmt.Println(requiredType, len(ogrn))
 		return nil, &models.CommonError{
 			Method: packageName,
 			Err:    models.ErrInvalidLength,

ogrn/ogrn_test.go

@@ -39,8 +39,6 @@ func TestValidate(t *testing.T) {
 			},
 		}
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, tc.IsValid, isValid, tc.Code)
 			if err != nil {
@@ -81,8 +79,6 @@ func TestValidate(t *testing.T) {
 		}
 
 		for i, tc := range testCases {
-			tc := tc
-
 			isValid, err := Validate(tc.Code)
 			assert.Equal(t, tc.IsValid, isValid, tc.Code)
 			if err != nil {
@@ -95,7 +91,7 @@ func TestValidate(t *testing.T) {
 }
 
 func Test_Generate(t *testing.T) {
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		ogrn := Generate()
 		isValid, err := Validate(ogrn)
 		require.NoError(t, err, fmt.Sprintf("invalid ogrn value: %s", ogrn))
@@ -105,12 +101,12 @@ func Test_Generate(t *testing.T) {
 }
 
 func BenchmarkValidateCorrect(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_, _ = Validate("1027700132195")
 	}
 }
 func BenchmarkGenerate(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		Generate()
 	}
 }