Skip to content

Commit 51f9cc0

Browse files
Clement-JeanClement-Jean
authored
deps: move from github.com/golang/protobuf to google.golang.org/protobuf/proto (#6961)
1 parent eb08be4 commit 51f9cc0

File tree

9 files changed

+19
-45
lines changed

9 files changed

+19
-45
lines changed

‎credentials/credentials.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
"fmt"
2929
"net"
3030

31-
"github.com/golang/protobuf/proto"
3231
"google.golang.org/grpc/attributes"
3332
icredentials "google.golang.org/grpc/internal/credentials"
33+
"google.golang.org/protobuf/protoadapt"
3434
)
3535

3636
// PerRPCCredentials defines the common interface for the credentials which need to
@@ -287,5 +287,5 @@ type ChannelzSecurityValue interface {
287287
type OtherChannelzSecurityValue struct {
288288
ChannelzSecurityValue
289289
Name string
290-
Value proto.Message
290+
Value protoadapt.MessageV1
291291
}

‎internal/pretty/pretty.go

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ import (
2424
"encoding/json"
2525
"fmt"
2626

27-
protov1 "github.com/golang/protobuf/proto"
2827
"google.golang.org/protobuf/encoding/protojson"
29-
protov2 "google.golang.org/protobuf/proto"
28+
"google.golang.org/protobuf/protoadapt"
3029
)
3130

3231
const jsonIndent = " "
@@ -35,21 +34,14 @@ const jsonIndent = " "
3534
//
3635
// If marshal fails, it falls back to fmt.Sprintf("%+v").
3736
func ToJSON(e any) string {
38-
switch ee := e.(type) {
39-
case protov1.Message:
40-
mm := protojson.MarshalOptions{Indent: jsonIndent}
41-
ret, err := mm.Marshal(protov1.MessageV2(ee))
42-
if err != nil {
43-
// This may fail for proto.Anys, e.g. for xDS v2, LDS, the v2
44-
// messages are not imported, and this will fail because the message
45-
// is not found.
46-
return fmt.Sprintf("%+v", ee)
47-
}
48-
return string(ret)
49-
case protov2.Message:
37+
if ee, ok := e.(protoadapt.MessageV1); ok {
38+
e = protoadapt.MessageV2Of(ee)
39+
}
40+
41+
if ee, ok := e.(protoadapt.MessageV2); ok {
5042
mm := protojson.MarshalOptions{
51-
Multiline: true,
5243
Indent: jsonIndent,
44+
Multiline: true,
5345
}
5446
ret, err := mm.Marshal(ee)
5547
if err != nil {
@@ -59,13 +51,13 @@ func ToJSON(e any) string {
5951
return fmt.Sprintf("%+v", ee)
6052
}
6153
return string(ret)
62-
default:
63-
ret, err := json.MarshalIndent(ee, "", jsonIndent)
64-
if err != nil {
65-
return fmt.Sprintf("%+v", ee)
66-
}
67-
return string(ret)
6854
}
55+
56+
ret, err := json.MarshalIndent(e, "", jsonIndent)
57+
if err != nil {
58+
return fmt.Sprintf("%+v", e)
59+
}
60+
return string(ret)
6961
}
7062

7163
// FormatJSON formats the input json bytes with indentation.

‎security/advancedtls/examples/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
)
1010

1111
require (
12-
github.com/golang/protobuf v1.5.3 // indirect
1312
golang.org/x/crypto v0.18.0 // indirect
1413
golang.org/x/net v0.20.0 // indirect
1514
golang.org/x/sys v0.16.0 // indirect

‎security/advancedtls/examples/go.sum

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
2-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
3-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
4-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
51
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
62
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
73
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
@@ -12,10 +8,7 @@ golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
128
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
139
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1410
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
15-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1611
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
1712
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
18-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
19-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
2013
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
2114
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

‎security/advancedtls/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
)
1212

1313
require (
14-
github.com/golang/protobuf v1.5.3 // indirect
1514
golang.org/x/net v0.20.0 // indirect
1615
golang.org/x/sys v0.16.0 // indirect
1716
golang.org/x/text v0.14.0 // indirect

‎security/advancedtls/go.sum

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
2-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
3-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
4-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
51
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
62
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
73
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -14,10 +10,7 @@ golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
1410
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1511
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1612
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
17-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1813
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
1914
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
20-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
21-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
2215
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
2316
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

‎stats/opencensus/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010

1111
require (
1212
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
13-
github.com/golang/protobuf v1.5.3 // indirect
1413
golang.org/x/net v0.20.0 // indirect
1514
golang.org/x/sys v0.16.0 // indirect
1615
golang.org/x/text v0.14.0 // indirect

‎stats/opencensus/go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
12951295
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
12961296
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
12971297
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1298-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
12991298
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
13001299
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
13011300
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=

‎xds/internal/xdsclient/bootstrap/bootstrap.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"strings"
3030

3131
v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
32-
"github.com/golang/protobuf/jsonpb"
3332
"google.golang.org/grpc"
3433
"google.golang.org/grpc/credentials"
3534
"google.golang.org/grpc/credentials/google"
@@ -40,6 +39,7 @@ import (
4039
"google.golang.org/grpc/internal/pretty"
4140
"google.golang.org/grpc/xds/bootstrap"
4241
"google.golang.org/grpc/xds/internal/xdsclient/tlscreds"
42+
"google.golang.org/protobuf/encoding/protojson"
4343
)
4444

4545
const (
@@ -470,13 +470,13 @@ func newConfigFromContents(data []byte) (*Config, error) {
470470
}
471471

472472
var node *v3corepb.Node
473-
m := jsonpb.Unmarshaler{AllowUnknownFields: true}
473+
opts := protojson.UnmarshalOptions{DiscardUnknown: true}
474474
for k, v := range jsonData {
475475
switch k {
476476
case "node":
477477
node = &v3corepb.Node{}
478-
if err := m.Unmarshal(bytes.NewReader(v), node); err != nil {
479-
return nil, fmt.Errorf("xds: jsonpb.Unmarshal(%v) for field %q failed during bootstrap: %v", string(v), k, err)
478+
if err := opts.Unmarshal(v, node); err != nil {
479+
return nil, fmt.Errorf("xds: protojson.Unmarshal(%v) for field %q failed during bootstrap: %v", string(v), k, err)
480480
}
481481
case "xds_servers":
482482
servers, err := unmarshalJSONServerConfigSlice(v)

0 commit comments

Comments
 (0)