Go1.23, bump golangci-lint

netobserv · Dec 17, 2024 · 390dbe0 · 390dbe0
1 parent b6b7d14
commit 390dbe0
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.22']
+        go: ['1.23']
 
     steps:
     - name: install make
@@ -26,7 +26,7 @@ jobs:
     - name: check clean vendors
       run: go mod vendor
     - name: Report coverage
-      if: ${{ matrix.go == '1.22' }}
+      if: ${{ matrix.go == '1.23' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./cover.out

diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.22']
+        go: ['1.23']
     steps:
       - name: install make
         run: sudo apt-get install make
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.22']
+        go: ['1.23']
     steps:
     - name: install make
       run: sudo apt-get install make

diff --git a/.github/workflows/push_image_pr.yml b/.github/workflows/push_image_pr.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.22']
+        go: ['1.23']
     steps:
       - name: install make
         run: sudo apt-get install make

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.22']
+        go: ['1.23']
     steps:
       - name: checkout
         uses: actions/checkout@v3

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,7 +5,7 @@ linters:
     - cyclop
     - errname
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - gocritic
     - gofmt
     - gosimple
@@ -16,16 +16,15 @@ linters:
     - stylecheck
     - typecheck
     - unused
+run:
+  go: "1.22"
 linters-settings:
-  stylecheck:
-    go: "1.22"
   gocritic:
     enabled-checks:
       - hugeParam
       - rangeExprCopy
       - rangeValCopy
       - indexAlloc
-      - deprecatedComment
     settings:
       ifElseChain:
         minThreshold: 3

diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ WORKDIR /opt/app-root/web
 RUN npm run format-all
 RUN npm run build$BUILDSCRIPT
 
-FROM docker.io/library/golang:1.22 as go-builder
+FROM docker.io/library/golang:1.23 as go-builder
 
 ARG TARGETARCH=amd64
 ARG LDFLAGS

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.22
+FROM docker.io/library/golang:1.23
 
 RUN apt-get update && apt-get install -y \
     nodejs \

diff --git a/Dockerfile.cypress b/Dockerfile.cypress
@@ -20,7 +20,7 @@ WORKDIR /opt/app-root/web
 RUN npm run format-all
 RUN npm run build$BUILDSCRIPT
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 as go-builder
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 as go-builder
 
 ARG LDFLAGS
 WORKDIR /opt/app-root

diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ ifneq ($(CLEAN_BUILD),)
 	LDFLAGS ?= -X 'main.buildVersion=${VERSION}-${BUILD_SHA}' -X 'main.buildDate=${BUILD_DATE}'
 endif
 
-GOLANGCI_LINT_VERSION = v1.53.3
+GOLANGCI_LINT_VERSION = v1.61.0
 NPM_INSTALL ?= install
 CMDLINE_ARGS ?= --loglevel trace --config config/config.yaml
 

diff --git a/pkg/handler/flows.go b/pkg/handler/flows.go
@@ -97,7 +97,7 @@ func (h *Handlers) getFlows(ctx context.Context, lokiClient httpclient.Caller, p
 				{filters.NewMatch(fields.SrcNamespace, `"`+namespace+`"`)},
 				{filters.NewMatch(fields.DstNamespace, `"`+namespace+`"`)},
 			},
-			func(sq filters.SingleQuery) bool { return false },
+			func(_ filters.SingleQuery) bool { return false },
 		)
 	}