From a13bcbfb09337efe1a24d2c667a240c629c6dc14 Mon Sep 17 00:00:00 2001 From: Ekaterina Lebedeva Date: Thu, 22 Aug 2024 19:13:52 +0300 Subject: [PATCH] [#517] lint: Update golangci-lint to v1.60 and fix issues Needed due to https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pulls/266 Signed-off-by: Ekaterina Lebedeva Signed-off-by: Marina Biryukova --- .golangci.yml | 3 ++- Makefile | 4 ++-- internal/frostfs/policy/contract/contract.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6174a52..7f969d4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -12,7 +12,8 @@ run: # output configuration options output: # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number" - format: tab + formats: + - format: tab # all available settings of specific linters linters-settings: diff --git a/Makefile b/Makefile index 9a6ee92..a069c9e 100755 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ REPO ?= $(shell go list -m) VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop") GO_VERSION ?= 1.22 -LINT_VERSION ?= 1.56.1 -TRUECLOUDLAB_LINT_VERSION ?= 0.0.5 +LINT_VERSION ?= 1.60.1 +TRUECLOUDLAB_LINT_VERSION ?= 0.0.6 BINDIR = bin METRICS_DUMP_OUT ?= ./metrics-dump.json diff --git a/internal/frostfs/policy/contract/contract.go b/internal/frostfs/policy/contract/contract.go index eac4ea6..97f97de 100644 --- a/internal/frostfs/policy/contract/contract.go +++ b/internal/frostfs/policy/contract/contract.go @@ -189,7 +189,7 @@ func (m *multiTX) wrapCall(method string, args []any) { if err == nil { return } - if !errors.Is(commonclient.ErrTransactionTooLarge, err) { + if !errors.Is(err, commonclient.ErrTransactionTooLarge) { m.err = err return }