Bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 in /tools (

#184)

* Bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 in /tools

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.59.1 to 1.60.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.59.1...v1.60.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix transferer_test.go

* fix lint

* revert makefile

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrii Dema <a.dema@jazzserve.com>

cmd/pmm-dump/util.go

@@ -20,6 +20,7 @@ import (
  "encoding/json"
  "fmt"
  "io"
+ "math"
  "net/url"
  "os"
  "path"
@@ -366,11 +367,15 @@ func prepareVictoriaMetricsSource(grafanaC *client.Client, dumpCore bool, url st
  return nil, false
  }
 
+ if contentLimit > math.MaxInt {
+ log.Fatal().Msgf("`--vm-content-limit` can't have a value greater than %d", math.MaxInt)
+ }
+
  c := &victoriametrics.Config{
  ConnectionURL: url,
  TimeSeriesSelectors: selectors,
  NativeData: nativeData,
- ContentLimit: contentLimit,
+ ContentLimit: int(contentLimit),
  }
 
  log.Debug().Msgf("Got Victoria Metrics URL: %s", c.ConnectionURL)

pkg/transferer/transferer_test.go

@@ -16,6 +16,7 @@ package transferer
 
 import (
  "io"
+ "os"
  "testing"
 
  "github.com/pkg/errors"
@@ -66,4 +67,5 @@ func (s fakeSource) FinalizeWrites() error {
 func TestMain(m *testing.M) {
  log.Logger = zerolog.Nop()
  m.Run()
+ os.Exit(0)
 }

pkg/victoriametrics/config.go

@@ -18,5 +18,5 @@ type Config struct {
  ConnectionURL string
  TimeSeriesSelectors []string
  NativeData bool
- ContentLimit uint64
+ ContentLimit int
 }

pkg/victoriametrics/source.go

@@ -164,7 +164,7 @@ func compressChunk(chunk []Metric) ([]byte, error) {
  return buf.Bytes(), nil
 }
 
-func (s Source) splitChunkContent(chunkContent []byte, limit uint64) ([][]byte, error) {
+func (s Source) splitChunkContent(chunkContent []byte, limit int) ([][]byte, error) {
  metrics, err := decompressChunk(chunkContent)
  if err != nil {
  return nil, errors.Wrap(err, "failed to parse chunk content")
@@ -187,7 +187,7 @@ func (s Source) splitChunkContent(chunkContent []byte, limit uint64) ([][]byte,
  return data, nil
 }
 
-func (s Source) splitMetrics(metricChunks [][]Metric, limit uint64) ([][]Metric, error) {
+func (s Source) splitMetrics(metricChunks [][]Metric, limit int) ([][]Metric, error) {
  newMetricChunks := make([][]Metric, 0, len(metricChunks))
 
  for _, chunk := range metricChunks {
@@ -208,7 +208,7 @@ func (s Source) splitMetrics(metricChunks [][]Metric, limit uint64) ([][]Metric,
  if err != nil {
  return nil, errors.Wrap(err, "failed to compress metrics")
  }
- if len(compressedData) > int(limit) {
+ if len(compressedData) > limit {
  return s.splitMetrics(newMetricChunks, limit)
  }
  }
@@ -224,7 +224,7 @@ func (s Source) WriteChunk(filename string, r io.Reader) error {
  return errors.Wrap(err, "failed to read chunk content")
  }
 
- if s.cfg.ContentLimit > 0 && len(chunkContent) > int(s.cfg.ContentLimit) {
+ if s.cfg.ContentLimit > 0 && len(chunkContent) > s.cfg.ContentLimit {
  chunks, err := s.splitChunkContent(chunkContent, s.cfg.ContentLimit)
  if err != nil {
  return errors.Wrap(err, "failed to split chunk content")

pkg/victoriametrics/source_test.go

@@ -106,7 +106,7 @@ func TestWriteChunk(t *testing.T) {
  s := NewSource(grafanaC, Config{
  ConnectionURL: server.URL,
  NativeData: tt.nativeData,
- ContentLimit: uint64(tt.contentLimit),
+ ContentLimit: tt.contentLimit,
  })
 
  data, err := generateFakeChunk(tt.metricsSize)

tools/go.mod

@@ -1,12 +1,12 @@
 module github.com/percona-platform/template/tools
 
-go 1.22.0
+go 1.22.1
 
 toolchain go1.23.1
 
 require (
  github.com/apache/skywalking-eyes v0.6.0
- github.com/golangci/golangci-lint v1.59.1
+ github.com/golangci/golangci-lint v1.61.0
  github.com/quasilyte/go-consistent v0.6.1
  github.com/reviewdog/reviewdog v0.20.2
  golang.org/x/tools v0.26.0
@@ -21,16 +21,16 @@ require (
  code.gitea.io/sdk/gitea v0.19.0 // indirect
  dario.cat/mergo v1.0.0 // indirect
  github.com/4meepo/tagalign v1.3.4 // indirect
- github.com/Abirdcfly/dupword v0.0.14 // indirect
+ github.com/Abirdcfly/dupword v0.1.1 // indirect
  github.com/Antonboom/errname v0.1.13 // indirect
  github.com/Antonboom/nilnil v0.1.9 // indirect
- github.com/Antonboom/testifylint v1.3.1 // indirect
- github.com/BurntSushi/toml v1.4.0 // indirect
- github.com/Crocmagnon/fatcontext v0.2.2 // indirect
+ github.com/Antonboom/testifylint v1.4.3 // indirect
+ github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
+ github.com/Crocmagnon/fatcontext v0.5.2 // indirect
  github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
- github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
+ github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
- github.com/Masterminds/semver/v3 v3.2.1 // indirect
+ github.com/Masterminds/semver/v3 v3.3.0 // indirect
  github.com/Masterminds/sprig/v3 v3.2.3 // indirect
  github.com/Microsoft/go-winio v0.6.1 // indirect
  github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
@@ -45,7 +45,7 @@ require (
  github.com/bkielbasa/cyclop v1.2.1 // indirect
  github.com/blizzy78/varnamelen v0.8.0 // indirect
  github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect
- github.com/bombsimon/wsl/v4 v4.2.1 // indirect
+ github.com/bombsimon/wsl/v4 v4.4.1 // indirect
  github.com/breml/bidichk v0.2.7 // indirect
  github.com/breml/errchkjson v0.3.6 // indirect
  github.com/butuzov/ireturn v0.3.0 // indirect
@@ -55,11 +55,11 @@ require (
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/charithe/durationcheck v0.0.10 // indirect
  github.com/chavacava/garif v0.1.0 // indirect
- github.com/ckaznocha/intrange v0.1.2 // indirect
+ github.com/ckaznocha/intrange v0.2.0 // indirect
  github.com/cloudflare/circl v1.3.7 // indirect
  github.com/curioswitch/go-reassign v0.2.0 // indirect
  github.com/cyphar/filepath-securejoin v0.2.4 // indirect
- github.com/daixiang0/gci v0.13.4 // indirect
+ github.com/daixiang0/gci v0.13.5 // indirect
  github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
  github.com/davidmz/go-pageant v1.0.2 // indirect
  github.com/denis-tingaikin/go-header v0.5.0 // indirect
@@ -85,13 +85,13 @@ require (
  github.com/go-toolsmith/pkgload v1.2.2 // indirect
  github.com/go-toolsmith/strparse v1.1.0 // indirect
  github.com/go-toolsmith/typep v1.1.0 // indirect
- github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+ github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
  github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
  github.com/gobwas/glob v0.2.3 // indirect
- github.com/gofrs/flock v0.8.1 // indirect
+ github.com/gofrs/flock v0.12.1 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
- github.com/golangci/gofmt v0.0.0-20231019111953-be8c47862aaa // indirect
+ github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
  github.com/golangci/misspell v0.6.0 // indirect
  github.com/golangci/modinfo v0.3.4 // indirect
  github.com/golangci/plugin-module-register v0.1.1 // indirect
@@ -122,7 +122,7 @@ require (
  github.com/jgautheron/goconst v1.7.1 // indirect
  github.com/jingyugao/rowserrcheck v1.1.1 // indirect
  github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
- github.com/jjti/go-spancheck v0.6.1 // indirect
+ github.com/jjti/go-spancheck v0.6.2 // indirect
  github.com/julz/importas v0.1.0 // indirect
  github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
  github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -146,26 +146,26 @@ require (
  github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/mattn/go-runewidth v0.0.15 // indirect
  github.com/mattn/go-shellwords v1.0.12 // indirect
- github.com/mgechev/revive v1.3.7 // indirect
+ github.com/mgechev/revive v1.3.9 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
- github.com/moricho/tparallel v0.3.1 // indirect
+ github.com/moricho/tparallel v0.3.2 // indirect
  github.com/nakabonne/nestif v0.3.1 // indirect
  github.com/nishanths/exhaustive v0.12.0 // indirect
  github.com/nishanths/predeclared v0.2.2 // indirect
  github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
  github.com/olekukonko/tablewriter v0.0.5 // indirect
- github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+ github.com/pelletier/go-toml/v2 v2.2.3 // indirect
  github.com/pjbgf/sha1cd v0.3.0 // indirect
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
- github.com/polyfloyd/go-errorlint v1.5.2 // indirect
+ github.com/polyfloyd/go-errorlint v1.6.0 // indirect
  github.com/prometheus/client_golang v1.19.0 // indirect
  github.com/prometheus/client_model v0.6.0 // indirect
  github.com/prometheus/common v0.48.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
- github.com/quasilyte/go-ruleguard v0.4.2 // indirect
+ github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
  github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
  github.com/quasilyte/gogrep v0.5.0 // indirect
  github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
@@ -174,45 +174,44 @@ require (
  github.com/reviewdog/errorformat v0.0.0-20240608101709-1d3280ed6bd4 // indirect
  github.com/reviewdog/go-bitbucket v0.0.0-20201024094602-708c3f6a7de0 // indirect
  github.com/rivo/uniseg v0.4.7 // indirect
- github.com/ryancurrah/gomodguard v1.3.2 // indirect
+ github.com/ryancurrah/gomodguard v1.3.5 // indirect
  github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
  github.com/sagikazarmark/locafero v0.4.0 // indirect
  github.com/sagikazarmark/slog-shim v0.1.0 // indirect
  github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
  github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
  github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
- github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect
- github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
+ github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
+ github.com/securego/gosec/v2 v2.21.2 // indirect
  github.com/sergi/go-diff v1.3.1 // indirect
  github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
  github.com/sivchari/containedctx v1.0.3 // indirect
- github.com/sivchari/tenv v1.7.1 // indirect
+ github.com/sivchari/tenv v1.10.0 // indirect
  github.com/skeema/knownhosts v1.2.1 // indirect
  github.com/sonatard/noctx v0.0.2 // indirect
  github.com/sourcegraph/conc v0.3.0 // indirect
  github.com/sourcegraph/go-diff v0.7.0 // indirect
  github.com/spf13/afero v1.11.0 // indirect
  github.com/spf13/cast v1.6.0 // indirect
- github.com/spf13/cobra v1.8.0 // indirect
+ github.com/spf13/cobra v1.8.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/spf13/viper v1.18.2 // indirect
  github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
  github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
  github.com/stretchr/objx v0.5.2 // indirect
  github.com/stretchr/testify v1.9.0 // indirect
  github.com/subosito/gotenv v1.6.0 // indirect
- github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
  github.com/tdakkota/asciicheck v0.2.0 // indirect
- github.com/tetafro/godot v1.4.16 // indirect
+ github.com/tetafro/godot v1.4.17 // indirect
  github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a // indirect
  github.com/timonwong/loggercheck v0.9.4 // indirect
- github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
+ github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
  github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
  github.com/ultraware/funlen v0.1.0 // indirect
  github.com/ultraware/whitespace v0.1.1 // indirect
- github.com/uudashr/gocognit v1.1.2 // indirect
+ github.com/uudashr/gocognit v1.1.3 // indirect
  github.com/xanzy/go-gitlab v0.109.0 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
  github.com/xen0n/gosmopolitan v1.2.2 // indirect
@@ -221,13 +220,13 @@ require (
  github.com/ykadowak/zerologlint v0.1.5 // indirect
  gitlab.com/bosi/decorder v0.4.2 // indirect
  go-simpler.org/musttag v0.12.2 // indirect
- go-simpler.org/sloglint v0.7.1 // indirect
+ go-simpler.org/sloglint v0.7.2 // indirect
  go.uber.org/automaxprocs v1.5.3 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.27.0 // indirect
  golang.org/x/build v0.0.0-20240906172953-ad8de1aafeaf // indirect
  golang.org/x/crypto v0.28.0 // indirect
- golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+ golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
  golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
  golang.org/x/mod v0.21.0 // indirect
  golang.org/x/net v0.30.0 // indirect
@@ -241,6 +240,6 @@ require (
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- honnef.co/go/tools v0.4.7 // indirect
+ honnef.co/go/tools v0.5.1 // indirect
  mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
 )