diff --git a/Makefile b/Makefile index 68e2de9..cf7bdcb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GOLANGCI_LINT_VERSION=v1.60.1 +GOLANGCI_LINT_VERSION=v2.11.1 LINTER=./bin/golangci-lint LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION) diff --git a/consul_impl.go b/consul_impl.go index 3628972..ba28541 100644 --- a/consul_impl.go +++ b/consul_impl.go @@ -259,8 +259,7 @@ func batchOperations(kv *c.KV, ops []*c.KVTxnOp) error { for _, te := range resp.Errors { // COVERAGE: see above errs = append(errs, te.What) } - //nolint:stylecheck // this error message is capitalized on purpose - return fmt.Errorf("Consul transaction failed: %s", strings.Join(errs, ", ")) // COVERAGE: see above + return fmt.Errorf("Consul transaction failed: %s", strings.Join(errs, ", ")) //nolint:staticcheck // COVERAGE: see above } i = j } diff --git a/consul_test.go b/consul_test.go index c173e8a..91e5bb8 100644 --- a/consul_test.go +++ b/consul_test.go @@ -25,7 +25,7 @@ func TestLoggingAtStartup(t *testing.T) { ctx := subsystems.BasicClientContext{} ctx.Logging.Loggers = mockLog.Loggers store, _ := builder.Build(ctx) - defer store.Close() + defer store.Close() //nolint:errcheck // test cleanup mockLog.AssertMessageMatch(t, true, ldlog.Info, message) }