Skip to content

Commit 02858ee

Browse files
Clement-Jeanarvindbr8dfawley
authored
deps: move from github.com/golang/protobuf to google.golang.org/protobuf/proto (#6919)
Co-authored-by: Arvind Bright <[email protected]> Co-authored-by: Doug Fawley <[email protected]>
1 parent 8d735f0 commit 02858ee

Some content is hidden

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

68 files changed

+165
-174
lines changed

‎balancer/grpclb/grpclb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import (
4444
"google.golang.org/grpc/internal/resolver/dns"
4545
"google.golang.org/grpc/resolver"
4646
"google.golang.org/grpc/resolver/manual"
47+
"google.golang.org/protobuf/types/known/durationpb"
4748

48-
durationpb "github.com/golang/protobuf/ptypes/duration"
4949
lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
5050
)
5151

‎balancer/grpclb/grpclb_remote_balancer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"sync"
2727
"time"
2828

29-
"github.com/golang/protobuf/proto"
3029
"google.golang.org/grpc"
3130
"google.golang.org/grpc/balancer"
3231
"google.golang.org/grpc/connectivity"
@@ -36,8 +35,9 @@ import (
3635
"google.golang.org/grpc/keepalive"
3736
"google.golang.org/grpc/metadata"
3837
"google.golang.org/grpc/resolver"
38+
"google.golang.org/protobuf/proto"
39+
"google.golang.org/protobuf/types/known/timestamppb"
3940

40-
timestamppb "github.com/golang/protobuf/ptypes/timestamp"
4141
lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
4242
)
4343

‎balancer/grpclb/grpclb_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ import (
5050
"google.golang.org/grpc/resolver/manual"
5151
"google.golang.org/grpc/serviceconfig"
5252
"google.golang.org/grpc/status"
53+
"google.golang.org/protobuf/types/known/durationpb"
5354

54-
durationpb "github.com/golang/protobuf/ptypes/duration"
5555
lbgrpc "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
5656
lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
5757
testgrpc "google.golang.org/grpc/interop/grpc_testing"

‎balancer/rls/config.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import (
2525
"net/url"
2626
"time"
2727

28-
"github.com/golang/protobuf/ptypes"
29-
durationpb "github.com/golang/protobuf/ptypes/duration"
3028
"google.golang.org/grpc/balancer"
3129
"google.golang.org/grpc/balancer/rls/internal/keys"
3230
"google.golang.org/grpc/internal"
@@ -35,6 +33,7 @@ import (
3533
"google.golang.org/grpc/resolver"
3634
"google.golang.org/grpc/serviceconfig"
3735
"google.golang.org/protobuf/encoding/protojson"
36+
"google.golang.org/protobuf/types/known/durationpb"
3837
)
3938

4039
const (
@@ -308,5 +307,5 @@ func convertDuration(d *durationpb.Duration) (time.Duration, error) {
308307
if d == nil {
309308
return 0, nil
310309
}
311-
return ptypes.Duration(d)
310+
return d.AsDuration(), d.CheckValid()
312311
}

‎binarylog/binarylog_end2end_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/golang/protobuf/proto"
3231
"google.golang.org/grpc"
3332
"google.golang.org/grpc/binarylog"
3433
"google.golang.org/grpc/codes"
@@ -39,6 +38,7 @@ import (
3938
"google.golang.org/grpc/internal/stubserver"
4039
"google.golang.org/grpc/metadata"
4140
"google.golang.org/grpc/status"
41+
"google.golang.org/protobuf/proto"
4242

4343
binlogpb "google.golang.org/grpc/binarylog/grpc_binarylog_v1"
4444
testgrpc "google.golang.org/grpc/interop/grpc_testing"

‎credentials/alts/alts_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/golang/protobuf/proto"
3231
"google.golang.org/grpc"
3332
"google.golang.org/grpc/codes"
3433
"google.golang.org/grpc/credentials/alts/internal/handshaker"
@@ -42,6 +41,7 @@ import (
4241
testpb "google.golang.org/grpc/interop/grpc_testing"
4342
"google.golang.org/grpc/peer"
4443
"google.golang.org/grpc/status"
44+
"google.golang.org/protobuf/proto"
4545
)
4646

4747
const (

‎encoding/proto/proto.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ package proto
2323
import (
2424
"fmt"
2525

26-
"github.com/golang/protobuf/proto"
2726
"google.golang.org/grpc/encoding"
27+
"google.golang.org/protobuf/proto"
2828
)
2929

3030
// Name is the name registered for the proto compressor.

‎encoding/proto/proto_benchmark_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import (
2222
"fmt"
2323
"testing"
2424

25-
"github.com/golang/protobuf/proto"
2625
"google.golang.org/grpc/encoding"
26+
"google.golang.org/protobuf/proto"
27+
2728
pb "google.golang.org/grpc/test/codec_perf"
2829
)
2930

‎examples/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.19
44

55
require (
66
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa
7-
github.com/golang/protobuf v1.5.3
87
golang.org/x/oauth2 v0.16.0
98
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80
109
google.golang.org/grpc v1.60.1
@@ -19,6 +18,7 @@ require (
1918
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
2019
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
2120
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
21+
github.com/golang/protobuf v1.5.3 // indirect
2222
golang.org/x/net v0.20.0 // indirect
2323
golang.org/x/sync v0.6.0 // indirect
2424
golang.org/x/sys v0.16.0 // indirect

‎examples/route_guide/server/server.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ import (
3636
"time"
3737

3838
"google.golang.org/grpc"
39-
4039
"google.golang.org/grpc/credentials"
4140
"google.golang.org/grpc/examples/data"
42-
43-
"github.com/golang/protobuf/proto"
41+
"google.golang.org/protobuf/proto"
4442

4543
pb "google.golang.org/grpc/examples/route_guide/routeguide"
4644
)

0 commit comments

Comments
 (0)