From f2417ffb89713300f432f30f63ae006f9c0e92fb Mon Sep 17 00:00:00 2001 From: James Rasell Date: Mon, 28 Jul 2025 15:15:33 +0200 Subject: [PATCH] ci: Update hclogvet and correctly run across codebase. (#26362) --- GNUmakefile | 4 ++-- client/allocrunner/networking_cni.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 346d1069a..c6125acd8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -145,7 +145,7 @@ lint-deps: ## Install linter dependencies @echo "==> Updating linter dependencies..." go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.0 go install github.com/client9/misspell/cmd/misspell@v0.3.4 - go install github.com/hashicorp/go-hclog/hclogvet@feaf6d2ec20fd895e711195c99e3fde93a68afc5 + go install github.com/hashicorp/go-hclog/hclogvet@bd6194f1f5b126dbad2a3fdf3b9b6556cc3496c3 .PHONY: git-hooks git-dir = $(shell git rev-parse --git-dir) @@ -163,7 +163,7 @@ check: ## Lint the source code @cd ./api && golangci-lint run --config ../.golangci.yml --build-tags "$(GO_TAGS)" @echo "==> Linting hclog statements..." - @hclogvet . + @hclogvet ./... @echo "==> Spell checking website..." @misspell -error -source=text website/content/ diff --git a/client/allocrunner/networking_cni.go b/client/allocrunner/networking_cni.go index 7a8663501..ae31d68ec 100644 --- a/client/allocrunner/networking_cni.go +++ b/client/allocrunner/networking_cni.go @@ -594,10 +594,10 @@ func (c *cniNetworkConfigurator) Teardown(ctx context.Context, alloc *structs.Al // best effort cleanup ipv6 ipt, iptErr := c.newIPTables(structs.NodeNetworkAF_IPv6) if iptErr != nil { - c.logger.Debug("failed to detect ip6tables: %v", iptErr) + c.logger.Debug("failed to detect ip6tables", "error", iptErr) } else { if err := c.forceCleanup(ipt, alloc.ID); err != nil { - c.logger.Warn("ip6tables: %v", err) + c.logger.Warn("failed to cleanup iptables", "error", err) } }