Skip to content

Commit 049be3e

Browse files
committed
linter: update dolangci-lint to v2
1 parent 666de67 commit 049be3e

File tree

4 files changed

+344
-305
lines changed

4 files changed

+344
-305
lines changed

tools/Dockerfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
FROM golang:1.24.6-bookworm
1+
FROM golang:1.24.6
22

3-
RUN apt-get update && apt-get install -y git
4-
ENV GOCACHE=/tmp/build/.cache
5-
ENV GOMODCACHE=/tmp/build/.modcache
6-
ENV GOFLAGS="-buildvcs=false"
3+
RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates \
4+
&& rm -rf /var/lib/apt/lists/*
5+
6+
ENV CGO_ENABLED=0 \
7+
GOCACHE=/tmp/build/.cache \
8+
GOMODCACHE=/tmp/build/.modcache \
9+
GOFLAGS="-buildvcs=false"
710

811
COPY . /tmp/tools
912

10-
RUN cd /tmp \
11-
&& mkdir -p /tmp/build/.cache \
12-
&& mkdir -p /tmp/build/.modcache \
13-
&& cd /tmp/tools \
14-
&& go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
15-
&& chmod -R 777 /tmp/build/
13+
RUN mkdir -p /tmp/build/.cache /tmp/build/.modcache \
14+
&& cd /tmp/tools \
15+
&& go install -trimpath github.com/golangci/golangci-lint/v2/cmd/golangci-lint \
16+
&& chmod -R 777 /tmp/build/
1617

17-
WORKDIR /build
18+
WORKDIR /build

tools/go.mod

Lines changed: 102 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -3,84 +3,98 @@ module github.com/lightninglabs/aperture/tools
33
go 1.24.6
44

55
require (
6-
github.com/golangci/golangci-lint v1.64.5
6+
github.com/golangci/golangci-lint/v2 v2.4.0
77
github.com/ory/go-acc v0.2.8
8-
github.com/rinchsan/gosimports v0.1.5
8+
github.com/rinchsan/gosimports v0.3.8
99
)
1010

1111
require (
12-
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
12+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
1313
4d63.com/gochecknoglobals v0.2.2 // indirect
14-
github.com/4meepo/tagalign v1.4.1 // indirect
15-
github.com/Abirdcfly/dupword v0.1.3 // indirect
16-
github.com/Antonboom/errname v1.0.0 // indirect
17-
github.com/Antonboom/nilnil v1.0.1 // indirect
18-
github.com/Antonboom/testifylint v1.5.2 // indirect
19-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
20-
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
14+
codeberg.org/chavacava/garif v0.2.0 // indirect
15+
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
16+
dev.gaijin.team/go/golib v0.6.0 // indirect
17+
github.com/4meepo/tagalign v1.4.3 // indirect
18+
github.com/Abirdcfly/dupword v0.1.6 // indirect
19+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
20+
github.com/Antonboom/errname v1.1.0 // indirect
21+
github.com/Antonboom/nilnil v1.1.0 // indirect
22+
github.com/Antonboom/testifylint v1.6.1 // indirect
23+
github.com/BurntSushi/toml v1.5.0 // indirect
2124
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
22-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
23-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
24-
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
25+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
26+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
27+
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
2528
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
26-
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
29+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
2730
github.com/alexkohler/prealloc v1.0.0 // indirect
31+
github.com/alfatraining/structtag v1.0.0 // indirect
2832
github.com/alingse/asasalint v0.0.11 // indirect
29-
github.com/alingse/nilnesserr v0.1.2 // indirect
30-
github.com/ashanbrown/forbidigo v1.6.0 // indirect
31-
github.com/ashanbrown/makezero v1.2.0 // indirect
33+
github.com/alingse/nilnesserr v0.2.0 // indirect
34+
github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
35+
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
36+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3237
github.com/beorn7/perks v1.0.1 // indirect
3338
github.com/bkielbasa/cyclop v1.2.3 // indirect
3439
github.com/blizzy78/varnamelen v0.8.0 // indirect
35-
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
36-
github.com/breml/bidichk v0.3.2 // indirect
37-
github.com/breml/errchkjson v0.4.0 // indirect
38-
github.com/butuzov/ireturn v0.3.1 // indirect
40+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
41+
github.com/bombsimon/wsl/v5 v5.1.1 // indirect
42+
github.com/breml/bidichk v0.3.3 // indirect
43+
github.com/breml/errchkjson v0.4.1 // indirect
44+
github.com/butuzov/ireturn v0.4.0 // indirect
3945
github.com/butuzov/mirror v1.3.0 // indirect
40-
github.com/catenacyber/perfsprint v0.8.1 // indirect
41-
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
46+
github.com/catenacyber/perfsprint v0.9.1 // indirect
47+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
4248
github.com/cespare/xxhash v1.1.0 // indirect
4349
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4450
github.com/charithe/durationcheck v0.0.10 // indirect
45-
github.com/chavacava/garif v0.1.0 // indirect
46-
github.com/ckaznocha/intrange v0.3.0 // indirect
51+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
52+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
53+
github.com/charmbracelet/x/ansi v0.8.0 // indirect
54+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
55+
github.com/charmbracelet/x/term v0.2.1 // indirect
56+
github.com/ckaznocha/intrange v0.3.1 // indirect
4757
github.com/curioswitch/go-reassign v0.3.0 // indirect
48-
github.com/daixiang0/gci v0.13.5 // indirect
58+
github.com/daixiang0/gci v0.13.7 // indirect
59+
github.com/dave/dst v0.27.3 // indirect
4960
github.com/davecgh/go-spew v1.1.1 // indirect
5061
github.com/denis-tingaikin/go-header v0.5.0 // indirect
5162
github.com/dgraph-io/ristretto v0.0.2 // indirect
63+
github.com/dlclark/regexp2 v1.11.5 // indirect
5264
github.com/ettle/strcase v0.2.0 // indirect
5365
github.com/fatih/color v1.18.0 // indirect
5466
github.com/fatih/structtag v1.2.0 // indirect
55-
github.com/firefart/nonamedreturns v1.0.5 // indirect
67+
github.com/firefart/nonamedreturns v1.0.6 // indirect
5668
github.com/fsnotify/fsnotify v1.5.4 // indirect
5769
github.com/fzipp/gocyclo v0.6.0 // indirect
58-
github.com/ghostiam/protogetter v0.3.9 // indirect
59-
github.com/go-critic/go-critic v0.12.0 // indirect
70+
github.com/ghostiam/protogetter v0.3.15 // indirect
71+
github.com/go-critic/go-critic v0.13.0 // indirect
6072
github.com/go-toolsmith/astcast v1.1.0 // indirect
6173
github.com/go-toolsmith/astcopy v1.1.0 // indirect
6274
github.com/go-toolsmith/astequal v1.2.0 // indirect
6375
github.com/go-toolsmith/astfmt v1.1.0 // indirect
6476
github.com/go-toolsmith/astp v1.1.0 // indirect
6577
github.com/go-toolsmith/strparse v1.1.0 // indirect
6678
github.com/go-toolsmith/typep v1.1.0 // indirect
67-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
79+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6880
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
6981
github.com/gobwas/glob v0.2.3 // indirect
7082
github.com/gofrs/flock v0.12.1 // indirect
7183
github.com/golang/protobuf v1.5.4 // indirect
72-
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
84+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
7385
github.com/golangci/go-printf-func-name v0.1.0 // indirect
7486
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
75-
github.com/golangci/misspell v0.6.0 // indirect
76-
github.com/golangci/plugin-module-register v0.1.1 // indirect
87+
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
88+
github.com/golangci/misspell v0.7.0 // indirect
89+
github.com/golangci/plugin-module-register v0.1.2 // indirect
7790
github.com/golangci/revgrep v0.8.0 // indirect
78-
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
79-
github.com/google/go-cmp v0.6.0 // indirect
91+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
92+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
93+
github.com/google/go-cmp v0.7.0 // indirect
8094
github.com/google/uuid v1.6.0 // indirect
8195
github.com/gordonklaus/ineffassign v0.1.0 // indirect
8296
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
83-
github.com/gostaticanalysis/comment v1.4.2 // indirect
97+
github.com/gostaticanalysis/comment v1.5.0 // indirect
8498
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
8599
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
86100
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
@@ -89,113 +103,117 @@ require (
89103
github.com/hashicorp/hcl v1.0.0 // indirect
90104
github.com/hexops/gotextdiff v1.0.3 // indirect
91105
github.com/inconshreveable/mousetrap v1.1.0 // indirect
92-
github.com/jgautheron/goconst v1.7.1 // indirect
106+
github.com/jgautheron/goconst v1.8.2 // indirect
93107
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
94-
github.com/jjti/go-spancheck v0.6.4 // indirect
108+
github.com/jjti/go-spancheck v0.6.5 // indirect
95109
github.com/julz/importas v0.2.0 // indirect
96110
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
97-
github.com/kisielk/errcheck v1.8.0 // indirect
98-
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
111+
github.com/kisielk/errcheck v1.9.0 // indirect
112+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
99113
github.com/kulti/thelper v0.6.3 // indirect
100-
github.com/kunwardeep/paralleltest v1.0.10 // indirect
114+
github.com/kunwardeep/paralleltest v1.0.14 // indirect
101115
github.com/lasiar/canonicalheader v1.1.2 // indirect
102-
github.com/ldez/exptostd v0.4.1 // indirect
103-
github.com/ldez/gomoddirectives v0.6.1 // indirect
104-
github.com/ldez/grignotin v0.9.0 // indirect
116+
github.com/ldez/exptostd v0.4.4 // indirect
117+
github.com/ldez/gomoddirectives v0.7.0 // indirect
118+
github.com/ldez/grignotin v0.10.0 // indirect
105119
github.com/ldez/tagliatelle v0.7.1 // indirect
106-
github.com/ldez/usetesting v0.4.2 // indirect
120+
github.com/ldez/usetesting v0.5.0 // indirect
107121
github.com/leonklingele/grouper v1.1.2 // indirect
108-
github.com/macabu/inamedparam v0.1.3 // indirect
122+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
123+
github.com/macabu/inamedparam v0.2.0 // indirect
109124
github.com/magiconair/properties v1.8.6 // indirect
125+
github.com/manuelarte/embeddedstructfieldcheck v0.3.0 // indirect
126+
github.com/manuelarte/funcorder v0.5.0 // indirect
110127
github.com/maratori/testableexamples v1.0.0 // indirect
111128
github.com/maratori/testpackage v1.1.1 // indirect
112129
github.com/matoous/godox v1.1.0 // indirect
113130
github.com/mattn/go-colorable v0.1.14 // indirect
114131
github.com/mattn/go-isatty v0.0.20 // indirect
115132
github.com/mattn/go-runewidth v0.0.16 // indirect
116133
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
117-
github.com/mgechev/revive v1.6.1 // indirect
134+
github.com/mgechev/revive v1.11.0 // indirect
118135
github.com/mitchellh/go-homedir v1.1.0 // indirect
119136
github.com/mitchellh/mapstructure v1.5.0 // indirect
120137
github.com/moricho/tparallel v0.3.2 // indirect
138+
github.com/muesli/termenv v0.16.0 // indirect
121139
github.com/nakabonne/nestif v0.3.1 // indirect
122140
github.com/nishanths/exhaustive v0.12.0 // indirect
123141
github.com/nishanths/predeclared v0.2.2 // indirect
124-
github.com/nunnatsa/ginkgolinter v0.19.0 // indirect
125-
github.com/olekukonko/tablewriter v0.0.5 // indirect
142+
github.com/nunnatsa/ginkgolinter v0.20.0 // indirect
126143
github.com/ory/viper v1.7.5 // indirect
127144
github.com/pborman/uuid v1.2.0 // indirect
128145
github.com/pelletier/go-toml v1.9.5 // indirect
129-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
146+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
130147
github.com/pmezard/go-difflib v1.0.0 // indirect
131-
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
148+
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
132149
github.com/prometheus/client_golang v1.12.1 // indirect
133150
github.com/prometheus/client_model v0.2.0 // indirect
134151
github.com/prometheus/common v0.32.1 // indirect
135152
github.com/prometheus/procfs v0.7.3 // indirect
136-
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
153+
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
137154
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
138155
github.com/quasilyte/gogrep v0.5.0 // indirect
139156
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
140157
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
141158
github.com/raeperd/recvcheck v0.2.0 // indirect
142159
github.com/rivo/uniseg v0.4.7 // indirect
143-
github.com/rogpeppe/go-internal v1.13.1 // indirect
144-
github.com/ryancurrah/gomodguard v1.3.5 // indirect
160+
github.com/rogpeppe/go-internal v1.14.1 // indirect
161+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
145162
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
146163
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
147-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
164+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
148165
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
149-
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
150-
github.com/securego/gosec/v2 v2.22.1 // indirect
166+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
167+
github.com/securego/gosec/v2 v2.22.7 // indirect
151168
github.com/sirupsen/logrus v1.9.3 // indirect
152169
github.com/sivchari/containedctx v1.0.3 // indirect
153-
github.com/sivchari/tenv v1.12.1 // indirect
154-
github.com/sonatard/noctx v0.1.0 // indirect
170+
github.com/sonatard/noctx v0.4.0 // indirect
155171
github.com/sourcegraph/go-diff v0.7.0 // indirect
156-
github.com/spf13/afero v1.12.0 // indirect
172+
github.com/spf13/afero v1.14.0 // indirect
157173
github.com/spf13/cast v1.5.0 // indirect
158-
github.com/spf13/cobra v1.8.1 // indirect
174+
github.com/spf13/cobra v1.9.1 // indirect
159175
github.com/spf13/jwalterweatherman v1.1.0 // indirect
160-
github.com/spf13/pflag v1.0.6 // indirect
176+
github.com/spf13/pflag v1.0.7 // indirect
161177
github.com/spf13/viper v1.12.0 // indirect
162178
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
163179
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
164180
github.com/stretchr/objx v0.5.2 // indirect
165181
github.com/stretchr/testify v1.10.0 // indirect
166182
github.com/subosito/gotenv v1.4.1 // indirect
167-
github.com/tdakkota/asciicheck v0.4.0 // indirect
168-
github.com/tetafro/godot v1.4.20 // indirect
169-
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
170-
github.com/timonwong/loggercheck v0.10.1 // indirect
171-
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
183+
github.com/tdakkota/asciicheck v0.4.1 // indirect
184+
github.com/tetafro/godot v1.5.1 // indirect
185+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
186+
github.com/timonwong/loggercheck v0.11.0 // indirect
187+
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
172188
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
173189
github.com/ultraware/funlen v0.2.0 // indirect
174190
github.com/ultraware/whitespace v0.2.0 // indirect
175191
github.com/uudashr/gocognit v1.2.0 // indirect
176-
github.com/uudashr/iface v1.3.1 // indirect
177-
github.com/xen0n/gosmopolitan v1.2.2 // indirect
192+
github.com/uudashr/iface v1.4.1 // indirect
193+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
194+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
178195
github.com/yagipy/maintidx v1.0.0 // indirect
179196
github.com/yeya24/promlinter v0.3.0 // indirect
180197
github.com/ykadowak/zerologlint v0.1.5 // indirect
181198
gitlab.com/bosi/decorder v0.4.2 // indirect
182-
go-simpler.org/musttag v0.13.0 // indirect
183-
go-simpler.org/sloglint v0.9.0 // indirect
184-
go.uber.org/atomic v1.7.0 // indirect
199+
go-simpler.org/musttag v0.13.1 // indirect
200+
go-simpler.org/sloglint v0.11.1 // indirect
201+
go.augendre.info/arangolint v0.2.0 // indirect
202+
go.augendre.info/fatcontext v0.8.0 // indirect
185203
go.uber.org/automaxprocs v1.6.0 // indirect
186-
go.uber.org/multierr v1.6.0 // indirect
187-
go.uber.org/zap v1.24.0 // indirect
188-
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
189-
golang.org/x/mod v0.23.0 // indirect
190-
golang.org/x/sync v0.11.0 // indirect
191-
golang.org/x/sys v0.30.0 // indirect
192-
golang.org/x/text v0.22.0 // indirect
193-
golang.org/x/tools v0.30.0 // indirect
194-
google.golang.org/protobuf v1.36.4 // indirect
204+
go.uber.org/multierr v1.10.0 // indirect
205+
go.uber.org/zap v1.27.0 // indirect
206+
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
207+
golang.org/x/mod v0.27.0 // indirect
208+
golang.org/x/sync v0.16.0 // indirect
209+
golang.org/x/sys v0.35.0 // indirect
210+
golang.org/x/text v0.27.0 // indirect
211+
golang.org/x/tools v0.36.0 // indirect
212+
google.golang.org/protobuf v1.36.6 // indirect
195213
gopkg.in/ini.v1 v1.67.0 // indirect
196214
gopkg.in/yaml.v2 v2.4.0 // indirect
197215
gopkg.in/yaml.v3 v3.0.1 // indirect
198-
honnef.co/go/tools v0.6.0 // indirect
199-
mvdan.cc/gofumpt v0.7.0 // indirect
200-
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
216+
honnef.co/go/tools v0.6.1 // indirect
217+
mvdan.cc/gofumpt v0.8.0 // indirect
218+
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
201219
)

0 commit comments

Comments
 (0)