Skip to content

Commit 94d1fe0

Browse files
nacxnacx
committed
chore: upgrade to buf v2 and use native go tools
Signed-off-by: Ignasi Barrera <ignasi@tetrate.io>
1 parent 456cbfd commit 94d1fe0

File tree

5 files changed

+335
-74
lines changed

5 files changed

+335
-74
lines changed

‎config/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
BUF ?= github.com/bufbuild/buf/cmd/buf@v1.51.0
16-
1715
PROTO_SOURCES := $(shell find . -name '*.proto')
1816

1917
.PHONY: build
2018
build: $(PROTO_SOURCES) ## Generate the Go code from the protobuf definitions
2119
@echo "Generating Go code from protobuf definitions"
22-
@go run $(BUF) build
23-
@go run $(BUF) generate
20+
@go tool buf build
21+
@go tool buf generate
2422
@go mod tidy
2523

2624
.PHONY: lint
2725
lint: ## Lint the protobuf definitions
2826
@echo "Linting protobuf definitions"
29-
@go run $(BUF) lint
27+
@go tool buf lint
3028

3129
.PHONY: clean
3230
clean: ## Clean all generated code

‎config/buf.gen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ plugins:
2929
out: gen/go
3030
opt: paths=source_relative
3131
# Use the latest version of the plugin.
32-
# We can't use the buf remote plugin to sue custom templates. See: https://github.com/pseudomuto/protoc-gen-doc/issues/513
32+
# We can't use the buf remote plugin to use custom templates. See: https://github.com/pseudomuto/protoc-gen-doc/issues/513
3333
- local: ["go", "run", "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@129dc82aa469aeba41aef893b68ebde5b2568bb3"]
3434
strategy: all
3535
out: .

‎config/buf.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@
1313
# limitations under the License.
1414

1515
version: v2
16-
name: buf.build/authservice/config
16+
17+
modules:
18+
- path: .
19+
name: buf.build/authservice/config
20+
1721
deps:
1822
- buf.build/envoyproxy/protoc-gen-validate
23+
1924
lint:
2025
use:
2126
- STANDARD
2227
except:
2328
- PACKAGE_DIRECTORY_MATCH
2429
- PACKAGE_VERSION_SUFFIX
25-
breaking:
26-
use:
27-
- FILE
30+
disallow_comment_ignores: true
31+

‎go.mod

