From 4923d58657cef06b16d52bba4cf5b374bec2dba6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2025 05:05:32 +0000
Subject: [PATCH 1/2] Bump golangci/golangci-lint-action from 6.4.0 to 6.5.0 in
 the all group

Bumps the all group with 1 update: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action).


Updates `golangci/golangci-lint-action` from 6.4.0 to 6.5.0
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/0adbc47a5910e47adb692df88187ec8c73c76778...2226d7cb06a077cd73e56eedd38eecad18e5d837)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d8a8aef..9443942 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
           check-latest: true
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@0adbc47a5910e47adb692df88187ec8c73c76778 # v6.4.0
+        uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
           version: v1.61
           args: --timeout=5m --verbose

From 03b0b669efe8a318e00de3b1976ff9794557f0f3 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Mon, 17 Feb 2025 09:09:51 +0100
Subject: [PATCH 2/2] Update config

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 .github/workflows/lint.yml |  4 ++--
 .golangci.yml              | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9443942..e3f26c3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -20,5 +20,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
-          version: v1.61
-          args: --timeout=5m --verbose
+          version: v1.64
+          args: --verbose
diff --git a/.golangci.yml b/.golangci.yml
index 9b627a5..e78a66d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,7 @@
 ---
 run:
   concurrency: 6
-  deadline: 5m
+  timeout: 5m
 issues:
   exclude-rules:
     # counterfeiter fakes are usually named 'fake_<something>.go'
@@ -24,7 +24,6 @@ linters:
     - dogsled
     - dupl
     - durationcheck
-    - errcheck
     - goconst
     - gocritic
     - gocyclo
@@ -56,9 +55,8 @@ linters:
     - unparam
     - unused
     - whitespace
-    # - rowserrcheck
-    # - sqlclosecheck
     # - cyclop
+    # - errcheck
     # - errorlint
     # - exhaustive
     # - exhaustivestruct
@@ -79,7 +77,9 @@ linters:
     # - nlreturn
     # - noctx
     # - paralleltest
+    # - rowserrcheck
     # - scopelint
+    # - sqlclosecheck
     # - tagliatelle
     # - testpackage
     # - thelper
@@ -172,9 +172,6 @@ linters-settings:
   nolintlint:
     # Enable to ensure that nolint directives are all used. Default is true.
     allow-unused: false
-    # Disable to ensure that nolint directives don't have a leading space. Default is true.
-    # TODO(lint): Enforce machine-readable `nolint` directives
-    allow-leading-space: true
     # Exclude following linters from requiring an explanation.  Default is [].
     allow-no-explanation: []
     # Enable to require an explanation of nonzero length after each nolint directive. Default is false.