Created
August 24, 2023 07:56
-
-
Save fuweid/b68af198fd9356bade5f9c80ecbb89d6 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From aa157746c01806af89f645ed2c5df8be45c1790d Mon Sep 17 00:00:00 2001 | |
From: Wei Fu <fuweid89@gmail.com> | |
Date: Thu, 24 Aug 2023 07:39:25 +0000 | |
Subject: [PATCH] delete v1.16.0 deps | |
Signed-off-by: Wei Fu <fuweid89@gmail.com> | |
--- | |
api/etcdserverpb/gw/rpc.pb.gw.go | 170 ++++----- | |
pkg/go.mod | 11 +- | |
pkg/go.sum | 15 +- | |
pkg/legacygwjsonpb/marshal.go | 327 ------------------ | |
scripts/genproto.sh | 7 + | |
server/embed/serve.go | 18 +- | |
.../v3electionpb/gw/v3election.pb.gw.go | 18 +- | |
.../api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 8 +- | |
tests/e2e/v3_curl_test.go | 14 +- | |
tests/go.mod | 6 +- | |
10 files changed, 146 insertions(+), 448 deletions(-) | |
delete mode 100644 pkg/legacygwjsonpb/marshal.go | |
diff --git a/api/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go | |
index 07b394aef..fd3039ee8 100644 | |
--- a/api/etcdserverpb/gw/rpc.pb.gw.go | |
+++ b/api/etcdserverpb/gw/rpc.pb.gw.go | |
@@ -42,7 +42,7 @@ func request_KV_Range_0(ctx context.Context, marshaler runtime.Marshaler, client | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -59,7 +59,7 @@ func local_request_KV_Range_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -76,7 +76,7 @@ func request_KV_Put_0(ctx context.Context, marshaler runtime.Marshaler, client e | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -93,7 +93,7 @@ func local_request_KV_Put_0(ctx context.Context, marshaler runtime.Marshaler, se | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -110,7 +110,7 @@ func request_KV_DeleteRange_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -127,7 +127,7 @@ func local_request_KV_DeleteRange_0(ctx context.Context, marshaler runtime.Marsh | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -144,7 +144,7 @@ func request_KV_Txn_0(ctx context.Context, marshaler runtime.Marshaler, client e | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -161,7 +161,7 @@ func local_request_KV_Txn_0(ctx context.Context, marshaler runtime.Marshaler, se | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -178,7 +178,7 @@ func request_KV_Compact_0(ctx context.Context, marshaler runtime.Marshaler, clie | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -195,7 +195,7 @@ func local_request_KV_Compact_0(ctx context.Context, marshaler runtime.Marshaler | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -214,7 +214,7 @@ func request_Watch_Watch_0(ctx context.Context, marshaler runtime.Marshaler, cli | |
dec := marshaler.NewDecoder(req.Body) | |
handleSend := func() error { | |
var protoReq etcdserverpb.WatchRequest | |
- err := dec.Decode(&protoReq) | |
+ err := dec.Decode(protov1.MessageV2(&protoReq)) | |
if err == io.EOF { | |
return err | |
} | |
@@ -255,7 +255,7 @@ func request_Lease_LeaseGrant_0(ctx context.Context, marshaler runtime.Marshaler | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -272,7 +272,7 @@ func local_request_Lease_LeaseGrant_0(ctx context.Context, marshaler runtime.Mar | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -289,7 +289,7 @@ func request_Lease_LeaseRevoke_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -306,7 +306,7 @@ func local_request_Lease_LeaseRevoke_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -323,7 +323,7 @@ func request_Lease_LeaseRevoke_1(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -340,7 +340,7 @@ func local_request_Lease_LeaseRevoke_1(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -359,7 +359,7 @@ func request_Lease_LeaseKeepAlive_0(ctx context.Context, marshaler runtime.Marsh | |
dec := marshaler.NewDecoder(req.Body) | |
handleSend := func() error { | |
var protoReq etcdserverpb.LeaseKeepAliveRequest | |
- err := dec.Decode(&protoReq) | |
+ err := dec.Decode(protov1.MessageV2(&protoReq)) | |
if err == io.EOF { | |
return err | |
} | |
@@ -400,7 +400,7 @@ func request_Lease_LeaseTimeToLive_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -417,7 +417,7 @@ func local_request_Lease_LeaseTimeToLive_0(ctx context.Context, marshaler runtim | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -434,7 +434,7 @@ func request_Lease_LeaseTimeToLive_1(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -451,7 +451,7 @@ func local_request_Lease_LeaseTimeToLive_1(ctx context.Context, marshaler runtim | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -468,7 +468,7 @@ func request_Lease_LeaseLeases_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -485,7 +485,7 @@ func local_request_Lease_LeaseLeases_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -502,7 +502,7 @@ func request_Lease_LeaseLeases_1(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -519,7 +519,7 @@ func local_request_Lease_LeaseLeases_1(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -536,7 +536,7 @@ func request_Cluster_MemberAdd_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -553,7 +553,7 @@ func local_request_Cluster_MemberAdd_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -570,7 +570,7 @@ func request_Cluster_MemberRemove_0(ctx context.Context, marshaler runtime.Marsh | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -587,7 +587,7 @@ func local_request_Cluster_MemberRemove_0(ctx context.Context, marshaler runtime | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -604,7 +604,7 @@ func request_Cluster_MemberUpdate_0(ctx context.Context, marshaler runtime.Marsh | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -621,7 +621,7 @@ func local_request_Cluster_MemberUpdate_0(ctx context.Context, marshaler runtime | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -638,7 +638,7 @@ func request_Cluster_MemberList_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -655,7 +655,7 @@ func local_request_Cluster_MemberList_0(ctx context.Context, marshaler runtime.M | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -672,7 +672,7 @@ func request_Cluster_MemberPromote_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -689,7 +689,7 @@ func local_request_Cluster_MemberPromote_0(ctx context.Context, marshaler runtim | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -706,7 +706,7 @@ func request_Maintenance_Alarm_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -723,7 +723,7 @@ func local_request_Maintenance_Alarm_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -740,7 +740,7 @@ func request_Maintenance_Status_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -757,7 +757,7 @@ func local_request_Maintenance_Status_0(ctx context.Context, marshaler runtime.M | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -774,7 +774,7 @@ func request_Maintenance_Defragment_0(ctx context.Context, marshaler runtime.Mar | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -791,7 +791,7 @@ func local_request_Maintenance_Defragment_0(ctx context.Context, marshaler runti | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -808,7 +808,7 @@ func request_Maintenance_Hash_0(ctx context.Context, marshaler runtime.Marshaler | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -825,7 +825,7 @@ func local_request_Maintenance_Hash_0(ctx context.Context, marshaler runtime.Mar | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -842,7 +842,7 @@ func request_Maintenance_HashKV_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -859,7 +859,7 @@ func local_request_Maintenance_HashKV_0(ctx context.Context, marshaler runtime.M | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -876,7 +876,7 @@ func request_Maintenance_Snapshot_0(ctx context.Context, marshaler runtime.Marsh | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -901,7 +901,7 @@ func request_Maintenance_MoveLeader_0(ctx context.Context, marshaler runtime.Mar | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -918,7 +918,7 @@ func local_request_Maintenance_MoveLeader_0(ctx context.Context, marshaler runti | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -935,7 +935,7 @@ func request_Maintenance_Downgrade_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -952,7 +952,7 @@ func local_request_Maintenance_Downgrade_0(ctx context.Context, marshaler runtim | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -969,7 +969,7 @@ func request_Auth_AuthEnable_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -986,7 +986,7 @@ func local_request_Auth_AuthEnable_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1003,7 +1003,7 @@ func request_Auth_AuthDisable_0(ctx context.Context, marshaler runtime.Marshaler | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1020,7 +1020,7 @@ func local_request_Auth_AuthDisable_0(ctx context.Context, marshaler runtime.Mar | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1037,7 +1037,7 @@ func request_Auth_AuthStatus_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1054,7 +1054,7 @@ func local_request_Auth_AuthStatus_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1071,7 +1071,7 @@ func request_Auth_Authenticate_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1088,7 +1088,7 @@ func local_request_Auth_Authenticate_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1105,7 +1105,7 @@ func request_Auth_UserAdd_0(ctx context.Context, marshaler runtime.Marshaler, cl | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1122,7 +1122,7 @@ func local_request_Auth_UserAdd_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1139,7 +1139,7 @@ func request_Auth_UserGet_0(ctx context.Context, marshaler runtime.Marshaler, cl | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1156,7 +1156,7 @@ func local_request_Auth_UserGet_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1173,7 +1173,7 @@ func request_Auth_UserList_0(ctx context.Context, marshaler runtime.Marshaler, c | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1190,7 +1190,7 @@ func local_request_Auth_UserList_0(ctx context.Context, marshaler runtime.Marsha | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1207,7 +1207,7 @@ func request_Auth_UserDelete_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1224,7 +1224,7 @@ func local_request_Auth_UserDelete_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1241,7 +1241,7 @@ func request_Auth_UserChangePassword_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1258,7 +1258,7 @@ func local_request_Auth_UserChangePassword_0(ctx context.Context, marshaler runt | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1275,7 +1275,7 @@ func request_Auth_UserGrantRole_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1292,7 +1292,7 @@ func local_request_Auth_UserGrantRole_0(ctx context.Context, marshaler runtime.M | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1309,7 +1309,7 @@ func request_Auth_UserRevokeRole_0(ctx context.Context, marshaler runtime.Marsha | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1326,7 +1326,7 @@ func local_request_Auth_UserRevokeRole_0(ctx context.Context, marshaler runtime. | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1343,7 +1343,7 @@ func request_Auth_RoleAdd_0(ctx context.Context, marshaler runtime.Marshaler, cl | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1360,7 +1360,7 @@ func local_request_Auth_RoleAdd_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1377,7 +1377,7 @@ func request_Auth_RoleGet_0(ctx context.Context, marshaler runtime.Marshaler, cl | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1394,7 +1394,7 @@ func local_request_Auth_RoleGet_0(ctx context.Context, marshaler runtime.Marshal | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1411,7 +1411,7 @@ func request_Auth_RoleList_0(ctx context.Context, marshaler runtime.Marshaler, c | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1428,7 +1428,7 @@ func local_request_Auth_RoleList_0(ctx context.Context, marshaler runtime.Marsha | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1445,7 +1445,7 @@ func request_Auth_RoleDelete_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1462,7 +1462,7 @@ func local_request_Auth_RoleDelete_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1479,7 +1479,7 @@ func request_Auth_RoleGrantPermission_0(ctx context.Context, marshaler runtime.M | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1496,7 +1496,7 @@ func local_request_Auth_RoleGrantPermission_0(ctx context.Context, marshaler run | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1513,7 +1513,7 @@ func request_Auth_RoleRevokePermission_0(ctx context.Context, marshaler runtime. | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -1530,7 +1530,7 @@ func local_request_Auth_RoleRevokePermission_0(ctx context.Context, marshaler ru | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
diff --git a/pkg/go.mod b/pkg/go.mod | |
index 9959a1577..ad204682f 100644 | |
--- a/pkg/go.mod | |
+++ b/pkg/go.mod | |
@@ -5,7 +5,7 @@ go 1.20 | |
require ( | |
github.com/creack/pty v1.1.18 | |
github.com/dustin/go-humanize v1.0.1 | |
- github.com/golang/protobuf v1.5.3 | |
+ github.com/golang/protobuf v1.5.3 // indirect | |
github.com/spf13/cobra v1.7.0 | |
github.com/spf13/pflag v1.0.5 | |
github.com/stretchr/testify v1.8.4 | |
@@ -14,24 +14,21 @@ require ( | |
google.golang.org/grpc v1.57.0 | |
) | |
-require ( | |
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 | |
- google.golang.org/protobuf v1.31.0 | |
-) | |
- | |
require ( | |
github.com/benbjohnson/clock v1.3.0 // indirect | |
github.com/coreos/go-systemd/v22 v22.5.0 // indirect | |
github.com/davecgh/go-spew v1.1.1 // indirect | |
github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
+ github.com/kr/pretty v0.3.1 // indirect | |
github.com/pmezard/go-difflib v1.0.0 // indirect | |
github.com/rogpeppe/go-internal v1.11.0 // indirect | |
go.uber.org/multierr v1.11.0 // indirect | |
golang.org/x/net v0.14.0 // indirect | |
golang.org/x/sys v0.11.0 // indirect | |
golang.org/x/text v0.12.0 // indirect | |
- google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect | |
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect | |
+ google.golang.org/protobuf v1.31.0 // indirect | |
+ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | |
gopkg.in/yaml.v3 v3.0.1 // indirect | |
) | |
diff --git a/pkg/go.sum b/pkg/go.sum | |
index 251d63406..a80ba5fef 100644 | |
--- a/pkg/go.sum | |
+++ b/pkg/go.sum | |
@@ -3,6 +3,7 @@ github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx | |
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= | |
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= | |
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= | |
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | |
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= | |
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= | |
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | |
@@ -10,20 +11,24 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs | |
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= | |
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= | |
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | |
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= | |
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= | |
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= | |
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= | |
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | |
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= | |
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM= | |
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y= | |
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | |
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | |
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= | |
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= | |
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= | |
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | |
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | |
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | |
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | |
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= | |
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= | |
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | |
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= | |
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= | |
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= | |
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | |
@@ -45,9 +50,6 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | |
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= | |
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | |
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | |
-google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= | |
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= | |
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= | |
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= | |
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= | |
google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= | |
@@ -58,5 +60,6 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs | |
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= | |
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= | |
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= | |
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | |
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | |
diff --git a/pkg/legacygwjsonpb/marshal.go b/pkg/legacygwjsonpb/marshal.go | |
deleted file mode 100644 | |
index 276feca01..000000000 | |
--- a/pkg/legacygwjsonpb/marshal.go | |
+++ /dev/null | |
@@ -1,327 +0,0 @@ | |
-// Copyright (c) 2015, Gengo, Inc. | |
-// All rights reserved. | |
-// | |
-// Redistribution and use in source and binary forms, with or without modification, | |
-// are permitted provided that the following conditions are met: | |
-// | |
-// * Redistributions of source code must retain the above copyright notice, | |
-// this list of conditions and the following disclaimer. | |
-// | |
-// * Redistributions in binary form must reproduce the above copyright notice, | |
-// this list of conditions and the following disclaimer in the documentation | |
-// and/or other materials provided with the distribution. | |
-// | |
-// * Neither the name of Gengo, Inc. nor the names of its | |
-// contributors may be used to endorse or promote products derived from this | |
-// software without specific prior written permission. | |
-// | |
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | |
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | |
-// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | |
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | |
-// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
- | |
-// Note: this file is a fork of the following file with minor modification. | |
-// https://github.com/grpc-ecosystem/grpc-gateway/blob/v1.16.0/runtime/marshal_jsonpb.go | |
-// | |
-// It's just a temporary solution. We will remove it once we upgrade the gogo/protobuf | |
-// to protobuf v2 in the future. | |
-// Reference: https://github.com/etcd-io/etcd/pull/16454#issuecomment-1690230397 | |
- | |
-package legacygwjsonpb | |
- | |
-import ( | |
- "bytes" | |
- "encoding/json" | |
- "fmt" | |
- "io" | |
- "reflect" | |
- | |
- "github.com/golang/protobuf/jsonpb" | |
- "github.com/golang/protobuf/proto" | |
- gw "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" | |
- protoV2 "google.golang.org/protobuf/proto" | |
-) | |
- | |
-// JSONPb is a Marshaler which marshals/unmarshals into/from JSON | |
-// with the "github.com/golang/protobuf/jsonpb". | |
-// It supports fully functionality of protobuf unlike JSONBuiltin. | |
-// | |
-// The NewDecoder method returns a DecoderWrapper, so the underlying | |
-// *json.Decoder methods can be used. | |
-type JSONPb jsonpb.Marshaler | |
- | |
-// ContentType always returns "application/json". | |
-func (*JSONPb) ContentType(v interface{}) string { | |
- return "application/json" | |
-} | |
- | |
-// Marshal marshals "v" into JSON. | |
-func (j *JSONPb) Marshal(vv interface{}) (ret []byte, retErr error) { | |
- var v interface{} = vv | |
- | |
- // For unary api, the gateway always convert the messageV1 into V2. | |
- // We should convert it back. And for the streaming api, the input is | |
- // kind of map, we can't just call the proto.MessageV1 because it | |
- // will panic :) | |
- // | |
- // REF: github.com/grpc-ecosystem/grpc-gateway/v2@v2.16.2/runtime/handler.goL75 | |
- if _, ok := vv.(protoV2.Message); ok { | |
- v = proto.MessageV1(vv) | |
- } | |
- | |
- if _, ok := v.(proto.Message); !ok { | |
- return j.marshalNonProtoField(v) | |
- } | |
- | |
- var buf bytes.Buffer | |
- if err := j.marshalTo(&buf, v); err != nil { | |
- return nil, err | |
- } | |
- return buf.Bytes(), nil | |
-} | |
- | |
-func (j *JSONPb) marshalTo(w io.Writer, v interface{}) error { | |
- p, ok := v.(proto.Message) | |
- if !ok { | |
- buf, err := j.marshalNonProtoField(v) | |
- if err != nil { | |
- return err | |
- } | |
- _, err = w.Write(buf) | |
- return err | |
- } | |
- return (*jsonpb.Marshaler)(j).Marshal(w, p) | |
-} | |
- | |
-var ( | |
- // protoMessageType is stored to prevent constant lookup of the same type at runtime. | |
- protoMessageType = reflect.TypeOf((*proto.Message)(nil)).Elem() | |
-) | |
- | |
-// marshalNonProto marshals a non-message field of a protobuf message. | |
-// This function does not correctly marshals arbitrary data structure into JSON, | |
-// but it is only capable of marshaling non-message field values of protobuf, | |
-// i.e. primitive types, enums; pointers to primitives or enums; maps from | |
-// integer/string types to primitives/enums/pointers to messages. | |
-func (j *JSONPb) marshalNonProtoField(v interface{}) ([]byte, error) { | |
- if v == nil { | |
- return []byte("null"), nil | |
- } | |
- rv := reflect.ValueOf(v) | |
- for rv.Kind() == reflect.Ptr { | |
- if rv.IsNil() { | |
- return []byte("null"), nil | |
- } | |
- rv = rv.Elem() | |
- } | |
- | |
- if rv.Kind() == reflect.Slice { | |
- if rv.IsNil() { | |
- if j.EmitDefaults { | |
- return []byte("[]"), nil | |
- } | |
- return []byte("null"), nil | |
- } | |
- | |
- if rv.Type().Elem().Implements(protoMessageType) { | |
- var buf bytes.Buffer | |
- err := buf.WriteByte('[') | |
- if err != nil { | |
- return nil, err | |
- } | |
- for i := 0; i < rv.Len(); i++ { | |
- if i != 0 { | |
- err = buf.WriteByte(',') | |
- if err != nil { | |
- return nil, err | |
- } | |
- } | |
- if err = (*jsonpb.Marshaler)(j).Marshal(&buf, rv.Index(i).Interface().(proto.Message)); err != nil { | |
- return nil, err | |
- } | |
- } | |
- err = buf.WriteByte(']') | |
- if err != nil { | |
- return nil, err | |
- } | |
- | |
- return buf.Bytes(), nil | |
- } | |
- } | |
- | |
- if rv.Kind() == reflect.Map { | |
- m := make(map[string]*json.RawMessage) | |
- for _, k := range rv.MapKeys() { | |
- buf, err := j.Marshal(rv.MapIndex(k).Interface()) | |
- if err != nil { | |
- return nil, err | |
- } | |
- m[fmt.Sprintf("%v", k.Interface())] = (*json.RawMessage)(&buf) | |
- } | |
- if j.Indent != "" { | |
- return json.MarshalIndent(m, "", j.Indent) | |
- } | |
- return json.Marshal(m) | |
- } | |
- if enum, ok := rv.Interface().(protoEnum); ok && !j.EnumsAsInts { | |
- return json.Marshal(enum.String()) | |
- } | |
- return json.Marshal(rv.Interface()) | |
-} | |
- | |
-// Unmarshal unmarshals JSON "data" into "v" | |
-func (j *JSONPb) Unmarshal(data []byte, v interface{}) error { | |
- return unmarshalJSONPb(data, v) | |
-} | |
- | |
-// NewDecoder returns a Decoder which reads JSON stream from "r". | |
-func (j *JSONPb) NewDecoder(r io.Reader) gw.Decoder { | |
- d := json.NewDecoder(r) | |
- return DecoderWrapper{Decoder: d} | |
-} | |
- | |
-// DecoderWrapper is a wrapper around a *json.Decoder that adds | |
-// support for protos to the Decode method. | |
-type DecoderWrapper struct { | |
- *json.Decoder | |
-} | |
- | |
-// Decode wraps the embedded decoder's Decode method to support | |
-// protos using a jsonpb.Unmarshaler. | |
-func (d DecoderWrapper) Decode(v interface{}) error { | |
- return decodeJSONPb(d.Decoder, v) | |
-} | |
- | |
-// NewEncoder returns an Encoder which writes JSON stream into "w". | |
-func (j *JSONPb) NewEncoder(w io.Writer) gw.Encoder { | |
- return gw.EncoderFunc(func(vv interface{}) error { | |
- v := proto.MessageV1(vv) | |
- | |
- if err := j.marshalTo(w, v); err != nil { | |
- return err | |
- } | |
- // mimic json.Encoder by adding a newline (makes output | |
- // easier to read when it contains multiple encoded items) | |
- _, err := w.Write(j.Delimiter()) | |
- return err | |
- }) | |
-} | |
- | |
-func unmarshalJSONPb(data []byte, v interface{}) error { | |
- d := json.NewDecoder(bytes.NewReader(data)) | |
- return decodeJSONPb(d, v) | |
-} | |
- | |
-func decodeJSONPb(d *json.Decoder, v interface{}) error { | |
- p, ok := v.(proto.Message) | |
- if !ok { | |
- return decodeNonProtoField(d, v) | |
- } | |
- unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: allowUnknownFields} | |
- return unmarshaler.UnmarshalNext(d, p) | |
-} | |
- | |
-func decodeNonProtoField(d *json.Decoder, v interface{}) error { | |
- rv := reflect.ValueOf(v) | |
- if rv.Kind() != reflect.Ptr { | |
- return fmt.Errorf("%T is not a pointer", v) | |
- } | |
- for rv.Kind() == reflect.Ptr { | |
- if rv.IsNil() { | |
- rv.Set(reflect.New(rv.Type().Elem())) | |
- } | |
- if rv.Type().ConvertibleTo(typeProtoMessage) { | |
- unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: allowUnknownFields} | |
- return unmarshaler.UnmarshalNext(d, rv.Interface().(proto.Message)) | |
- } | |
- rv = rv.Elem() | |
- } | |
- if rv.Kind() == reflect.Map { | |
- if rv.IsNil() { | |
- rv.Set(reflect.MakeMap(rv.Type())) | |
- } | |
- conv, ok := convFromType[rv.Type().Key().Kind()] | |
- if !ok { | |
- return fmt.Errorf("unsupported type of map field key: %v", rv.Type().Key()) | |
- } | |
- | |
- m := make(map[string]*json.RawMessage) | |
- if err := d.Decode(&m); err != nil { | |
- return err | |
- } | |
- for k, v := range m { | |
- result := conv.Call([]reflect.Value{reflect.ValueOf(k)}) | |
- if err := result[1].Interface(); err != nil { | |
- return err.(error) | |
- } | |
- bk := result[0] | |
- bv := reflect.New(rv.Type().Elem()) | |
- if err := unmarshalJSONPb([]byte(*v), bv.Interface()); err != nil { | |
- return err | |
- } | |
- rv.SetMapIndex(bk, bv.Elem()) | |
- } | |
- return nil | |
- } | |
- if _, ok := rv.Interface().(protoEnum); ok { | |
- var repr interface{} | |
- if err := d.Decode(&repr); err != nil { | |
- return err | |
- } | |
- switch repr.(type) { | |
- case string: | |
- // TODO(yugui) Should use proto.StructProperties? | |
- return fmt.Errorf("unmarshaling of symbolic enum %q not supported: %T", repr, rv.Interface()) | |
- case float64: | |
- rv.Set(reflect.ValueOf(int32(repr.(float64))).Convert(rv.Type())) | |
- return nil | |
- default: | |
- return fmt.Errorf("cannot assign %#v into Go type %T", repr, rv.Interface()) | |
- } | |
- } | |
- return d.Decode(v) | |
-} | |
- | |
-type protoEnum interface { | |
- fmt.Stringer | |
- EnumDescriptor() ([]byte, []int) | |
-} | |
- | |
-var typeProtoMessage = reflect.TypeOf((*proto.Message)(nil)).Elem() | |
- | |
-// Delimiter for newline encoded JSON streams. | |
-func (j *JSONPb) Delimiter() []byte { | |
- return []byte("\n") | |
-} | |
- | |
-// allowUnknownFields helps not to return an error when the destination | |
-// is a struct and the input contains object keys which do not match any | |
-// non-ignored, exported fields in the destination. | |
-var allowUnknownFields = true | |
- | |
-// DisallowUnknownFields enables option in decoder (unmarshaller) to | |
-// return an error when it finds an unknown field. This function must be | |
-// called before using the JSON marshaller. | |
-func DisallowUnknownFields() { | |
- allowUnknownFields = false | |
-} | |
- | |
-var ( | |
- convFromType = map[reflect.Kind]reflect.Value{ | |
- reflect.String: reflect.ValueOf(gw.String), | |
- reflect.Bool: reflect.ValueOf(gw.Bool), | |
- reflect.Float64: reflect.ValueOf(gw.Float64), | |
- reflect.Float32: reflect.ValueOf(gw.Float32), | |
- reflect.Int64: reflect.ValueOf(gw.Int64), | |
- reflect.Int32: reflect.ValueOf(gw.Int32), | |
- reflect.Uint64: reflect.ValueOf(gw.Uint64), | |
- reflect.Uint32: reflect.ValueOf(gw.Uint32), | |
- reflect.Slice: reflect.ValueOf(gw.Bytes), | |
- } | |
-) | |
diff --git a/scripts/genproto.sh b/scripts/genproto.sh | |
index fb59d5bb6..8c01e45b7 100755 | |
--- a/scripts/genproto.sh | |
+++ b/scripts/genproto.sh | |
@@ -122,6 +122,13 @@ done | |
# start to depend on protobuf v2, then we can remove this patch. | |
git apply scripts/patches/v1_v2_diff.txt | |
+for pb in api/etcdserverpb/rpc server/etcdserver/api/v3lock/v3lockpb/v3lock server/etcdserver/api/v3election/v3electionpb/v3election; do | |
+ gwfile="$(dirname ${pb})/gw/$(basename ${pb}).pb.gw.go" | |
+ | |
+ run sed -i -E "s#Decode\(\&protoReq\)#Decode\(protov1\.MessageV2\(\&protoReq\)\)#g" "${gwfile}" | |
+ run go fmt "${gwfile}" | |
+done | |
+ | |
if [ "${1:-}" != "--skip-protodoc" ]; then | |
log_callout "protodoc is auto-generating grpc API reference documentation..." | |
diff --git a/server/embed/serve.go b/server/embed/serve.go | |
index 48841a220..39b023e01 100644 | |
--- a/server/embed/serve.go | |
+++ b/server/embed/serve.go | |
@@ -28,7 +28,6 @@ import ( | |
"go.etcd.io/etcd/client/pkg/v3/transport" | |
"go.etcd.io/etcd/pkg/v3/debugutil" | |
"go.etcd.io/etcd/pkg/v3/httputil" | |
- "go.etcd.io/etcd/pkg/v3/legacygwjsonpb" | |
"go.etcd.io/etcd/server/v3/config" | |
"go.etcd.io/etcd/server/v3/etcdserver" | |
"go.etcd.io/etcd/server/v3/etcdserver/api/v3client" | |
@@ -47,6 +46,7 @@ import ( | |
"golang.org/x/net/http2" | |
"golang.org/x/net/trace" | |
"google.golang.org/grpc" | |
+ "google.golang.org/protobuf/encoding/protojson" | |
) | |
type serveCtx struct { | |
@@ -304,9 +304,19 @@ func (sctx *serveCtx) registerGateway(dial func(ctx context.Context) (*grpc.Clie | |
} | |
gwmux := gw.NewServeMux( | |
- gw.WithMarshalerOption(gw.MIMEWildcard, &gw.HTTPBodyMarshaler{ | |
- Marshaler: &legacygwjsonpb.JSONPb{OrigName: true}, | |
- }), | |
+ gw.WithMarshalerOption(gw.MIMEWildcard, | |
+ &gw.HTTPBodyMarshaler{ | |
+ Marshaler: &gw.JSONPb{ | |
+ MarshalOptions: protojson.MarshalOptions{ | |
+ UseProtoNames: true, | |
+ EmitUnpopulated: false, | |
+ }, | |
+ UnmarshalOptions: protojson.UnmarshalOptions{ | |
+ DiscardUnknown: true, | |
+ }, | |
+ }, | |
+ }, | |
+ ), | |
) | |
handlers := []registerHandlerFunc{ | |
diff --git a/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go | |
index bb1502972..cf053755e 100644 | |
--- a/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go | |
+++ b/server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go | |
@@ -42,7 +42,7 @@ func request_Election_Campaign_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -59,7 +59,7 @@ func local_request_Election_Campaign_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -76,7 +76,7 @@ func request_Election_Proclaim_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -93,7 +93,7 @@ func local_request_Election_Proclaim_0(ctx context.Context, marshaler runtime.Ma | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -110,7 +110,7 @@ func request_Election_Leader_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -127,7 +127,7 @@ func local_request_Election_Leader_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -144,7 +144,7 @@ func request_Election_Observe_0(ctx context.Context, marshaler runtime.Marshaler | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -169,7 +169,7 @@ func request_Election_Resign_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -186,7 +186,7 @@ func local_request_Election_Resign_0(ctx context.Context, marshaler runtime.Mars | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
diff --git a/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | |
index f38080134..1561328e9 100644 | |
--- a/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | |
+++ b/server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | |
@@ -42,7 +42,7 @@ func request_Lock_Lock_0(ctx context.Context, marshaler runtime.Marshaler, clien | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -59,7 +59,7 @@ func local_request_Lock_Lock_0(ctx context.Context, marshaler runtime.Marshaler, | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -76,7 +76,7 @@ func request_Lock_Unlock_0(ctx context.Context, marshaler runtime.Marshaler, cli | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
@@ -93,7 +93,7 @@ func local_request_Lock_Unlock_0(ctx context.Context, marshaler runtime.Marshale | |
if berr != nil { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) | |
} | |
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { | |
+ if err := marshaler.NewDecoder(newReader()).Decode(protov1.MessageV2(&protoReq)); err != nil && err != io.EOF { | |
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) | |
} | |
diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go | |
index 04047db5b..d4a9c3e9a 100644 | |
--- a/tests/e2e/v3_curl_test.go | |
+++ b/tests/e2e/v3_curl_test.go | |
@@ -26,13 +26,15 @@ import ( | |
"github.com/stretchr/testify/require" | |
+ protov1 "github.com/golang/protobuf/proto" | |
+ gw "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" | |
"go.etcd.io/etcd/api/v3/authpb" | |
pb "go.etcd.io/etcd/api/v3/etcdserverpb" | |
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" | |
"go.etcd.io/etcd/client/pkg/v3/testutil" | |
- "go.etcd.io/etcd/pkg/v3/legacygwjsonpb" | |
epb "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" | |
"go.etcd.io/etcd/tests/v3/framework/e2e" | |
+ "google.golang.org/protobuf/encoding/protojson" | |
) | |
var apiPrefix = []string{"/v3"} | |
@@ -167,8 +169,14 @@ func testV3CurlTxn(cx ctlCtx) { | |
}, | |
}, | |
} | |
- m := &legacygwjsonpb.JSONPb{} | |
- jsonDat, jerr := m.Marshal(txn) | |
+ m := gw.JSONPb{ | |
+ MarshalOptions: protojson.MarshalOptions{ | |
+ UseProtoNames: true, | |
+ EmitUnpopulated: false, | |
+ }, | |
+ } | |
+ | |
+ jsonDat, jerr := m.Marshal(protov1.MessageV2(txn)) | |
if jerr != nil { | |
cx.t.Fatal(jerr) | |
} | |
diff --git a/tests/go.mod b/tests/go.mod | |
index 2fc202c6c..1e54f7137 100644 | |
--- a/tests/go.mod | |
+++ b/tests/go.mod | |
@@ -16,9 +16,11 @@ replace ( | |
require ( | |
github.com/anishathalye/porcupine v0.1.4 | |
github.com/coreos/go-semver v0.3.1 | |
+ github.com/golang/protobuf v1.5.3 | |
github.com/google/go-cmp v0.5.9 | |
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 | |
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 | |
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 | |
github.com/prometheus/client_golang v1.16.0 | |
github.com/prometheus/common v0.43.0 | |
github.com/soheilhy/cmux v0.1.5 | |
@@ -43,6 +45,7 @@ require ( | |
golang.org/x/sync v0.3.0 | |
golang.org/x/time v0.3.0 | |
google.golang.org/grpc v1.57.0 | |
+ google.golang.org/protobuf v1.31.0 | |
) | |
require ( | |
@@ -63,10 +66,8 @@ require ( | |
github.com/gogo/protobuf v1.3.2 // indirect | |
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect | |
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | |
- github.com/golang/protobuf v1.5.3 // indirect | |
github.com/google/btree v1.1.2 // indirect | |
github.com/gorilla/websocket v1.4.2 // indirect | |
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect | |
github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
github.com/jonboulle/clockwork v0.4.0 // indirect | |
github.com/mattn/go-colorable v0.1.13 // indirect | |
@@ -95,7 +96,6 @@ require ( | |
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect | |
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect | |
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect | |
- google.golang.org/protobuf v1.31.0 // indirect | |
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | |
gopkg.in/yaml.v2 v2.4.0 // indirect | |
gopkg.in/yaml.v3 v3.0.1 // indirect | |
-- | |
2.40.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment