Skip to content

Commit 65fe692

Browse files
spencerschrockAndré Backman
spencerschrock
authored and
André Backman
committed
🌱 Linter workflow cleanup (ossf#3247)
* Fix linter timeout by renaming deprecated deadline. Signed-off-by: Spencer Schrock <[email protected]> * Disable depguard linter. As of golangci-lint v3.5.0, the depguard linter is complaining. We don't use a .depguard.yml file, so just disabling the linter. Signed-off-by: Spencer Schrock <[email protected]> * Move linter into own workflow. Signed-off-by: Spencer Schrock <[email protected]> * Fix bash command substitution. Signed-off-by: Spencer Schrock <[email protected]> * Add harden runner. Signed-off-by: Spencer Schrock <[email protected]> * switch names to existing linter job Signed-off-by: Spencer Schrock <[email protected]> * Update golangci-lint to v1.53.3 Signed-off-by: Spencer Schrock <[email protected]> --------- Signed-off-by: Spencer Schrock <[email protected]> Signed-off-by: André Backman <[email protected]>
1 parent 6fc7a1c commit 65fe692

5 files changed

Lines changed: 120 additions & 98 deletions

File tree

‎.github/workflows/lint.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: golangci-lint
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
branches:
8+
- main
9+
10+
permissions:
11+
contents: read
12+
pull-requests: read # Use with `only-new-issues` option.
13+
14+
jobs:
15+
golangci:
16+
name: check-linter
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
20+
with:
21+
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
22+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
23+
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
24+
with:
25+
go-version-file: 'go.mod'
26+
cache: false # golangci-lint maintains its own cache
27+
- name: set golangci-lint version # keep in sync with tools/go.mod
28+
run: |
29+
echo "GOLANGCI_LINT_VERSION=$(cd tools; go list -m -f '{{ .Version }}' github.com/golangci/golangci-lint)" >> "$GITHUB_ENV"
30+
- name: golangci-lint
31+
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3.6.0
32+
with:
33+
version: ${{ env.GOLANGCI_LINT_VERSION }}
34+
only-new-issues: true

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -744,36 +744,6 @@ jobs:
744744
command: |
745745
go env -w GOFLAGS=-mod=mod
746746
make build-update-script
747-
check-linter:
748-
name: check-linter
749-
runs-on: ubuntu-latest
750-
permissions:
751-
contents: read
752-
steps:
753-
- name: Harden Runner
754-
uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v1
755-
with:
756-
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
757-
758-
- name: Install Protoc
759-
uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0
760-
with:
761-
version: ${{ env.PROTOC_VERSION }}
762-
repo-token: ${{ secrets.GITHUB_TOKEN }}
763-
- name: Clone the code
764-
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v2.3.4
765-
with:
766-
fetch-depth: 0
767-
- name: Setup Go
768-
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v2.2.0
769-
with:
770-
go-version: ${{ env.GO_VERSION }}
771-
check-latest: true
772-
cache: true
773-
- name: Run build
774-
run: |
775-
go env -w GOFLAGS=-mod=mod
776-
make check-linter
777747
validate-docs:
778748
name: validate-docs
779749
runs-on: ubuntu-latest

‎.golangci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
run:
33
concurrency: 6
4-
deadline: 5m
4+
timeout: 5m
55
issues:
66
# Maximum issues count per one linter.
77
# Set to 0 to disable.
@@ -24,7 +24,6 @@ linters:
2424
disable-all: true
2525
enable:
2626
- asciicheck
27-
- depguard
2827
- dogsled
2928
- errcheck
3029
- errorlint

‎tools/go.mod‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/golang/mock v1.6.0
7-
github.com/golangci/golangci-lint v1.52.2
7+
github.com/golangci/golangci-lint v1.53.3
88
github.com/google/addlicense v1.1.1
99
github.com/google/ko v0.14.1
1010
github.com/goreleaser/goreleaser v1.19.1
@@ -23,10 +23,11 @@ require (
2323
cloud.google.com/go/kms v1.12.0 // indirect
2424
cloud.google.com/go/storage v1.30.1 // indirect
2525
code.gitea.io/sdk/gitea v0.15.1 // indirect
26+
github.com/4meepo/tagalign v1.2.2 // indirect
2627
github.com/Abirdcfly/dupword v0.0.11 // indirect
2728
github.com/AlekSi/pointer v1.2.0 // indirect
28-
github.com/Antonboom/errname v0.1.9 // indirect
29-
github.com/Antonboom/nilnil v0.1.3 // indirect
29+
github.com/Antonboom/errname v0.1.10 // indirect
30+
github.com/Antonboom/nilnil v0.1.5 // indirect
3031
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
3132
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1 // indirect
3233
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
@@ -44,22 +45,23 @@ require (
4445
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4546
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
4647
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
47-
github.com/BurntSushi/toml v1.2.1 // indirect
48+
github.com/BurntSushi/toml v1.3.2 // indirect
4849
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
4950
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
5051
github.com/Masterminds/goutils v1.1.1 // indirect
5152
github.com/Masterminds/semver v1.5.0 // indirect
5253
github.com/Masterminds/semver/v3 v3.2.1 // indirect
5354
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
5455
github.com/Microsoft/go-winio v0.6.1 // indirect
55-
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
56+
github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect
5657
github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect
5758
github.com/acomagu/bufpipe v1.0.4 // indirect
5859
github.com/alessio/shellescape v1.4.1 // indirect
60+
github.com/alexkohler/nakedret/v2 v2.0.2 // indirect
5961
github.com/alexkohler/prealloc v1.0.0 // indirect
6062
github.com/alingse/asasalint v0.0.11 // indirect
6163
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
62-
github.com/ashanbrown/forbidigo v1.5.1 // indirect
64+
github.com/ashanbrown/forbidigo v1.5.3 // indirect
6365
github.com/ashanbrown/makezero v1.1.1 // indirect
6466
github.com/atc0005/go-teams-notify/v2 v2.7.1 // indirect
6567
github.com/aws/aws-sdk-go v1.44.284 // indirect
@@ -88,14 +90,15 @@ require (
8890
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220802171026-617dc7abb2ea // indirect
8991
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
9092
github.com/beorn7/perks v1.0.1 // indirect
91-
github.com/bkielbasa/cyclop v1.2.0 // indirect
93+
github.com/bkielbasa/cyclop v1.2.1 // indirect
9294
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
9395
github.com/blizzy78/varnamelen v0.8.0 // indirect
9496
github.com/bmatcuk/doublestar/v4 v4.2.0 // indirect
9597
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
9698
github.com/breml/bidichk v0.2.4 // indirect
9799
github.com/breml/errchkjson v0.3.1 // indirect
98-
github.com/butuzov/ireturn v0.1.1 // indirect
100+
github.com/butuzov/ireturn v0.2.0 // indirect
101+
github.com/butuzov/mirror v1.1.0 // indirect
99102
github.com/caarlos0/ctrlc v1.2.0 // indirect
100103
github.com/caarlos0/env/v9 v9.0.0 // indirect
101104
github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect
@@ -141,7 +144,7 @@ require (
141144
github.com/firefart/nonamedreturns v1.0.4 // indirect
142145
github.com/fsnotify/fsnotify v1.6.0 // indirect
143146
github.com/fzipp/gocyclo v0.6.0 // indirect
144-
github.com/go-critic/go-critic v0.7.0 // indirect
147+
github.com/go-critic/go-critic v0.8.1 // indirect
145148
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
146149
github.com/go-git/go-billy/v5 v5.4.1 // indirect
147150
github.com/go-git/go-git/v5 v5.7.0 // indirect
@@ -192,7 +195,7 @@ require (
192195
github.com/google/wire v0.5.0 // indirect
193196
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
194197
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
195-
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
198+
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
196199
github.com/goreleaser/chglog v0.5.0 // indirect
197200
github.com/goreleaser/fileglob v1.3.0 // indirect
198201
github.com/goreleaser/nfpm/v2 v2.31.0 // indirect
@@ -220,19 +223,18 @@ require (
220223
github.com/jmespath/go-jmespath v0.4.0 // indirect
221224
github.com/josharian/intern v1.0.0 // indirect
222225
github.com/julz/importas v0.1.0 // indirect
223-
github.com/junk1tm/musttag v0.5.0 // indirect
224226
github.com/kevinburke/ssh_config v1.2.0 // indirect
225227
github.com/kisielk/errcheck v1.6.3 // indirect
226228
github.com/kisielk/gotool v1.0.0 // indirect
227229
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
228230
github.com/klauspost/compress v1.16.6 // indirect
229231
github.com/klauspost/pgzip v1.2.6 // indirect
230232
github.com/kulti/thelper v0.6.3 // indirect
231-
github.com/kunwardeep/paralleltest v1.0.6 // indirect
233+
github.com/kunwardeep/paralleltest v1.0.7 // indirect
232234
github.com/kylelemons/godebug v1.1.0 // indirect
233235
github.com/kyoh86/exportloopref v0.1.11 // indirect
234236
github.com/ldez/gomoddirectives v0.2.3 // indirect
235-
github.com/ldez/tagliatelle v0.4.0 // indirect
237+
github.com/ldez/tagliatelle v0.5.0 // indirect
236238
github.com/leonklingele/grouper v1.1.1 // indirect
237239
github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
238240
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -248,7 +250,7 @@ require (
248250
github.com/mattn/go-runewidth v0.0.14 // indirect
249251
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
250252
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
251-
github.com/mgechev/revive v1.3.1 // indirect
253+
github.com/mgechev/revive v1.3.2 // indirect
252254
github.com/mitchellh/copystructure v1.2.0 // indirect
253255
github.com/mitchellh/go-homedir v1.1.0 // indirect
254256
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -262,9 +264,9 @@ require (
262264
github.com/muesli/termenv v0.15.2 // indirect
263265
github.com/nakabonne/nestif v0.3.1 // indirect
264266
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
265-
github.com/nishanths/exhaustive v0.9.5 // indirect
267+
github.com/nishanths/exhaustive v0.11.0 // indirect
266268
github.com/nishanths/predeclared v0.2.2 // indirect
267-
github.com/nunnatsa/ginkgolinter v0.9.0 // indirect
269+
github.com/nunnatsa/ginkgolinter v0.12.1 // indirect
268270
github.com/oklog/ulid v1.3.1 // indirect
269271
github.com/olekukonko/tablewriter v0.0.5 // indirect
270272
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -275,7 +277,7 @@ require (
275277
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
276278
github.com/pkg/errors v0.9.1 // indirect
277279
github.com/pmezard/go-difflib v1.0.0 // indirect
278-
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
280+
github.com/polyfloyd/go-errorlint v1.4.2 // indirect
279281
github.com/prometheus/client_golang v1.15.1 // indirect
280282
github.com/prometheus/client_model v0.4.0 // indirect
281283
github.com/prometheus/common v0.42.0 // indirect
@@ -292,15 +294,15 @@ require (
292294
github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect
293295
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
294296
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
295-
github.com/securego/gosec/v2 v2.15.0 // indirect
297+
github.com/securego/gosec/v2 v2.16.0 // indirect
296298
github.com/sergi/go-diff v1.2.0 // indirect
297299
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
298300
github.com/shopspring/decimal v1.2.0 // indirect
299301
github.com/sigstore/cosign/v2 v2.0.3-0.20230523133326-0544abd8fc8a // indirect
300302
github.com/sigstore/rekor v1.2.0 // indirect
301303
github.com/sigstore/sigstore v1.6.4 // indirect
302-
github.com/sirupsen/logrus v1.9.0 // indirect
303-
github.com/sivchari/containedctx v1.0.2 // indirect
304+
github.com/sirupsen/logrus v1.9.3 // indirect
305+
github.com/sivchari/containedctx v1.0.3 // indirect
304306
github.com/sivchari/nosnakecase v1.7.0 // indirect
305307
github.com/sivchari/tenv v1.7.1 // indirect
306308
github.com/skeema/knownhosts v1.1.1 // indirect
@@ -323,7 +325,7 @@ require (
323325
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
324326
github.com/tetafro/godot v1.4.11 // indirect
325327
github.com/theupdateframework/go-tuf v0.5.2 // indirect
326-
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
328+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
327329
github.com/timonwong/loggercheck v0.9.4 // indirect
328330
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
329331
github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect
@@ -337,19 +339,22 @@ require (
337339
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 // indirect
338340
github.com/xanzy/go-gitlab v0.86.0 // indirect
339341
github.com/xanzy/ssh-agent v0.3.3 // indirect
342+
github.com/xen0n/gosmopolitan v1.2.1 // indirect
340343
github.com/yagipy/maintidx v1.0.0 // indirect
341344
github.com/yeya24/promlinter v0.2.0 // indirect
345+
github.com/ykadowak/zerologlint v0.1.2 // indirect
342346
gitlab.com/bosi/decorder v0.2.3 // indirect
343347
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
344348
go.mongodb.org/mongo-driver v1.11.3 // indirect
345349
go.opencensus.io v0.24.0 // indirect
350+
go.tmz.dev/musttag v0.7.0 // indirect
346351
go.uber.org/atomic v1.11.0 // indirect
347352
go.uber.org/automaxprocs v1.5.2 // indirect
348353
go.uber.org/multierr v1.11.0 // indirect
349354
go.uber.org/zap v1.24.0 // indirect
350355
gocloud.dev v0.30.0 // indirect
351356
golang.org/x/crypto v0.10.0 // indirect
352-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
357+
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
353358
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
354359
golang.org/x/mod v0.11.0 // indirect
355360
golang.org/x/net v0.11.0 // indirect
@@ -379,7 +384,7 @@ require (
379384
k8s.io/apimachinery v0.27.3 // indirect
380385
k8s.io/klog/v2 v2.100.1 // indirect
381386
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
382-
mvdan.cc/gofumpt v0.4.0 // indirect
387+
mvdan.cc/gofumpt v0.5.0 // indirect
383388
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
384389
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
385390
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect

0 commit comments

Comments
 (0)