Skip to content

Commit 91467d2

Browse files
emcfarlaneemcfarlane
authored
Upgrade go protobuf library (#3594)
1 parent 81b9a5e commit 91467d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1305
-1284
lines changed

‎data/template/buf.go.gen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ inputs:
1717
- module: buf.build/grpc/grpc
1818
types:
1919
- grpc.reflection.v1.ServerReflection
20-
- module: buf.build/protocolbuffers/wellknowntypes:v29.1
20+
- module: buf.build/protocolbuffers/wellknowntypes:v29.3
2121
paths:
2222
- google/protobuf/cpp_features.proto
2323
- google/protobuf/java_features.proto

‎go.mod

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.22.0
55
toolchain go1.23.4
66

77
require (
8-
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.2-20241023225133-42bdb4b67625.1
9-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.2-20241127180247-a33202765966.1
8+
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.3-20241031151143-70f632351282.1
9+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.3-20241127180247-a33202765966.1
1010
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250106231242-56271afbd6ce.1
11-
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.2-20250106231242-56271afbd6ce.1
11+
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.3-20250106231242-56271afbd6ce.1
1212
buf.build/go/bufplugin v0.6.0
1313
buf.build/go/protoyaml v0.3.1
1414
buf.build/go/spdx v0.2.0
@@ -17,7 +17,7 @@ require (
1717
github.com/bufbuild/protocompile v0.14.1
1818
github.com/bufbuild/protoplugin v0.0.0-20250106231243-3a819552c9d9
1919
github.com/bufbuild/protovalidate-go v0.8.2
20-
github.com/docker/docker v27.4.1+incompatible
20+
github.com/docker/docker v27.5.0+incompatible
2121
github.com/go-chi/chi/v5 v5.2.0
2222
github.com/gofrs/flock v0.12.1
2323
github.com/google/cel-go v0.22.1
@@ -47,13 +47,13 @@ require (
4747
golang.org/x/sync v0.10.0
4848
golang.org/x/term v0.28.0
4949
golang.org/x/tools v0.29.0
50-
google.golang.org/protobuf v1.36.2
50+
google.golang.org/protobuf v1.36.4-0.20250116160514-2005adbe0cf6
5151
gopkg.in/yaml.v3 v3.0.1
5252
pluginrpc.com/pluginrpc v0.5.0
5353
)
5454

5555
require (
56-
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.1-20241007202033-cf42259fcbfc.1 // indirect
56+
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.3-20241007202033-cf42259fcbfc.1 // indirect
5757
cel.dev/expr v0.19.1 // indirect
5858
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5959
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -72,7 +72,7 @@ require (
7272
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
7373
github.com/davecgh/go-spew v1.1.1 // indirect
7474
github.com/distribution/reference v0.6.0 // indirect
75-
github.com/docker/cli v27.4.1+incompatible // indirect
75+
github.com/docker/cli v27.5.0+incompatible // indirect
7676
github.com/docker/distribution v2.8.3+incompatible // indirect
7777
github.com/docker/docker-credential-helpers v0.8.2 // indirect
7878
github.com/docker/go-connections v0.5.0 // indirect
@@ -93,6 +93,7 @@ require (
9393
github.com/moby/patternmatcher v0.6.0 // indirect
9494
github.com/moby/sys/mount v0.3.4 // indirect
9595
github.com/moby/sys/mountinfo v0.7.2 // indirect
96+
github.com/moby/sys/reexec v0.1.0 // indirect
9697
github.com/moby/sys/sequential v0.6.0 // indirect
9798
github.com/moby/sys/user v0.3.0 // indirect
9899
github.com/moby/sys/userns v0.1.0 // indirect

‎go.sum

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.2-20241023225133-42bdb4b67625.1 h1:0dJowBGWj63irREieVGXd906PhFl219YeqTewQ1sfVc=
2-
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.2-20241023225133-42bdb4b67625.1/go.mod h1:MX7ir1mUpGuEenIC/vwfBhS2AQwQzkbXYfmJCaINssY=
3-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.2-20241127180247-a33202765966.1 h1:BICM6du/XzvEgeorNo4xgohK3nMTmEPViGyd5t7xVqk=
4-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.2-20241127180247-a33202765966.1/go.mod h1:JnMVLi3qrNYPODVpEKG7UjHLl/d2zR221e66YCSmP2Q=
1+
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.3-20241031151143-70f632351282.1 h1:dS5ier+mttGuW+lRLP/eC1CKJm2Rg3rKWy9Iy0hroIU=
2+
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.3-20241031151143-70f632351282.1/go.mod h1:MYDFm9IHRP085R5Bis68mLc0mIqp5Q27Uk4o8YXjkAI=
3+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.3-20241127180247-a33202765966.1 h1:cQZXKoQ+eB0kykzfJe80RP3nc+3PWbbBrUBm8XNYAQY=
4+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.3-20241127180247-a33202765966.1/go.mod h1:6VPKM8zbmgf9qsmkmKeH49a36Vtmidw3rG53B5mTenc=
55
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250106231242-56271afbd6ce.1 h1:4bJ5Sh3FovNqit+k1rYn03YpckFkgpBjeZe52eoiuUY=
66
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250106231242-56271afbd6ce.1/go.mod h1:GI0Fv/enMZ/dJPfDwU5zamn8P3LUEEl2L/1yg0qw4ZQ=
7-
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.2-20250106231242-56271afbd6ce.1 h1:BaCsU/g/Od9XBPexzV+486UWv2Vdi3FFNkrkNgqvN7A=
8-
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.2-20250106231242-56271afbd6ce.1/go.mod h1:mge2ZWW6jyUH6VaR+EImrAu0GvItt0kJKbsXBMRc//8=
9-
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.1-20241007202033-cf42259fcbfc.1 h1:0Pi0EQh6z2zJigi4UonoqczBQjvOzZ0CFYUfwPRM41M=
10-
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.1-20241007202033-cf42259fcbfc.1/go.mod h1:Uy8SKofLXIAUjswDmz6AIN8W+bGVTF4kNczZikMPHLM=
7+
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.3-20250106231242-56271afbd6ce.1 h1:yPzRLpc0SqVzph6J9NcNux3B7vx4hNy8svO36F+mogc=
8+
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.3-20250106231242-56271afbd6ce.1/go.mod h1:UOdD+CmwdvN3oRHXeZ+WDeIthKVXKo7Dm+2E/233xd0=
9+
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.3-20241007202033-cf42259fcbfc.1 h1:NOipq02MS20WQCr6rfAG1o0n2AuQnY4Xg9avLl16csA=
10+
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.3-20241007202033-cf42259fcbfc.1/go.mod h1:jceo5esD5zSbflHHGad57RXzBpRrcPaiLrLQRA+Mbec=
1111
buf.build/go/bufplugin v0.6.0 h1:3lhoh+0z+IUPS3ZajTPn/27LaLIkero2BDVnV7yXD1s=
1212
buf.build/go/bufplugin v0.6.0/go.mod h1:hWCjxxv24xdR6F5pNlQavZV2oo0J3uF4Ff1XEoyV6vU=
1313
buf.build/go/protoyaml v0.3.1 h1:ucyzE7DRnjX+mQ6AH4JzN0Kg50ByHHu+yrSKbgQn2D4=
@@ -82,12 +82,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
8282
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8383
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
8484
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
85-
github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
86-
github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
85+
github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
86+
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
8787
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
8888
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
89-
github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
90-
github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
89+
github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
90+
github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9191
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
9292
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
9393
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -193,6 +193,8 @@ github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=
193193
github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=
194194
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
195195
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
196+
github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok=
197+
github.com/moby/sys/reexec v0.1.0/go.mod h1:EqjBg8F3X7iZe5pU6nRZnYCMUTXoxsjiIfHup5wYIN8=
196198
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
197199
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
198200
github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
@@ -397,8 +399,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
397399
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
398400
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
399401
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
400-
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
401-
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
402+
google.golang.org/protobuf v1.36.4-0.20250116160514-2005adbe0cf6 h1:ExbOpvwTDdpfXk6InTqz/MevF+sSFWrAZlfZUy5Kw6k=
403+
google.golang.org/protobuf v1.36.4-0.20250116160514-2005adbe0cf6/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
402404
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
403405
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
404406
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎make/go/dep_protoc.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ $(call _assert_var,CACHE_INCLUDE)
1010
$(call _assert_var,CACHE_BIN)
1111

1212
# Settable
13-
# https://github.com/protocolbuffers/protobuf/releases 20241204 checked 20241217
13+
# https://github.com/protocolbuffers/protobuf/releases 20250108 checked 20250115
1414
# NOTE: Set to version compatible with genproto source code (only used in tests).
15-
PROTOC_VERSION ?= 29.1
15+
PROTOC_VERSION ?= 29.3
1616

1717
# Google adds a dash to release candidate versions in the name of the
1818
# release artifact, i.e. v27.0-rc1 -> v27.0-rc-1

‎make/go/dep_protoc_gen_go.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
77
$(call _assert_var,CACHE_BIN)
88

99
# Settable
10-
# https://github.com/protocolbuffers/protobuf-go/releases 20250107 checked 20250113
11-
PROTOC_GEN_GO_VERSION ?= v1.36.2
10+
# https://github.com/protocolbuffers/protobuf-go/releases 20250115 checked 20250115
11+
PROTOC_GEN_GO_VERSION ?= v1.36.3
1212

1313
GO_GET_PKGS := $(GO_GET_PKGS) \
1414
google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION)

‎private/buf/bufprotopluginexec/bufprotopluginexec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const (
4242
// defaultMinorVersion is the default minor version.
4343
defaultMinorVersion = 29
4444
// defaultPatchVersion is the default patch version.
45-
defaultPatchVersion = 1
45+
defaultPatchVersion = 3
4646
// defaultSuffixVersion is the default suffix version.
4747
defaultSuffixVersion = ""
4848
)

‎private/bufpkg/bufcheck/lint_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,15 @@ func TestRunLintCustomWasmPlugins(t *testing.T) {
12701270
)
12711271
}
12721272

1273+
func TestRunLintEditionsGoFeatures(t *testing.T) {
1274+
t.Parallel()
1275+
testLint(
1276+
t,
1277+
"editions_go_features",
1278+
bufanalysistesting.NewFileAnnotationNoLocation(t, "a.proto", "PACKAGE_DEFINED"),
1279+
)
1280+
}
1281+
12731282
func testLint(
12741283
t *testing.T,
12751284
relDirPath string,

‎private/bufpkg/bufcheck/testdata/lint/editions_go_features/a.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
edition = "2023";
2+
3+
import "google/protobuf/go_features.proto";
4+
5+
option features.(pb.go).api_level = API_OPAQUE;

‎private/bufpkg/bufcheck/testdata/lint/editions_go_features/buf.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: v1
2+
lint:
3+
use:
4+
- PACKAGE_DEFINED

‎private/gen/data/datawkt/datawkt.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)