Skip to content

Commit 4df0a3e

Browse files
authored
fix: [lint] address new linter warnings (#920)
* fix: [lint] address new linter warnings --------- Signed-off-by: Chris Randles <randles.chris@gmail.com>
1 parent 0fb4c7b commit 4df0a3e

File tree

6 files changed

+96
-96
lines changed

6 files changed

+96
-96
lines changed

.github/workflows/ci-build-tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
on:
32
push:
43
branches:
@@ -7,7 +6,7 @@ on:
76
- v1.1.x
87
tags:
98
- 'v[0-9]+\.[0-9]+\.[0-9]+'
10-
9+
1110
pull_request:
1211
branches:
1312
- main
@@ -31,9 +30,8 @@ jobs:
3130
- run: |
3231
make check-codegen
3332
- name: golangci-lint
34-
uses: golangci/golangci-lint-action@v8
33+
uses: golangci/golangci-lint-action@v9
3534
with:
36-
version: latest
3735
args: --timeout 5m
3836
only-new-issues: true
3937
docker:
@@ -68,7 +66,7 @@ jobs:
6866
- name: Set up Python
6967
uses: actions/setup-python@v5
7068
with:
71-
python-version: '3.x'
69+
python-version: "3.x"
7270
- name: Install python dependencies
7371
run: python -m pip install --upgrade pip setuptools wheel
7472
- name: installing codespell

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ linters:
5050
- G401 # MD5 & SHA1 adequate for non-cryptographic use cases
5151
- G501 # MD5 & SHA1, again
5252
- G505 # MD5 & SHA1, again
53+
- G704 # False positive: trickster is a proxy and must interact with configured backends, so it must be able to make requests to arbitrary URLs
54+
- G705 # XSS checks are not helpful for trickster's carefully constructed responses, this has many false positives at this time; revisit later
5355
revive:
5456
enable-all-rules: true
5557
rules:

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,11 @@ serve-info:
269269
serve-cli:
270270
@cd cmd/trickster && go run . -origin-url http://127.0.0.1:9090/ -provider prometheus
271271

272-
GOLANG_CI_LINT_VERSION ?= v2.7.2
272+
GOLANG_CI_LINT_VERSION ?= v2.10.1
273273
.PHONY: get-tools
274274
get-tools: get-msgpack
275275
@echo "Installing tools..."
276276
go get -tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANG_CI_LINT_VERSION)
277-
go get -tool honnef.co/go/tools/cmd/staticcheck@2025.1.1
278277

