From 4650c72beebbd4199bb56b11b139b1754a6825e1 Mon Sep 17 00:00:00 2001 From: "cilium-renovate[bot]" <134692979+cilium-renovate[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:19:11 +0000 Subject: [PATCH 1/2] chore(deps): update docker.io/golangci/golangci-lint docker tag to v1.64.5 Signed-off-by: cilium-renovate[bot] <134692979+cilium-renovate[bot]@users.noreply.github.com> --- .github/workflows/static-checks.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index 7ee92a2ca0d..5325acdc677 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -74,7 +74,7 @@ jobs: uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2 with: # renovate: datasource=docker depName=docker.io/golangci/golangci-lint - version: v1.63.4 + version: v1.64.5 args: --config=.golangci.yml --verbose format: diff --git a/Makefile b/Makefile index 237b69ca809..ff476c64465 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ tarball-clean: ##@ Test # renovate: datasource=docker -GOLANGCILINT_IMAGE=docker.io/golangci/golangci-lint:v1.63.4@sha256:7f4c8ee8a63d56caa41c099cf658f68b192b615e0f30e94b8864e81a3ceafb53 +GOLANGCILINT_IMAGE=docker.io/golangci/golangci-lint:v1.64.5@sha256:9faef4dda4304c4790a14c5b8c8cd8c2715a8cb754e13f61d8ceaa358f5a454a GOLANGCILINT_WANT_VERSION := $(subst @sha256,,$(patsubst v%,%,$(word 2,$(subst :, ,$(lastword $(subst /, ,$(GOLANGCILINT_IMAGE))))))) GOLANGCILINT_VERSION = $(shell golangci-lint version 2>/dev/null) .PHONY: check From 47087df2bd491b6c20bd9707e11857f35e25d973 Mon Sep 17 00:00:00 2001 From: Mahe Tardy Date: Fri, 14 Feb 2025 17:37:32 +0100 Subject: [PATCH 2/2] golangci-lint: fix new linters complaints Signed-off-by: Mahe Tardy --- tools/protoc-gen-go-tetragon/eventchecker/field.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/protoc-gen-go-tetragon/eventchecker/field.go b/tools/protoc-gen-go-tetragon/eventchecker/field.go index f328233d7fd..f63cd10f58d 100644 --- a/tools/protoc-gen-go-tetragon/eventchecker/field.go +++ b/tools/protoc-gen-go-tetragon/eventchecker/field.go @@ -241,9 +241,8 @@ func doGetFieldFrom(field *Field, g *protogen.GeneratedFile, handleList, handleO return doTimestampFrom(), nil } else if field.Message.GoIdent.GoImportPath == imports.DurationPath { return doDurationFrom(), nil - } else { - return doCheckerFrom(), nil } + return doCheckerFrom(), nil case protoreflect.EnumKind: return doEnumFrom(), nil @@ -457,9 +456,8 @@ func checkForKind(g *protogen.GeneratedFile, field *Field, checkerVar, eventVar return doTimestampCheck(), nil } else if field.Message.GoIdent.GoImportPath == imports.DurationPath { return doDurationCheck(), nil - } else { - return doCheckerCheck(), nil } + return doCheckerCheck(), nil case protoreflect.EnumKind: return doEnumCheck(), nil