From 2e21eabc4b4c1675432b9e07c2f38e50b9c07e4a Mon Sep 17 00:00:00 2001
From: Edouard Schweisguth <edouard.schweisguth@datadoghq.com>
Date: Fri, 15 Nov 2024 10:59:00 +0100
Subject: [PATCH] Bump golangci-lint versions & fix linter issues

---
 .golangci.yml | 6 +++---
 Dockerfile    | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index bca4771bb..88a3a8a2c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -22,10 +22,10 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - execinquery
+    # - execinquery
     - exhaustive
     # - exhaustruct
-    - exportloopref
+    # - exportloopref
     - forbidigo
     - forcetypeassert
     # - gci
@@ -41,7 +41,7 @@ linters:
     # - gofumpt
     - goheader
     - goimports
-    - gomnd
+    # - gomnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
diff --git a/Dockerfile b/Dockerfile
index 5bda9f976..d78960a9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG GO_VERSION=1.23.0
 ARG XX_VERSION=1.2.1
-ARG GOLANGCI_LINT_VERSION=v1.55.2
+ARG GOLANGCI_LINT_VERSION=v1.62.0
 
 # xx is a helper for cross-compilation
 FROM --platform=${BUILDPLATFORM} tonistiigi/xx:${XX_VERSION} AS xx
@@ -72,11 +72,8 @@ RUN --mount=type=bind,target=. \
     --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/cache/golangci-lint \
     --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
-    golangci-lint cache status && \
-    find / -iname .golangci.yaml && \
-    pwd && \
-    find / -iname .golangci.yaml -exec cat {} \; && \
-    golangci-lint run --build-tags "$BUILD_TAGS" -c .golangci.yml ./...
+    echo "cache status: " && golangci-lint cache status && echo "" && \
+    golangci-lint run --build-tags "$BUILD_TAGS" -c /src/.golangci.yml /src/...
 
 FROM scratch AS binary-unix
 COPY --link --from=build /out/kubehound /