From be97466809af04775f82d481371f459498536fd8 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Tue, 26 Mar 2024 09:30:32 +0100
Subject: [PATCH] CI: use golangci-lint 1.57 (#2916)

---
 .github/workflows/go-tests-windows.yml |  2 +-
 .github/workflows/go-tests.yml         |  2 +-
 .golangci.yml                          | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/go-tests-windows.yml b/.github/workflows/go-tests-windows.yml
index 643cb9b39..6b2f1132a 100644
--- a/.github/workflows/go-tests-windows.yml
+++ b/.github/workflows/go-tests-windows.yml
@@ -56,7 +56,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v4
       with:
-        version: v1.56
+        version: v1.57
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false
         # the cache is already managed above, enabling it here
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 918cefb26..d76315462 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -157,7 +157,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v4
       with:
-        version: v1.56
+        version: v1.57
         args: --issues-exit-code=1 --timeout 10m
         only-new-issues: false
         # the cache is already managed above, enabling it here
diff --git a/.golangci.yml b/.golangci.yml
index 758327e40..df0cb67d1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,12 +1,5 @@
 # https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
 
-run:
-  skip-dirs:
-    - pkg/time/rate
-  skip-files:
-    - pkg/yamlpatch/merge.go
-    - pkg/yamlpatch/merge_test.go
-
 linters-settings:
   cyclop:
     # lower this after refactoring
@@ -19,6 +12,10 @@ linters-settings:
      - prefix(github.com/crowdsecurity)
      - prefix(github.com/crowdsecurity/crowdsec)
 
+  gomoddirectives:
+    replace-allow-list:
+      - golang.org/x/time/rate
+
   gocognit:
     # lower this after refactoring
     min-complexity: 145
@@ -40,7 +37,6 @@ linters-settings:
     statements: 122
 
   govet:
-    check-shadowing: true
     enable:
      - atomicalign
      - deepequalerrors
@@ -295,15 +291,21 @@ issues:
   # “Look, that’s why there’s rules, understand? So that you think before you
   # break ‘em.” ― Terry Pratchett
 
+  exclude-dirs:
+    - pkg/time/rate
+
+  exclude-files:
+    - pkg/yamlpatch/merge.go
+    - pkg/yamlpatch/merge_test.go
+
+  exclude-generated-strict: true
+
   max-issues-per-linter: 0
   max-same-issues: 0
   exclude-rules:
 
     # Won't fix:
 
-    - path: go.mod
-      text: "replacement are not allowed: golang.org/x/time/rate"
-
     # `err` is often shadowed, we may continue to do it
     - linters:
         - govet