From 15644a12fda7e997fde7ed8e26bd7fc34bf71a82 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 20:44:56 +0000 Subject: [PATCH 1/2] chore: fix lint issues surfaced by golangci-lint v2 Co-Authored-By: mkeeler@launchdarkly.com --- consul_impl.go | 3 +-- consul_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/consul_impl.go b/consul_impl.go index fce00e2..393c072 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 d622893..5c3013b 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) } From 8cfed58c168024f227a4009d26a306670b3dd135 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 20:44:56 +0000 Subject: [PATCH 2/2] chore: bump golangci-lint to v2.11.1 Co-Authored-By: mkeeler@launchdarkly.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 85acc88..6d116bd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -GOLANGCI_LINT_VERSION=v1.48.0 +GOLANGCI_LINT_VERSION=v2.11.1 LINTER=./bin/golangci-lint LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)