Skip to content

Commit bca70d2

Browse files
dependabot[bot]fasmat
dependabot[bot]
and
fasmat
authored
Bump google.golang.org/protobuf from 1.36.5 to 1.36.6 (#579)
* Bump google.golang.org/protobuf from 1.36.5 to 1.36.6 Bumps google.golang.org/protobuf from 1.36.5 to 1.36.6. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update tooling --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias <5011972+fasmat@users.noreply.github.com>
1 parent 4d8e6cc commit bca70d2

File tree

10 files changed

+381
-752
lines changed

10 files changed

+381
-752
lines changed

‎Makefile‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ GOTESTSUM_VERSION := v1.12.0
1313
GOSCALE_VERSION := v1.3.0
1414
MOCKGEN_VERSION := v0.5.0
1515

16-
BUF_VERSION := 1.30.0
17-
PROTOC_VERSION = 26.0
16+
BUF_VERSION := 1.50.1
17+
PROTOC_VERSION = 29.4
1818

19-
GRPC_JSON_PROXY_VERSION := v2.19.1
20-
PROTOC_GO_VERSION := v1.33.0
21-
PROTOC_GEN_GO_VERSION := v1.3.0
22-
PROTOC_OPENAPI_VERSION := v2.19.1
19+
GRPC_JSON_PROXY_VERSION := v2.26.3
20+
PROTOC_GO_VERSION := v1.36.6
21+
PROTOC_GEN_GO_VERSION := v1.5.1
22+
PROTOC_OPENAPI_VERSION := v2.26.3
2323

2424
# Everything below this line is meant to be static, i.e. only adjust the above variables. ###
2525

@@ -50,13 +50,9 @@ endif
5050
# messing up with global environment.
5151
export GOBIN := $(BIN_DIR)
5252
GOTESTSUM := $(GOBIN)/gotestsum
53-
GOLINES := $(GOBIN)/golines
5453

5554
FUZZTIME ?= "10s"
5655

57-
$(GOLINES):
58-
@go install github.com/segmentio/golines@v0.11.0
59-
6056
$(BIN_DIR)/mockgen:
6157
@go install go.uber.org/mock/mockgen@$(MOCKGEN_VERSION)
6258

@@ -92,7 +88,7 @@ test:
9288
$(GOTESTSUM) -- -race -timeout 5m $(TEST_FLAGS) ./...
9389
.PHONY: test
9490

95-
install: install-buf install-protoc $(GOLINES)
91+
install: install-buf install-protoc
9692
@go mod download
9793

9894
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
@@ -112,14 +108,13 @@ test-tidy:
112108
@git diff --exit-code || (git --no-pager diff && git checkout . && exit 1)
113109
.PHONY: test-tidy
114110

115-
fmt: $(GOLINES)
111+
fmt:
116112
@go fmt ./...
117-
@$(GOLINES) -m 120 --shorten-comments -w .
118113
.PHONY: fmt
119114

120115
test-fmt:
121116
@git diff --quiet || (echo "\033[0;31mWorking directory not clean!\033[0m" && git --no-pager diff && exit 1)
122-
# We expect `go fmt` and `golines` not to change anything, the test should fail otherwise
117+
# We expect `go fmt` not to change anything, the test should fail otherwise
123118
@make fmt
124119
@git diff --exit-code || (git --no-pager diff && git checkout . && exit 1)
125120
.PHONY: test-fmt

‎buf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ breaking:
66
- FILE
77
lint:
88
use:
9-
- DEFAULT
9+
- STANDARD

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
2424
golang.org/x/sync v0.12.0
2525
golang.org/x/sys v0.31.0
26-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb
26+
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4
2727
google.golang.org/grpc v1.71.0
28-
google.golang.org/protobuf v1.36.5
28+
google.golang.org/protobuf v1.36.6
2929
gopkg.in/natefinch/lumberjack.v2 v2.2.1
3030
)
3131

@@ -49,8 +49,8 @@ require (
4949
github.com/prometheus/common v0.62.0 // indirect
5050
github.com/prometheus/procfs v0.15.1 // indirect
5151
go.uber.org/multierr v1.11.0 // indirect
52-
golang.org/x/net v0.36.0 // indirect
53-
golang.org/x/text v0.22.0 // indirect
52+
golang.org/x/net v0.37.0 // indirect
53+
golang.org/x/text v0.23.0 // indirect
5454
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
5555
gopkg.in/yaml.v3 v3.0.1 // indirect
5656
)

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
193193
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
194194
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
195195
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
196-
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
197-
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
196+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
197+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
198198
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
199199
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
200200
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -223,8 +223,8 @@ golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
223223
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
224224
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
225225
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
226-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
227-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
226+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
227+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
228228
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
229229
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
230230
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -244,8 +244,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
244244
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
245245
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
246246
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
247-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
248-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
247+
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 h1:IFnXJq3UPB3oBREOodn1v1aGQeZYQclEmvWRMN0PSsY=
248+
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:c8q6Z6OCqnfVIqUFJkCzKcrj8eCvUrz+K4KRzSTuANg=
249249
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
250250
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
251251
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -261,8 +261,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
261261
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
262262
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
263263
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
264-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
265-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
264+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
265+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
266266
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
267267
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
268268
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

0 commit comments

Comments
 (0)