Merge pull request #1070 from cloudflare/dependabot/go_modules/tools/…

…golangci-lint/github.com/golangci/golangci-lint-1.60.1

build(deps): bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 in /tools/golangci-lint

.goreleaser.yml

@@ -25,7 +25,7 @@ archives:
 checksum:
  name_template: "checksums.txt"
 snapshot:
- name_template: "{{ incpatch .Version }}-next"
+ version_template: "{{ incpatch .Version }}-next"
 release:
  extra_files:
  - glob: ./README.md

go.ver

@@ -1 +1 @@
-1.22.6
+1.23.0

internal/checks/rule_for_test.go

@@ -10,12 +10,12 @@ import (
  "github.com/cloudflare/pint/internal/promapi"
 )
 
-func forMin(key, min string) string {
- return fmt.Sprintf("This alert rule must have a `%s` field with a minimum duration of %s.", key, min)
+func forMin(key, m string) string {
+ return fmt.Sprintf("This alert rule must have a `%s` field with a minimum duration of %s.", key, m)
 }
 
-func forMax(key, max string) string {
- return fmt.Sprintf("This alert rule must have a `%s` field with a maximum duration of %s.", key, max)
+func forMax(key, m string) string {
+ return fmt.Sprintf("This alert rule must have a `%s` field with a maximum duration of %s.", key, m)
 }
 
 func TestRuleForCheck(t *testing.T) {

internal/reporter/gitlab.go

@@ -466,7 +466,7 @@ func loggifyDiscussion(opt *gitlab.CreateMergeRequestDiscussionOptions) (attrs [
  return attrs
 }
 
-func tooManyCommentsMsg(nr, max int) string {
+func tooManyCommentsMsg(nr, m int) string {
  return fmt.Sprintf(`This pint run would create %d comment(s), which is more than the limit configured for pint (%d).
-%d comment(s) were skipped and won't be visibile on this PR.`, nr, max, nr-max)
+%d comment(s) were skipped and won't be visibile on this PR.`, nr, m, nr-m)
 }

tools/benchstat/go.mod

@@ -1,6 +1,6 @@
 module _
 
-go 1.22.0
+go 1.23.0
 
 require golang.org/x/perf v0.0.0-20231127181059-b53752263861
 

tools/betteralign/go.mod

@@ -1,6 +1,6 @@
 module _
 
-go 1.22.0
+go 1.23.0
 
 require github.com/dkorunic/betteralign v0.5.1
 

tools/gofumpt/go.mod

@@ -1,6 +1,6 @@
 module _
 
-go 1.22.0
+go 1.23.0
 
 require mvdan.cc/gofumpt v0.6.0
 

tools/goimports/go.mod

@@ -1,6 +1,6 @@
 module _
 
-go 1.22.0
+go 1.23.0
 
 require golang.org/x/tools v0.24.0
 

tools/golangci-lint/go.mod

@@ -1,8 +1,8 @@
 module _
 
-go 1.22.0
+go 1.23.0
 
-require github.com/golangci/golangci-lint v1.59.1
+require github.com/golangci/golangci-lint v1.60.1
 
 require (
  4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
@@ -11,11 +11,11 @@ require (
  github.com/Abirdcfly/dupword v0.0.14 // 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.4.0 // 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/semver/v3 v3.2.1 // indirect
  github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
  github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
@@ -27,7 +27,7 @@ require (
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bkielbasa/cyclop v1.2.1 // indirect
  github.com/blizzy78/varnamelen v0.8.0 // 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
@@ -60,7 +60,7 @@ require (
  github.com/go-viper/mapstructure/v2 v2.0.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/protobuf v1.5.3 // indirect
  github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
  github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
@@ -82,7 +82,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/kisielk/errcheck v1.7.0 // indirect
@@ -104,20 +104,19 @@ require (
  github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/mattn/go-runewidth v0.0.9 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
- github.com/mgechev/revive v1.3.7 // indirect
+ github.com/mgechev/revive v1.3.9 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // 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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // 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 v1.9.5 // indirect
  github.com/pelletier/go-toml/v2 v2.2.2 // indirect
  github.com/pmezard/go-difflib v1.0.0 // 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.12.1 // indirect
  github.com/prometheus/client_model v0.2.0 // indirect
  github.com/prometheus/common v0.32.1 // indirect
@@ -127,22 +126,22 @@ require (
  github.com/quasilyte/gogrep v0.5.0 // indirect
  github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
  github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
- github.com/ryancurrah/gomodguard v1.3.2 // indirect
+ github.com/ryancurrah/gomodguard v1.3.3 // indirect
  github.com/ryanrolds/sqlclosecheck v0.5.1 // 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/sashamelentyev/usestdlibvars v1.27.0 // indirect
  github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
  github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // 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/sonatard/noctx v0.0.2 // indirect
  github.com/sourcegraph/go-diff v0.7.0 // indirect
  github.com/spf13/afero v1.11.0 // indirect
  github.com/spf13/cast v1.5.0 // indirect
- github.com/spf13/cobra v1.7.0 // indirect
+ github.com/spf13/cobra v1.8.1 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/spf13/viper v1.13.0 // indirect
@@ -151,7 +150,6 @@ require (
  github.com/stretchr/objx v0.5.2 // indirect
  github.com/stretchr/testify v1.9.0 // indirect
  github.com/subosito/gotenv v1.4.1 // 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/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
@@ -160,31 +158,30 @@ require (
  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/xen0n/gosmopolitan v1.2.2 // indirect
  github.com/yagipy/maintidx v1.0.0 // indirect
  github.com/yeya24/promlinter v0.3.0 // indirect
  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/atomic v1.7.0 // indirect
  go.uber.org/automaxprocs v1.5.3 // indirect
  go.uber.org/multierr v1.6.0 // indirect
  go.uber.org/zap v1.24.0 // indirect
  golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
  golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
- golang.org/x/mod v0.18.0 // indirect
- golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.21.0 // indirect
+ golang.org/x/mod v0.20.0 // indirect
+ golang.org/x/sync v0.8.0 // indirect
+ golang.org/x/sys v0.23.0 // indirect
  golang.org/x/text v0.15.0 // indirect
- golang.org/x/tools v0.22.0 // indirect
+ golang.org/x/tools v0.24.0 // indirect
  google.golang.org/protobuf v1.33.0 // indirect
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
  gopkg.in/ini.v1 v1.67.0 // 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.0 // indirect
  mvdan.cc/gofumpt v0.6.0 // indirect
  mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
 )