Skip to content

Commit 88b6b38

Browse files
committedJun 20, 2024·
use tools.go
1 parent eb474ae commit 88b6b38

File tree

4 files changed

+641
-8
lines changed

4 files changed

+641
-8
lines changed
 

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ $(PREFIX)bin/$(BINNAME): download $(call rwildcard,*.go)
7575
#########################################
7676

7777
test:
78-
$Q $(CGO_OVERRIDE) $(GOFLAGS) go run gotest.tools/gotestsum@latest -- -coverprofile=coverage.out -short -covermode=atomic ./...
78+
$Q $(CGO_OVERRIDE) $(GOFLAGS) go run gotest.tools/gotestsum -- -coverprofile=coverage.out -short -covermode=atomic ./...
7979

8080
race:
81-
$Q $(CGO_OVERRIDE) $(GOFLAGS) go run gotest.tools/gotestsum@latest -- -race ./...
81+
$Q $(CGO_OVERRIDE) $(GOFLAGS) go run gotest.tools/gotestsum -- -race ./...
8282

8383
.PHONY: test race
8484

8585
integrate: integration
8686

8787
integration: bin/$(BINNAME)
88-
$Q $(CGO_OVERRIDE) go run gotest.tools/gotestsum@latest -- -tags=integration ./integration/...
88+
$Q $(CGO_OVERRIDE) go run gotest.tools/gotestsum -- -tags=integration ./integration/...
8989

9090
.PHONY: integrate integration
9191

@@ -100,7 +100,7 @@ lint: golint govulncheck
100100

101101
golint: SHELL:=/bin/bash
102102
golint:
103-
$Q LOG_LEVEL=error go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --timeout=30m
103+
$Q LOG_LEVEL=error go run github.com/golangci/golangci-lint/cmd/golangci-lint run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --timeout=30m
104104

105105
govulncheck:
106106
$Q go run golang.org/x/vuln/cmd/govulncheck@latest ./...

‎go.mod

+163-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944
88
github.com/fxamacker/cbor/v2 v2.6.0
99
github.com/go-jose/go-jose/v3 v3.0.3
10+
github.com/golangci/golangci-lint v1.59.1
1011
github.com/google/go-cmp v0.6.0
1112
github.com/google/go-tpm v0.9.0
1213
github.com/google/uuid v1.6.0
@@ -31,11 +32,15 @@ require (
3132
golang.org/x/crypto v0.24.0
3233
golang.org/x/sys v0.21.0
3334
golang.org/x/term v0.21.0
35+
golang.org/x/tools v0.22.0
3436
google.golang.org/protobuf v1.34.2
37+
gotest.tools/gotestsum v1.12.0
3538
software.sslmate.com/src/go-pkcs12 v0.4.0
3639
)
3740

