Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 1 addition & 2 deletions consul_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion consul_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down