Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply patches on the generated *.pb.gw.go files to convert v1 messages to v2 messages

Browse Source 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Benjamin Wang 2023-09-13 18:42:12 +01:00
parent 4ec581a6a3
commit 189f709a5d
4 changed files with 227 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

351
api/etcdserverpb/gw/rpc.pb.gw.go
View File

File diff suppressed because it is too large Load Diff

13
scripts/genproto.sh
View File

@ -117,6 +117,19 @@ for pb in api/etcdserverpb/rpc server/etcdserver/api/v3lock/v3lockpb/v3lock serv
Documentation/dev-guide/apispec/swagger/"${swaggerName}".swagger.json
done
# We only upgraded grpc-gateway from v1 to v2, but keep gogo/protobuf as it's for now.
# So we have to convert v1 message to v2 message. Once we get rid of gogo/protobuf, and
# start to depend on protobuf v2, then we can remove this patch.
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|import \(|import \(\n\tprotov1 \"github.com/golang/protobuf/proto\"\n|g" "${gwfile}"
run sed -i -E "s|return msg, metadata, err|return protov1.MessageV2\(msg\), metadata, err|g" "${gwfile}"
run sed -i -E "s|Decode\(\&protoReq\)|Decode\(protov1\.MessageV2\(\&protoReq\)\)|g" "${gwfile}"
run sed -i -E "s|return resp.Recv\(\)|\n\t\t\tm1, err := resp.Recv\(\)\n\t\t\treturn protov1.MessageV2\(m1\), err\n\t\t|g" "${gwfile}"
run go fmt "${gwfile}"
done
if [ "${1:-}" != "--skip-protodoc" ]; then
log_callout "protodoc is auto-generating grpc API reference documentation..."

41
server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go
View File

@ -9,6 +9,8 @@ It translates gRPC into RESTful JSON APIs.
package gw
import (
protov1 "github.com/golang/protobuf/proto"
"context"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb"
"io"
@ -40,12 +42,12 @@ 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)
}
msg, err := client.Campaign(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -57,12 +59,12 @@ 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)
}
msg, err := server.Campaign(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -74,12 +76,12 @@ 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)
}
msg, err := client.Proclaim(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -91,12 +93,12 @@ 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)
}
msg, err := server.Proclaim(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -108,12 +110,12 @@ 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)
}
msg, err := client.Leader(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -125,12 +127,12 @@ 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)
}
msg, err := server.Leader(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -142,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)
}
@ -167,12 +169,12 @@ 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)
}
msg, err := client.Resign(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -184,12 +186,12 @@ 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)
}
msg, err := server.Resign(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -431,7 +433,10 @@ func RegisterElectionHandlerClient(ctx context.Context, mux *runtime.ServeMux, c
return
}
forward_Election_Observe_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
forward_Election_Observe_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) {
m1, err := resp.Recv()
return protov1.MessageV2(m1), err
}, mux.GetForwardResponseOptions()...)
})

18
server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go
View File

@ -9,6 +9,8 @@ It translates gRPC into RESTful JSON APIs.
package gw
import (
protov1 "github.com/golang/protobuf/proto"
"context"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb"
"io"
@ -40,12 +42,12 @@ 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)
}
msg, err := client.Lock(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -57,12 +59,12 @@ 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)
}
msg, err := server.Lock(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -74,12 +76,12 @@ 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)
}
msg, err := client.Unlock(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}
@ -91,12 +93,12 @@ 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)
}
msg, err := server.Unlock(ctx, &protoReq)
return msg, metadata, err
return protov1.MessageV2(msg), metadata, err
}