Skip to content

Commit 0faeb5a

Browse files
committed
golangci-lint: move into hack/tools/golangci-lint
The advantage is that it separates the dependencies of the different tools better. golangci-lint in particular has many dependencies and is sometimes sensitive to the exact version being used. This way, "go get" bumps up dependencies exactly as defined by the upstream golangci-lint module. It's not quite self-contained because logcheck as a Go plugin for golangci-lint must be built from the same dependencies. But it only adds one and does not change any of the others. While at it, the Go 1.24 "tools" directive gets used instead of the traditional tools.go approach.
1 parent 5d9a2f3 commit 0faeb5a

File tree

7 files changed

+1236
-1018
lines changed

7 files changed

+1236
-1018
lines changed

hack/tools/go.mod

Lines changed: 1 addition & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ godebug default=go1.24
77
require (
88
github.com/aojea/sloppy-netparser v0.0.0-20210819225411-1b3bd8b3b975
99
github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c
10-
github.com/golangci/golangci-lint/v2 v2.1.5
1110
github.com/golangci/misspell v0.6.0
1211
github.com/jcchavezs/porto v0.6.0
1312
github.com/vektra/mockery/v2 v2.53.3
@@ -17,208 +16,45 @@ require (
1716
gotest.tools/gotestsum v1.12.0
1817
honnef.co/go/tools v0.6.1
1918
k8s.io/publishing-bot v0.5.0
20-
sigs.k8s.io/logtools v0.8.1
2119
)
2220

2321
require (
24-
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
25-
4d63.com/gochecknoglobals v0.2.2 // indirect
26-
github.com/4meepo/tagalign v1.4.2 // indirect
27-
github.com/Abirdcfly/dupword v0.1.3 // indirect
28-
github.com/Antonboom/errname v1.1.0 // indirect
29-
github.com/Antonboom/nilnil v1.1.0 // indirect
30-
github.com/Antonboom/testifylint v1.6.1 // indirect
3122
github.com/BurntSushi/toml v1.5.0 // indirect
32-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
33-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
34-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
35-
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
36-
github.com/alecthomas/chroma/v2 v2.16.0 // indirect
37-
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
38-
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
39-
github.com/alexkohler/prealloc v1.0.0 // indirect
40-
github.com/alingse/asasalint v0.0.11 // indirect
41-
github.com/alingse/nilnesserr v0.2.0 // indirect
42-
github.com/ashanbrown/forbidigo v1.6.0 // indirect
43-
github.com/ashanbrown/makezero v1.2.0 // indirect
44-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
45-
github.com/beorn7/perks v1.0.1 // indirect
4623
github.com/bitfield/gotestdox v0.2.2 // indirect
47-
github.com/bkielbasa/cyclop v1.2.3 // indirect
48-
github.com/blizzy78/varnamelen v0.8.0 // indirect
49-
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
50-
github.com/breml/bidichk v0.3.3 // indirect
51-
github.com/breml/errchkjson v0.4.1 // indirect
52-
github.com/butuzov/ireturn v0.4.0 // indirect
53-
github.com/butuzov/mirror v1.3.0 // indirect
54-
github.com/catenacyber/perfsprint v0.9.1 // indirect
55-
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
56-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57-
github.com/charithe/durationcheck v0.0.10 // indirect
58-
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
59-
github.com/charmbracelet/lipgloss v1.1.0 // indirect
60-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
61-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
62-
github.com/charmbracelet/x/term v0.2.1 // indirect
63-
github.com/chavacava/garif v0.1.0 // indirect
6424
github.com/chigopher/pathlib v0.19.1 // indirect
65-
github.com/ckaznocha/intrange v0.3.1 // indirect
66-
github.com/curioswitch/go-reassign v0.3.0 // indirect
67-
github.com/daixiang0/gci v0.13.6 // indirect
68-
github.com/dave/dst v0.27.3 // indirect
69-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
70-
github.com/denis-tingaikin/go-header v0.5.0 // indirect
71-
github.com/dlclark/regexp2 v1.11.5 // indirect
7225
github.com/dnephin/pflag v1.0.7 // indirect
73-
github.com/ettle/strcase v0.2.0 // indirect
7426
github.com/fatih/color v1.18.0 // indirect
75-
github.com/fatih/structtag v1.2.0 // indirect
76-
github.com/firefart/nonamedreturns v1.0.6 // indirect
7727
github.com/fsnotify/fsnotify v1.8.0 // indirect
78-
github.com/fzipp/gocyclo v0.6.0 // indirect
79-
github.com/ghostiam/protogetter v0.3.15 // indirect
80-
github.com/go-critic/go-critic v0.13.0 // indirect
81-
github.com/go-toolsmith/astcast v1.1.0 // indirect
82-
github.com/go-toolsmith/astcopy v1.1.0 // indirect
83-
github.com/go-toolsmith/astequal v1.2.0 // indirect
84-
github.com/go-toolsmith/astfmt v1.1.0 // indirect
85-
github.com/go-toolsmith/astp v1.1.0 // indirect
86-
github.com/go-toolsmith/strparse v1.1.0 // indirect
87-
github.com/go-toolsmith/typep v1.1.0 // indirect
8828
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
89-
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
90-
github.com/gobwas/glob v0.2.3 // indirect
91-
github.com/gofrs/flock v0.12.1 // indirect
9229
github.com/golang/glog v1.2.2 // indirect
93-
github.com/golang/protobuf v1.5.3 // indirect
94-
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
95-
github.com/golangci/go-printf-func-name v0.1.0 // indirect
96-
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
97-
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
98-
github.com/golangci/plugin-module-register v0.1.1 // indirect
99-
github.com/golangci/revgrep v0.8.0 // indirect
100-
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
10130
github.com/google/go-cmp v0.7.0 // indirect
10231
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
103-
github.com/gordonklaus/ineffassign v0.1.0 // indirect
104-
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
105-
github.com/gostaticanalysis/comment v1.5.0 // indirect
106-
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
107-
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
108-
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
109-
github.com/hashicorp/go-version v1.7.0 // indirect
110-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
111-
github.com/hexops/gotextdiff v1.0.3 // indirect
11232
github.com/huandu/xstrings v1.4.0 // indirect
11333
github.com/iancoleman/strcase v0.3.0 // indirect
11434
github.com/inconshreveable/mousetrap v1.1.0 // indirect
115-
github.com/jgautheron/goconst v1.8.1 // indirect
116-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
11735
github.com/jinzhu/copier v0.4.0 // indirect
118-
github.com/jjti/go-spancheck v0.6.4 // indirect
119-
github.com/julz/importas v0.2.0 // indirect
120-
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
121-
github.com/kisielk/errcheck v1.9.0 // indirect
122-
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
123-
github.com/kulti/thelper v0.6.3 // indirect
124-
github.com/kunwardeep/paralleltest v1.0.14 // indirect
125-
github.com/lasiar/canonicalheader v1.1.2 // indirect
126-
github.com/ldez/exptostd v0.4.3 // indirect
127-
github.com/ldez/gomoddirectives v0.6.1 // indirect
128-
github.com/ldez/grignotin v0.9.0 // indirect
129-
github.com/ldez/tagliatelle v0.7.1 // indirect
130-
github.com/ldez/usetesting v0.4.3 // indirect
131-
github.com/leonklingele/grouper v1.1.2 // indirect
132-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
133-
github.com/macabu/inamedparam v0.2.0 // indirect
134-
github.com/manuelarte/funcorder v0.2.1 // indirect
135-
github.com/maratori/testableexamples v1.0.0 // indirect
136-
github.com/maratori/testpackage v1.1.1 // indirect
137-
github.com/matoous/godox v1.1.0 // indirect
13836
github.com/mattn/go-colorable v0.1.14 // indirect
13937
github.com/mattn/go-isatty v0.0.20 // indirect
140-
github.com/mattn/go-runewidth v0.0.16 // indirect
141-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
142-
github.com/mgechev/revive v1.9.0 // indirect
14338
github.com/mitchellh/go-homedir v1.1.0 // indirect
14439
github.com/mitchellh/mapstructure v1.5.0 // indirect
145-
github.com/moricho/tparallel v0.3.2 // indirect
146-
github.com/muesli/termenv v0.16.0 // indirect
147-
github.com/nakabonne/nestif v0.3.1 // indirect
148-
github.com/nishanths/exhaustive v0.12.0 // indirect
149-
github.com/nishanths/predeclared v0.2.2 // indirect
150-
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
151-
github.com/olekukonko/tablewriter v0.0.5 // indirect
15240
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
153-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
154-
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
155-
github.com/prometheus/client_golang v1.12.1 // indirect
156-
github.com/prometheus/client_model v0.2.0 // indirect
157-
github.com/prometheus/common v0.32.1 // indirect
158-
github.com/prometheus/procfs v0.7.3 // indirect
159-
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
160-
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
161-
github.com/quasilyte/gogrep v0.5.0 // indirect
162-
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
163-
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
164-
github.com/raeperd/recvcheck v0.2.0 // indirect
165-
github.com/rivo/uniseg v0.4.7 // indirect
16641
github.com/rogpeppe/go-internal v1.14.1 // indirect
16742
github.com/rs/zerolog v1.33.0 // indirect
168-
github.com/ryancurrah/gomodguard v1.4.1 // indirect
169-
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
17043
github.com/sagikazarmark/locafero v0.7.0 // indirect
171-
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
172-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
173-
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
174-
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
175-
github.com/securego/gosec/v2 v2.22.3 // indirect
176-
github.com/sirupsen/logrus v1.9.3 // indirect
177-
github.com/sivchari/containedctx v1.0.3 // indirect
178-
github.com/sonatard/noctx v0.1.0 // indirect
17944
github.com/sourcegraph/conc v0.3.0 // indirect
180-
github.com/sourcegraph/go-diff v0.7.0 // indirect
18145
github.com/spf13/afero v1.14.0 // indirect
18246
github.com/spf13/cast v1.7.1 // indirect
18347
github.com/spf13/cobra v1.9.1 // indirect
18448
github.com/spf13/pflag v1.0.6 // indirect
18549
github.com/spf13/viper v1.20.0 // indirect
186-
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
187-
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
188-
github.com/stretchr/objx v0.5.2 // indirect
189-
github.com/stretchr/testify v1.10.0 // indirect
19050
github.com/subosito/gotenv v1.6.0 // indirect
191-
github.com/tdakkota/asciicheck v0.4.1 // indirect
192-
github.com/tetafro/godot v1.5.0 // indirect
193-
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
194-
github.com/timonwong/loggercheck v0.11.0 // indirect
195-
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
196-
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
197-
github.com/ultraware/funlen v0.2.0 // indirect
198-
github.com/ultraware/whitespace v0.2.0 // indirect
199-
github.com/uudashr/gocognit v1.2.0 // indirect
200-
github.com/uudashr/iface v1.3.1 // indirect
201-
github.com/xen0n/gosmopolitan v1.3.0 // indirect
202-
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
203-
github.com/yagipy/maintidx v1.0.0 // indirect
204-
github.com/yeya24/promlinter v0.3.0 // indirect
205-
github.com/ykadowak/zerologlint v0.1.5 // indirect
206-
gitlab.com/bosi/decorder v0.4.2 // indirect
207-
go-simpler.org/musttag v0.13.0 // indirect
208-
go-simpler.org/sloglint v0.11.0 // indirect
209-
go.augendre.info/fatcontext v0.8.0 // indirect
210-
go.uber.org/atomic v1.9.0 // indirect
21151
go.uber.org/multierr v1.11.0 // indirect
212-
go.uber.org/zap v1.24.0 // indirect
213-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
21452
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
21553
golang.org/x/sync v0.13.0 // indirect
21654
golang.org/x/sys v0.32.0 // indirect
21755
golang.org/x/term v0.29.0 // indirect
21856
golang.org/x/text v0.24.0 // indirect
219-
google.golang.org/protobuf v1.36.6 // indirect
57+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
22058
gopkg.in/yaml.v2 v2.4.0 // indirect
22159
gopkg.in/yaml.v3 v3.0.1 // indirect
222-
mvdan.cc/gofumpt v0.8.0 // indirect
223-
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
22460
)

0 commit comments

Comments
 (0)