Lines changed: 93 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ require (
1414
github.com/tetratelabs/log v0.2.3
1515
github.com/tetratelabs/run v0.3.0
1616
github.com/tetratelabs/telemetry v0.8.2
17-
golang.org/x/net v0.38.0
17+
golang.org/x/net v0.39.0
1818
golang.org/x/oauth2 v0.26.0
19-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b
20-
google.golang.org/grpc v1.70.0
21-
google.golang.org/protobuf v1.36.5
19+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e
20+
google.golang.org/grpc v1.71.0
21+
google.golang.org/protobuf v1.36.6
2222
gopkg.in/yaml.v3 v3.0.1
2323
k8s.io/api v0.32.2
2424
k8s.io/apimachinery v0.33.0-alpha.1
@@ -29,21 +29,33 @@ require (
2929
require (
3030
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
3131
4d63.com/gochecknoglobals v0.2.2 // indirect
32+
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.6-20250121211742-6d880cc6cc8d.1 // indirect
33+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250307204501-0409229c3780.1 // indirect
34+
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250408145534-f5ce355693bb.1 // indirect
35+
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250408145534-f5ce355693bb.1 // indirect
36+
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1 // indirect
37+
buf.build/go/bufplugin v0.8.0 // indirect
38+
buf.build/go/protoyaml v0.3.2 // indirect
39+
buf.build/go/spdx v0.2.0 // indirect
40+
cel.dev/expr v0.23.1 // indirect
3241
cloud.google.com/go/compute/metadata v0.6.0 // indirect
42+
connectrpc.com/connect v1.18.1 // indirect
43+
connectrpc.com/otelconnect v0.7.2 // indirect
3344
dario.cat/mergo v1.0.0 // indirect
3445
github.com/4meepo/tagalign v1.4.1 // indirect
3546
github.com/Abirdcfly/dupword v0.1.3 // indirect
3647
github.com/Antonboom/errname v1.0.0 // indirect
3748
github.com/Antonboom/nilnil v1.0.1 // indirect
3849
github.com/Antonboom/testifylint v1.5.2 // indirect
50+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3951
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
4052
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
4153
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
4254
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
4355
github.com/Masterminds/goutils v1.1.1 // indirect
4456
github.com/Masterminds/semver/v3 v3.3.0 // indirect
4557
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
46-
github.com/Microsoft/go-winio v0.6.1 // indirect
58+
github.com/Microsoft/go-winio v0.6.2 // indirect
4759
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
4860
github.com/ProtonMail/go-crypto v1.1.3 // indirect
4961
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
@@ -53,6 +65,7 @@ require (
5365
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
5466
github.com/alingse/asasalint v0.0.11 // indirect
5567
github.com/alingse/nilnesserr v0.1.2 // indirect
68+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
5669
github.com/apache/skywalking-eyes v0.7.0 // indirect
5770
github.com/ashanbrown/forbidigo v1.6.0 // indirect
5871
github.com/ashanbrown/makezero v1.2.0 // indirect
@@ -63,6 +76,10 @@ require (
6376
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
6477
github.com/breml/bidichk v0.3.2 // indirect
6578
github.com/breml/errchkjson v0.4.0 // indirect
79+
github.com/bufbuild/buf v1.53.0 // indirect
80+
github.com/bufbuild/protocompile v0.14.1 // indirect
81+
github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 // indirect
82+
github.com/bufbuild/protovalidate-go v0.9.3 // indirect
6683
github.com/butuzov/ireturn v0.3.1 // indirect
6784
github.com/butuzov/mirror v1.3.0 // indirect
6885
github.com/catenacyber/perfsprint v0.8.1 // indirect
@@ -73,33 +90,48 @@ require (
7390
github.com/ckaznocha/intrange v0.3.0 // indirect
7491
github.com/cloudflare/circl v1.3.7 // indirect
7592
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
93+
github.com/containerd/log v0.1.0 // indirect
94+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
95+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
7696
github.com/curioswitch/go-reassign v0.3.0 // indirect
7797
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
7898
github.com/daixiang0/gci v0.13.5 // indirect
7999
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
80100
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
81101
github.com/denis-tingaikin/go-header v0.5.0 // indirect
82102
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
103+
github.com/distribution/reference v0.6.0 // indirect
104+
github.com/docker/cli v28.1.1+incompatible // indirect
105+
github.com/docker/distribution v2.8.3+incompatible // indirect
106+
github.com/docker/docker v28.1.1+incompatible // indirect
107+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
108+
github.com/docker/go-connections v0.5.0 // indirect
109+
github.com/docker/go-units v0.5.0 // indirect
83110
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
84111
github.com/emirpasic/gods v1.18.1 // indirect
85112
github.com/ettle/strcase v0.2.0 // indirect
86113
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
87114
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
88115
github.com/fatih/color v1.18.0 // indirect
89116
github.com/fatih/structtag v1.2.0 // indirect
117+
github.com/felixge/fgprof v0.9.5 // indirect
118+
github.com/felixge/httpsnoop v1.0.4 // indirect
90119
github.com/firefart/nonamedreturns v1.0.5 // indirect
91120
github.com/fsnotify/fsnotify v1.8.0 // indirect
92121
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
93122
github.com/fzipp/gocyclo v0.6.0 // indirect
94123
github.com/ghostiam/protogetter v0.3.9 // indirect
124+
github.com/go-chi/chi/v5 v5.2.1 // indirect
95125
github.com/go-critic/go-critic v0.12.0 // indirect
96126
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
97127
github.com/go-git/go-billy/v5 v5.6.0 // indirect
98128
github.com/go-git/go-git/v5 v5.13.0 // indirect
129+
github.com/go-logr/stdr v1.2.2 // indirect
99130
github.com/go-logr/zapr v1.3.0 // indirect
100131
github.com/go-openapi/jsonpointer v0.21.0 // indirect
101132
github.com/go-openapi/jsonreference v0.21.0 // indirect
102133
github.com/go-openapi/swag v0.23.0 // indirect
134+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
103135
github.com/go-toolsmith/astcast v1.1.0 // indirect
104136
github.com/go-toolsmith/astcopy v1.1.0 // indirect
105137
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -124,12 +156,15 @@ require (
124156
github.com/golangci/revgrep v0.8.0 // indirect
125157
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
126158
github.com/google/btree v1.1.3 // indirect
159+
github.com/google/cel-go v0.24.1 // indirect
127160
github.com/google/gnostic-models v0.6.9 // indirect
128-
github.com/google/go-cmp v0.6.0 // indirect
161+
github.com/google/go-cmp v0.7.0 // indirect
162+
github.com/google/go-containerregistry v0.20.3 // indirect
129163
github.com/google/go-github/v33 v33.0.0 // indirect
130164
github.com/google/go-querystring v1.1.0 // indirect
131165
github.com/google/gofuzz v1.2.0 // indirect
132166
github.com/google/licensecheck v0.3.1 // indirect
167+
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587 // indirect
133168
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
134169
github.com/google/uuid v1.6.0 // indirect
135170
github.com/gordonklaus/ineffassign v0.1.0 // indirect
@@ -146,6 +181,7 @@ require (
146181
github.com/imdario/mergo v0.3.16 // indirect
147182
github.com/inconshreveable/mousetrap v1.1.0 // indirect
148183
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
184+
github.com/jdx/go-netrc v1.0.0 // indirect
149185
github.com/jgautheron/goconst v1.7.1 // indirect
150186
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
151187
github.com/jjti/go-spancheck v0.6.4 // indirect
@@ -156,7 +192,8 @@ require (
156192
github.com/kevinburke/ssh_config v1.2.0 // indirect
157193
github.com/kisielk/errcheck v1.8.0 // indirect
158194
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
159-
github.com/klauspost/compress v1.17.11 // indirect
195+
github.com/klauspost/compress v1.18.0 // indirect
196+
github.com/klauspost/pgzip v1.2.6 // indirect
160197
github.com/kulti/thelper v0.6.3 // indirect
161198
github.com/kunwardeep/paralleltest v1.0.10 // indirect
162199
github.com/lasiar/canonicalheader v1.1.2 // indirect
@@ -185,19 +222,37 @@ require (
185222
github.com/mitchellh/go-homedir v1.1.0 // indirect
186223
github.com/mitchellh/mapstructure v1.5.0 // indirect
187224
github.com/mitchellh/reflectwalk v1.0.2 // indirect
225+
github.com/moby/docker-image-spec v1.3.1 // indirect
226+
github.com/moby/go-archive v0.1.0 // indirect
227+
github.com/moby/locker v1.0.1 // indirect
228+
github.com/moby/patternmatcher v0.6.0 // indirect
229+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
230+
github.com/moby/sys/mount v0.3.4 // indirect
231+
github.com/moby/sys/mountinfo v0.7.2 // indirect
232+
github.com/moby/sys/reexec v0.1.0 // indirect
233+
github.com/moby/sys/sequential v0.6.0 // indirect
234+
github.com/moby/sys/user v0.4.0 // indirect
235+
github.com/moby/sys/userns v0.1.0 // indirect
236+
github.com/moby/term v0.5.2 // indirect
188237
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
189238
github.com/modern-go/reflect2 v1.0.2 // indirect
190239
github.com/moricho/tparallel v0.3.2 // indirect
240+
github.com/morikuni/aec v1.0.0 // indirect
191241
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
192242
github.com/nakabonne/nestif v0.3.1 // indirect
193243
github.com/nishanths/exhaustive v0.12.0 // indirect
194244
github.com/nishanths/predeclared v0.2.2 // indirect
195245
github.com/nunnatsa/ginkgolinter v0.19.0 // indirect
196246
github.com/olekukonko/tablewriter v0.0.5 // indirect
247+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
248+
github.com/opencontainers/go-digest v1.0.0 // indirect
249+
github.com/opencontainers/image-spec v1.1.1 // indirect
197250
github.com/pelletier/go-toml v1.9.5 // indirect
198251
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
199252
github.com/pjbgf/sha1cd v0.3.0 // indirect
253+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
200254
github.com/pkg/errors v0.9.1 // indirect
255+
github.com/pkg/profile v1.7.0 // indirect
201256
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
202257
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
203258
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
@@ -210,10 +265,14 @@ require (
210265
github.com/quasilyte/gogrep v0.5.0 // indirect
211266
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
212267
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
268+
github.com/quic-go/qpack v0.5.1 // indirect
269+
github.com/quic-go/quic-go v0.51.0 // indirect
213270
github.com/raeperd/recvcheck v0.2.0 // indirect
214271
github.com/rinchsan/gosimports v0.3.8 // indirect
215272
github.com/rivo/uniseg v0.4.7 // indirect
216273
github.com/rogpeppe/go-internal v1.13.1 // indirect
274+
github.com/rs/cors v1.11.1 // indirect
275+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
217276
github.com/ryancurrah/gomodguard v1.3.5 // indirect
218277
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
219278
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
@@ -222,6 +281,7 @@ require (
222281
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
223282
github.com/securego/gosec/v2 v2.22.1 // indirect
224283
github.com/segmentio/asm v1.2.0 // indirect
284+
github.com/segmentio/encoding v0.4.1 // indirect
225285
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
226286
github.com/shopspring/decimal v1.3.1 // indirect
227287
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -232,16 +292,18 @@ require (
232292
github.com/sourcegraph/go-diff v0.7.0 // indirect
233293
github.com/spf13/afero v1.12.0 // indirect
234294
github.com/spf13/cast v1.5.0 // indirect
235-
github.com/spf13/cobra v1.8.1 // indirect
295+
github.com/spf13/cobra v1.9.1 // indirect
236296
github.com/spf13/jwalterweatherman v1.1.0 // indirect
237297
github.com/spf13/pflag v1.0.6 // indirect
238298
github.com/spf13/viper v1.12.0 // indirect
239299
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
240300
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
301+
github.com/stoewer/go-strcase v1.3.0 // indirect
241302
github.com/stretchr/objx v0.5.2 // indirect
242303
github.com/subosito/gotenv v1.4.1 // indirect
243304
github.com/tdakkota/asciicheck v0.4.0 // indirect
244305
github.com/tetafro/godot v1.4.20 // indirect
306+
github.com/tetratelabs/wazero v1.9.0 // indirect
245307
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
246308
github.com/timonwong/loggercheck v0.10.1 // indirect
247309
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
@@ -250,6 +312,7 @@ require (
250312
github.com/ultraware/whitespace v0.2.0 // indirect
251313
github.com/uudashr/gocognit v1.2.0 // indirect
252314
github.com/uudashr/iface v1.3.1 // indirect
315+
github.com/vbatts/tar-split v0.12.1 // indirect
253316
github.com/x448/float16 v0.8.4 // indirect
254317
github.com/xanzy/ssh-agent v0.3.3 // indirect
255318
github.com/xen0n/gosmopolitan v1.2.2 // indirect
@@ -260,19 +323,32 @@ require (
260323
gitlab.com/bosi/decorder v0.4.2 // indirect
261324
go-simpler.org/musttag v0.13.0 // indirect
262325
go-simpler.org/sloglint v0.9.0 // indirect
326+
go.lsp.dev/jsonrpc2 v0.10.0 // indirect
327+
go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect
328+
go.lsp.dev/protocol v0.12.0 // indirect
329+
go.lsp.dev/uri v0.3.0 // indirect
330+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
331+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
332+
go.opentelemetry.io/otel v1.35.0 // indirect
333+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
334+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
263335
go.uber.org/automaxprocs v1.6.0 // indirect
336+
go.uber.org/mock v0.5.1 // indirect
264337
go.uber.org/multierr v1.11.0 // indirect
265338
go.uber.org/zap v1.27.0 // indirect
266-
golang.org/x/crypto v0.36.0 // indirect
339+
go.uber.org/zap/exp v0.3.0 // indirect
340+
golang.org/x/crypto v0.37.0 // indirect
341+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
267342
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
268-
golang.org/x/mod v0.23.0 // indirect
269-
golang.org/x/sync v0.12.0 // indirect
270-
golang.org/x/sys v0.31.0 // indirect
271-
golang.org/x/term v0.30.0 // indirect
272-
golang.org/x/text v0.23.0 // indirect
343+
golang.org/x/mod v0.24.0 // indirect
344+
golang.org/x/sync v0.13.0 // indirect
345+
golang.org/x/sys v0.32.0 // indirect
346+
golang.org/x/term v0.31.0 // indirect
347+
golang.org/x/text v0.24.0 // indirect
273348
golang.org/x/time v0.10.0 // indirect
274-
golang.org/x/tools v0.30.0 // indirect
349+
golang.org/x/tools v0.32.0 // indirect
275350
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
351+
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
276352
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
277353
gopkg.in/inf.v0 v0.9.1 // indirect
278354
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -285,6 +361,7 @@ require (
285361
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
286362
mvdan.cc/gofumpt v0.7.0 // indirect
287363
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
364+
pluginrpc.com/pluginrpc v0.5.0 // indirect
288365
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250214070421-b68a0623fb4e // indirect
289366
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
290367
sigs.k8s.io/kind v0.26.0 // indirect
@@ -294,6 +371,7 @@ require (
294371

295372
tool (
296373
github.com/apache/skywalking-eyes/cmd/license-eye
374+
github.com/bufbuild/buf/cmd/buf
297375
github.com/golangci/golangci-lint/cmd/golangci-lint
298376
github.com/rinchsan/gosimports/cmd/gosimports
299377
sigs.k8s.io/controller-runtime/tools/setup-envtest

0 commit comments

Comments
 (0)