3841
require (
42+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
43+
4d63.com/gochecknoglobals v0.2.1 // indirect
3944
cloud.google.com/go v0.114.0 // indirect
4045
cloud.google.com/go/auth v0.5.1 // indirect
4146
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
@@ -44,53 +49,122 @@ require (
4449
cloud.google.com/go/longrunning v0.5.7 // indirect
4550
cloud.google.com/go/security v1.17.0 // indirect
4651
filippo.io/edwards25519 v1.1.0 // indirect
52+
github.com/4meepo/tagalign v1.3.4 // indirect
53+
github.com/Abirdcfly/dupword v0.0.14 // indirect
4754
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
55+
github.com/Antonboom/errname v0.1.13 // indirect
56+
github.com/Antonboom/nilnil v0.1.9 // indirect
57+
github.com/Antonboom/testifylint v1.3.1 // indirect
4858
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
4959
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
5060
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
5161
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
5262
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
5363
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
64+
github.com/BurntSushi/toml v1.4.0 // indirect
65+
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
66+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
67+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
5468
github.com/Masterminds/goutils v1.1.1 // indirect
55-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
69+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
5670
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
71+
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
72+
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
73+
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
74+
github.com/alexkohler/prealloc v1.0.0 // indirect
75+
github.com/alingse/asasalint v0.0.11 // indirect
5776
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
77+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
78+
github.com/ashanbrown/makezero v1.1.1 // indirect
5879
github.com/beorn7/perks v1.0.1 // indirect
80+
github.com/bitfield/gotestdox v0.2.2 // indirect
81+
github.com/bkielbasa/cyclop v1.2.1 // indirect
82+
github.com/blizzy78/varnamelen v0.8.0 // indirect
83+
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
5984
github.com/boombuler/barcode v1.0.1 // indirect
85+
github.com/breml/bidichk v0.2.7 // indirect
86+
github.com/breml/errchkjson v0.3.6 // indirect
87+
github.com/butuzov/ireturn v0.3.0 // indirect
88+
github.com/butuzov/mirror v1.2.0 // indirect
89+
github.com/catenacyber/perfsprint v0.7.1 // indirect
90+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
6091
github.com/cespare/xxhash v1.1.0 // indirect
6192
github.com/cespare/xxhash/v2 v2.2.0 // indirect
93+
github.com/charithe/durationcheck v0.0.10 // indirect
94+
github.com/chavacava/garif v0.1.0 // indirect
6295
github.com/chzyer/readline v1.5.1 // indirect
96+
github.com/ckaznocha/intrange v0.1.2 // indirect
6397
github.com/corpix/uarand v0.2.0 // indirect
6498
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
6599
github.com/creack/pty v1.1.18 // indirect
100+
github.com/curioswitch/go-reassign v0.2.0 // indirect
101+
github.com/daixiang0/gci v0.13.4 // indirect
66102
github.com/davecgh/go-spew v1.1.1 // indirect
103+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
67104
github.com/dgraph-io/badger v1.6.2 // indirect
68105
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
69106
github.com/dgraph-io/ristretto v0.1.1 // indirect
70107
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
108+
github.com/dnephin/pflag v1.0.7 // indirect
71109
github.com/dustin/go-humanize v1.0.1 // indirect
110+
github.com/ettle/strcase v0.2.0 // indirect
111+
github.com/fatih/color v1.17.0 // indirect
112+
github.com/fatih/structtag v1.2.0 // indirect
72113
github.com/felixge/httpsnoop v1.0.4 // indirect
114+
github.com/firefart/nonamedreturns v1.0.5 // indirect
115+
github.com/fsnotify/fsnotify v1.7.0 // indirect
116+
github.com/fzipp/gocyclo v0.6.0 // indirect
117+
github.com/ghostiam/protogetter v0.3.6 // indirect
73118
github.com/go-chi/chi/v5 v5.0.12 // indirect
119+
github.com/go-critic/go-critic v0.11.4 // indirect
74120
github.com/go-kit/kit v0.13.0 // indirect
75121
github.com/go-kit/log v0.2.1 // indirect
76122
github.com/go-logfmt/logfmt v0.6.0 // indirect
77123
github.com/go-logr/logr v1.4.1 // indirect
78124
github.com/go-logr/stdr v1.2.2 // indirect
79125
github.com/go-sql-driver/mysql v1.7.1 // indirect
126+
github.com/go-toolsmith/astcast v1.1.0 // indirect
127+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
128+
github.com/go-toolsmith/astequal v1.2.0 // indirect
129+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
130+
github.com/go-toolsmith/astp v1.1.0 // indirect
131+
github.com/go-toolsmith/strparse v1.1.0 // indirect
132+
github.com/go-toolsmith/typep v1.1.0 // indirect
133+
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
134+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
135+
github.com/gobwas/glob v0.2.3 // indirect
136+
github.com/gofrs/flock v0.8.1 // indirect
80137
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
81138
github.com/golang/glog v1.2.0 // indirect
82139
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
83140
github.com/golang/protobuf v1.5.4 // indirect
84141
github.com/golang/snappy v0.0.4 // indirect
142+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
143+
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
144+
github.com/golangci/misspell v0.6.0 // indirect
145+
github.com/golangci/modinfo v0.3.4 // indirect
146+
github.com/golangci/plugin-module-register v0.1.1 // indirect
147+
github.com/golangci/revgrep v0.5.3 // indirect
148+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
85149
github.com/google/btree v1.1.2 // indirect
86150
github.com/google/certificate-transparency-go v1.1.7 // indirect
87151
github.com/google/go-tpm-tools v0.4.4 // indirect
88152
github.com/google/go-tspi v0.3.0 // indirect
89153
github.com/google/s2a-go v0.1.7 // indirect
154+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
90155
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
91156
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
157+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
158+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
159+
github.com/gostaticanalysis/comment v1.4.2 // indirect
160+
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
161+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
162+
github.com/hashicorp/go-version v1.7.0 // indirect
163+
github.com/hashicorp/hcl v1.0.0 // indirect
164+
github.com/hexops/gotextdiff v1.0.3 // indirect
92165
github.com/huandu/xstrings v1.4.0 // indirect
93166
github.com/imdario/mergo v0.3.13 // indirect
167+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
94168
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
95169
github.com/jackc/pgconn v1.14.3 // indirect
96170
github.com/jackc/pgio v1.0.0 // indirect
@@ -99,43 +173,126 @@ require (
99173
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
100174
github.com/jackc/pgtype v1.14.0 // indirect
101175
github.com/jackc/pgx/v4 v4.18.3 // indirect
176+
github.com/jgautheron/goconst v1.7.1 // indirect
177+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
178+
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
179+
github.com/jjti/go-spancheck v0.6.1 // indirect
180+
github.com/julz/importas v0.1.0 // indirect
181+
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
102182
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
183+
github.com/kisielk/errcheck v1.7.0 // indirect
184+
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
103185
github.com/klauspost/compress v1.16.3 // indirect
104186
github.com/kr/pty v1.1.8 // indirect
187+
github.com/kulti/thelper v0.6.3 // indirect
188+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
105189
github.com/kylelemons/godebug v1.1.0 // indirect
190+
github.com/kyoh86/exportloopref v0.1.11 // indirect
191+
github.com/lasiar/canonicalheader v1.1.1 // indirect
192+
github.com/ldez/gomoddirectives v0.2.4 // indirect
193+
github.com/ldez/tagliatelle v0.5.0 // indirect
194+
github.com/leonklingele/grouper v1.1.2 // indirect
195+
github.com/lufeee/execinquery v1.2.1 // indirect
196+
github.com/macabu/inamedparam v0.1.3 // indirect
197+
github.com/magiconair/properties v1.8.6 // indirect
198+
github.com/maratori/testableexamples v1.0.0 // indirect
199+
github.com/maratori/testpackage v1.1.1 // indirect
200+
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
106201
github.com/mattn/go-colorable v0.1.13 // indirect
107202
github.com/mattn/go-isatty v0.0.20 // indirect
203+
github.com/mattn/go-runewidth v0.0.13 // indirect
204+
github.com/mgechev/revive v1.3.7 // indirect
108205
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
109206
github.com/mitchellh/copystructure v1.2.0 // indirect
207+
github.com/mitchellh/go-homedir v1.1.0 // indirect
208+
github.com/mitchellh/mapstructure v1.5.0 // indirect
110209
github.com/mitchellh/reflectwalk v1.0.2 // indirect
210+
github.com/moricho/tparallel v0.3.1 // indirect
211+
github.com/nakabonne/nestif v0.3.1 // indirect
111212
github.com/newrelic/go-agent/v3 v3.33.0 // indirect
213+
github.com/nishanths/exhaustive v0.12.0 // indirect
214+
github.com/nishanths/predeclared v0.2.2 // indirect
215+
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
216+
github.com/olekukonko/tablewriter v0.0.5 // indirect
217+
github.com/pelletier/go-toml v1.9.5 // indirect
218+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
112219
github.com/peterbourgon/diskv/v3 v3.0.1 // indirect
113220
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
114221
github.com/pmezard/go-difflib v1.0.0 // indirect
222+
github.com/polyfloyd/go-errorlint v1.5.2 // indirect
115223
github.com/prometheus/client_golang v1.19.1 // indirect
116224
github.com/prometheus/client_model v0.5.0 // indirect
117225
github.com/prometheus/common v0.48.0 // indirect
118226
github.com/prometheus/procfs v0.12.0 // indirect
227+
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
228+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
229+
github.com/quasilyte/gogrep v0.5.0 // indirect
230+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
231+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
232+
github.com/rivo/uniseg v0.4.4 // indirect
119233
github.com/rs/xid v1.5.0 // indirect
120234
github.com/russross/blackfriday/v2 v2.1.0 // indirect
235+
github.com/ryancurrah/gomodguard v1.3.2 // indirect
236+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
237+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
238+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
239+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
240+
github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect
121241
github.com/schollz/jsonstore v1.1.0 // indirect
242+
github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
243+
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
122244
github.com/shopspring/decimal v1.3.1 // indirect
123245
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
124246
github.com/sirupsen/logrus v1.9.3 // indirect
247+
github.com/sivchari/containedctx v1.0.3 // indirect
248+
github.com/sivchari/tenv v1.7.1 // indirect
125249
github.com/smallstep/nosql v0.6.1 // indirect
126250
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 // indirect
127251
github.com/smallstep/scep v0.0.0-20231024192529-aee96d7ad34d // indirect
252+
github.com/sonatard/noctx v0.0.2 // indirect
253+
github.com/sourcegraph/go-diff v0.7.0 // indirect
254+
github.com/spf13/afero v1.11.0 // indirect
128255
github.com/spf13/cast v1.5.0 // indirect
256+
github.com/spf13/cobra v1.7.0 // indirect
257+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
258+
github.com/spf13/pflag v1.0.5 // indirect
259+
github.com/spf13/viper v1.12.0 // indirect
260+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
261+
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
262+
github.com/stretchr/objx v0.5.2 // indirect
263+
github.com/subosito/gotenv v1.4.1 // indirect
264+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
265+
github.com/tdakkota/asciicheck v0.2.0 // indirect
266+
github.com/tetafro/godot v1.4.16 // indirect
267+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
268+
github.com/timonwong/loggercheck v0.9.4 // indirect
269+
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
270+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
271+
github.com/ultraware/funlen v0.1.0 // indirect
272+
github.com/ultraware/whitespace v0.1.1 // indirect
273+
github.com/uudashr/gocognit v1.1.2 // indirect
129274
github.com/weppos/publicsuffix-go v0.20.0 // indirect
130275
github.com/x448/float16 v0.8.4 // indirect
276+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
277+
github.com/yagipy/maintidx v1.0.0 // indirect
278+
github.com/yeya24/promlinter v0.3.0 // indirect
279+
github.com/ykadowak/zerologlint v0.1.5 // indirect
280+
gitlab.com/bosi/decorder v0.4.2 // indirect
281+
go-simpler.org/musttag v0.12.2 // indirect
282+
go-simpler.org/sloglint v0.7.1 // indirect
131283
go.etcd.io/bbolt v1.3.9 // indirect
132284
go.opencensus.io v0.24.0 // indirect
133285
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
134286
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
135287
go.opentelemetry.io/otel v1.24.0 // indirect
136288
go.opentelemetry.io/otel/metric v1.24.0 // indirect
137289
go.opentelemetry.io/otel/trace v1.24.0 // indirect
290+
go.uber.org/automaxprocs v1.5.3 // indirect
291+
go.uber.org/multierr v1.11.0 // indirect
292+
go.uber.org/zap v1.26.0 // indirect
138293
golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
294+
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
295+
golang.org/x/mod v0.18.0 // indirect
139296
golang.org/x/net v0.26.0 // indirect
140297
golang.org/x/oauth2 v0.21.0 // indirect
141298
golang.org/x/sync v0.7.0 // indirect
@@ -146,7 +303,12 @@ require (
146303
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
147304
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
148305
google.golang.org/grpc v1.64.0 // indirect
306+
gopkg.in/ini.v1 v1.67.0 // indirect
307+
gopkg.in/yaml.v2 v2.4.0 // indirect
149308
gopkg.in/yaml.v3 v3.0.1 // indirect
309+
honnef.co/go/tools v0.4.7 // indirect
150310
howett.net/plist v1.0.0 // indirect
151311
k8s.io/klog/v2 v2.100.1 // indirect
312+
mvdan.cc/gofumpt v0.6.0 // indirect
313+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
152314
)

‎go.sum

+465-3
Large diffs are not rendered by default.

‎tools.go

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//go:build tools
2+
3+
package cli
4+
5+
import (
6+
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
7+
_ "golang.org/x/tools/cmd/goimports"
8+
_ "gotest.tools/gotestsum"
9+
)

0 commit comments

Comments
 (0)
Please sign in to comment.