279278
.PHONY: get-msgpack
280279
get-msgpack:

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ require (
3636
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
3737
4d63.com/gochecknoglobals v0.2.2 // indirect
3838
codeberg.org/chavacava/garif v0.2.0 // indirect
39+
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
3940
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
4041
dev.gaijin.team/go/golib v0.6.0 // indirect
4142
github.com/4meepo/tagalign v1.4.3 // indirect
@@ -45,15 +46,15 @@ require (
4546
github.com/Antonboom/errname v1.1.1 // indirect
4647
github.com/Antonboom/nilnil v1.1.1 // indirect
4748
github.com/Antonboom/testifylint v1.6.4 // indirect
48-
github.com/BurntSushi/toml v1.5.0 // indirect
49+
github.com/BurntSushi/toml v1.6.0 // indirect
4950
github.com/Djarvur/go-err113 v0.1.1 // indirect
5051
github.com/Masterminds/semver/v3 v3.4.0 // indirect
51-
github.com/MirrexOne/unqueryvet v1.3.0 // indirect
52+
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
5253
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
53-
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
54+
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
5455
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
5556
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
56-
github.com/alexkohler/prealloc v1.0.0 // indirect
57+
github.com/alexkohler/prealloc v1.0.2 // indirect
5758
github.com/alfatraining/structtag v1.0.0 // indirect
5859
github.com/alingse/asasalint v0.0.11 // indirect
5960
github.com/alingse/nilnesserr v0.2.0 // indirect
@@ -65,7 +66,7 @@ require (
6566
github.com/bkielbasa/cyclop v1.2.3 // indirect
6667
github.com/blizzy78/varnamelen v0.8.0 // indirect
6768
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
68-
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
69+
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
6970
github.com/breml/bidichk v0.3.3 // indirect
7071
github.com/breml/errchkjson v0.4.1 // indirect
7172
github.com/butuzov/ireturn v0.4.0 // indirect
@@ -77,7 +78,7 @@ require (
7778
github.com/charithe/durationcheck v0.0.11 // indirect
7879
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
7980
github.com/charmbracelet/lipgloss v1.1.0 // indirect
80-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
81+
github.com/charmbracelet/x/ansi v0.10.1 // indirect
8182
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
8283
github.com/charmbracelet/x/term v0.2.1 // indirect
8384
github.com/ckaznocha/intrange v0.3.1 // indirect
@@ -95,8 +96,8 @@ require (
9596
github.com/firefart/nonamedreturns v1.0.6 // indirect
9697
github.com/fsnotify/fsnotify v1.5.4 // indirect
9798
github.com/fzipp/gocyclo v0.6.0 // indirect
98-
github.com/ghostiam/protogetter v0.3.17 // indirect
99-
github.com/go-critic/go-critic v0.14.2 // indirect
99+
github.com/ghostiam/protogetter v0.3.20 // indirect
100+
github.com/go-critic/go-critic v0.14.3 // indirect
100101
github.com/go-logr/logr v1.4.3 // indirect
101102
github.com/go-logr/stdr v1.2.2 // indirect
102103
github.com/go-toolsmith/astcast v1.1.0 // indirect
@@ -106,19 +107,19 @@ require (
106107
github.com/go-toolsmith/astp v1.1.0 // indirect
107108
github.com/go-toolsmith/strparse v1.1.0 // indirect
108109
github.com/go-toolsmith/typep v1.1.0 // indirect
109-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
110+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
110111
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
111112
github.com/gobwas/glob v0.2.3 // indirect
112-
github.com/godoc-lint/godoc-lint v0.10.2 // indirect
113+
github.com/godoc-lint/godoc-lint v0.11.2 // indirect
113114
github.com/gofrs/flock v0.13.0 // indirect
114115
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
115116
github.com/golangci/asciicheck v0.5.0 // indirect
116117
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
117118
github.com/golangci/go-printf-func-name v0.1.1 // indirect
118119
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
119-
github.com/golangci/golangci-lint/v2 v2.7.2 // indirect
120-
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
121-
github.com/golangci/misspell v0.7.0 // indirect
120+
github.com/golangci/golangci-lint/v2 v2.10.1 // indirect
121+
github.com/golangci/golines v0.15.0 // indirect
122+
github.com/golangci/misspell v0.8.0 // indirect
122123
github.com/golangci/plugin-module-register v0.1.2 // indirect
123124
github.com/golangci/revgrep v0.8.0 // indirect
124125
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
@@ -151,8 +152,9 @@ require (
151152
github.com/kunwardeep/paralleltest v1.0.15 // indirect
152153
github.com/lasiar/canonicalheader v1.1.2 // indirect
153154
github.com/ldez/exptostd v0.4.5 // indirect
154-
github.com/ldez/gomoddirectives v0.7.1 // indirect
155+
github.com/ldez/gomoddirectives v0.8.0 // indirect
155156
github.com/ldez/grignotin v0.10.1 // indirect
157+
github.com/ldez/structtags v0.6.1 // indirect
156158
github.com/ldez/tagliatelle v0.7.2 // indirect
157159
github.com/ldez/usetesting v0.5.0 // indirect
158160
github.com/leonklingele/grouper v1.1.2 // indirect
@@ -167,7 +169,7 @@ require (
167169
github.com/mattn/go-colorable v0.1.14 // indirect
168170
github.com/mattn/go-isatty v0.0.20 // indirect
169171
github.com/mattn/go-runewidth v0.0.16 // indirect
170-
github.com/mgechev/revive v1.13.0 // indirect
172+
github.com/mgechev/revive v1.14.0 // indirect
171173
github.com/mitchellh/go-homedir v1.1.0 // indirect
172174
github.com/mitchellh/mapstructure v1.5.0 // indirect
173175
github.com/moricho/tparallel v0.3.2 // indirect
@@ -177,12 +179,11 @@ require (
177179
github.com/nakabonne/nestif v0.3.1 // indirect
178180
github.com/nishanths/exhaustive v0.12.0 // indirect
179181
github.com/nishanths/predeclared v0.2.2 // indirect
180-
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
182+
github.com/nunnatsa/ginkgolinter v0.23.0 // indirect
181183
github.com/pelletier/go-toml v1.9.5 // indirect
182184
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
183185
github.com/philhofer/fwd v1.2.0 // indirect
184186
github.com/pmezard/go-difflib v1.0.0 // indirect
185-
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
186187
github.com/prometheus/common v0.67.5 // indirect
187188
github.com/prometheus/procfs v0.19.2 // indirect
188189
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
@@ -199,8 +200,8 @@ require (
199200
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
200201
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
201202
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
202-
github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 // indirect
203-
github.com/sirupsen/logrus v1.9.3 // indirect
203+
github.com/securego/gosec/v2 v2.23.0 // indirect
204+
github.com/sirupsen/logrus v1.9.4 // indirect
204205
github.com/sivchari/containedctx v1.0.3 // indirect
205206
github.com/sonatard/noctx v0.4.0 // indirect
206207
github.com/sourcegraph/go-diff v0.7.0 // indirect
@@ -232,31 +233,30 @@ require (
232233
gitlab.com/bosi/decorder v0.4.2 // indirect
233234
go-simpler.org/musttag v0.14.0 // indirect
234235
go-simpler.org/sloglint v0.11.1 // indirect
235-
go.augendre.info/arangolint v0.3.1 // indirect
236+
go.augendre.info/arangolint v0.4.0 // indirect
236237
go.augendre.info/fatcontext v0.9.0 // indirect
237238
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
238239
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
239240
go.opentelemetry.io/otel/metric v1.40.0 // indirect
240241
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
241242
go.uber.org/atomic v1.11.0 // indirect
242-
go.uber.org/automaxprocs v1.6.0 // indirect
243243
go.uber.org/multierr v1.10.0 // indirect
244244
go.uber.org/zap v1.27.0 // indirect
245245
go.yaml.in/yaml/v2 v2.4.3 // indirect
246246
go.yaml.in/yaml/v3 v3.0.4 // indirect
247-
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
248-
golang.org/x/mod v0.32.0 // indirect
247+
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
248+
golang.org/x/mod v0.33.0 // indirect
249249
golang.org/x/oauth2 v0.35.0 // indirect
250250
golang.org/x/sys v0.41.0 // indirect
251251
golang.org/x/text v0.34.0 // indirect
252-
golang.org/x/tools v0.41.0 // indirect
252+
golang.org/x/tools v0.42.0 // indirect
253253
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
254254
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
255255
google.golang.org/grpc v1.78.0 // indirect
256256
google.golang.org/protobuf v1.36.11 // indirect
257257
gopkg.in/ini.v1 v1.67.0 // indirect
258258
gopkg.in/yaml.v3 v3.0.1 // indirect
259-
honnef.co/go/tools v0.6.1 // indirect
259+
honnef.co/go/tools v0.7.0 // indirect
260260
mvdan.cc/gofumpt v0.9.2 // indirect
261261
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
262262
)

0 commit comments

Comments
 (0)