From 578c06d384182183c9d0f495fe4282bf5adc7714 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 22 Mar 2021 23:11:01 +0300 Subject: [PATCH] regen with never protoc-gen-go Signed-off-by: Vasiliy Tolstov --- client/grpc/proto/test.pb.go | 4 ++-- client/grpc/proto/test_grpc.pb.go | 27 +++++++++++++++++++-------- client/http/proto/github.pb.go | 4 ++-- codec/proto/test.pb.go | 4 ++-- codec/segmentio/proto/test.pb.go | 4 ++-- server/grpc/proto/test.pb.go | 4 ++-- server/grpc/proto/test_grpc.pb.go | 23 +++++++++++++++++------ server/http/proto/test.pb.go | 26 +++++++++++++------------- 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/client/grpc/proto/test.pb.go b/client/grpc/proto/test.pb.go index e899804..7099255 100644 --- a/client/grpc/proto/test.pb.go +++ b/client/grpc/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: test.proto package helloworld diff --git a/client/grpc/proto/test_grpc.pb.go b/client/grpc/proto/test_grpc.pb.go index 60e76d6..975623b 100644 --- a/client/grpc/proto/test_grpc.pb.go +++ b/client/grpc/proto/test_grpc.pb.go @@ -11,7 +11,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 // TestClient is the client API for Test service. // @@ -39,7 +40,7 @@ func (c *testClient) Call(ctx context.Context, in *Request, opts ...grpc.CallOpt } func (c *testClient) Stream(ctx context.Context, opts ...grpc.CallOption) (Test_StreamClient, error) { - stream, err := c.cc.NewStream(ctx, &_Test_serviceDesc.Streams[0], "/helloworld.Test/Stream", opts...) + stream, err := c.cc.NewStream(ctx, &Test_ServiceDesc.Streams[0], "/helloworld.Test/Stream", opts...) if err != nil { return nil, err } @@ -82,16 +83,23 @@ type TestServer interface { type UnimplementedTestServer struct { } -func (*UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { +func (UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") } -func (*UnimplementedTestServer) Stream(Test_StreamServer) error { +func (UnimplementedTestServer) Stream(Test_StreamServer) error { return status.Errorf(codes.Unimplemented, "method Stream not implemented") } -func (*UnimplementedTestServer) mustEmbedUnimplementedTestServer() {} +func (UnimplementedTestServer) mustEmbedUnimplementedTestServer() {} -func RegisterTestServer(s *grpc.Server, srv TestServer) { - s.RegisterService(&_Test_serviceDesc, srv) +// UnsafeTestServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to TestServer will +// result in compilation errors. +type UnsafeTestServer interface { + mustEmbedUnimplementedTestServer() +} + +func RegisterTestServer(s grpc.ServiceRegistrar, srv TestServer) { + s.RegisterService(&Test_ServiceDesc, srv) } func _Test_Call_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { @@ -138,7 +146,10 @@ func (x *testStreamServer) Recv() (*Request, error) { return m, nil } -var _Test_serviceDesc = grpc.ServiceDesc{ +// Test_ServiceDesc is the grpc.ServiceDesc for Test service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var Test_ServiceDesc = grpc.ServiceDesc{ ServiceName: "helloworld.Test", HandlerType: (*TestServer)(nil), Methods: []grpc.MethodDesc{ diff --git a/client/http/proto/github.pb.go b/client/http/proto/github.pb.go index 977b0fe..4e9ca9d 100644 --- a/client/http/proto/github.pb.go +++ b/client/http/proto/github.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: github.proto package pb diff --git a/codec/proto/test.pb.go b/codec/proto/test.pb.go index 0140e30..7771d48 100644 --- a/codec/proto/test.pb.go +++ b/codec/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: test.proto package pb diff --git a/codec/segmentio/proto/test.pb.go b/codec/segmentio/proto/test.pb.go index 161a444..06b2593 100644 --- a/codec/segmentio/proto/test.pb.go +++ b/codec/segmentio/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: test.proto package pb diff --git a/server/grpc/proto/test.pb.go b/server/grpc/proto/test.pb.go index bb6058f..d019c8d 100644 --- a/server/grpc/proto/test.pb.go +++ b/server/grpc/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: test.proto package helloworld diff --git a/server/grpc/proto/test_grpc.pb.go b/server/grpc/proto/test_grpc.pb.go index 95f6977..c43d288 100644 --- a/server/grpc/proto/test_grpc.pb.go +++ b/server/grpc/proto/test_grpc.pb.go @@ -11,7 +11,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 // TestClient is the client API for Test service. // @@ -49,13 +50,20 @@ type TestServer interface { type UnimplementedTestServer struct { } -func (*UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { +func (UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") } -func (*UnimplementedTestServer) mustEmbedUnimplementedTestServer() {} +func (UnimplementedTestServer) mustEmbedUnimplementedTestServer() {} -func RegisterTestServer(s *grpc.Server, srv TestServer) { - s.RegisterService(&_Test_serviceDesc, srv) +// UnsafeTestServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to TestServer will +// result in compilation errors. +type UnsafeTestServer interface { + mustEmbedUnimplementedTestServer() +} + +func RegisterTestServer(s grpc.ServiceRegistrar, srv TestServer) { + s.RegisterService(&Test_ServiceDesc, srv) } func _Test_Call_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { @@ -76,7 +84,10 @@ func _Test_Call_Handler(srv interface{}, ctx context.Context, dec func(interface return interceptor(ctx, in, info, handler) } -var _Test_serviceDesc = grpc.ServiceDesc{ +// Test_ServiceDesc is the grpc.ServiceDesc for Test service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var Test_ServiceDesc = grpc.ServiceDesc{ ServiceName: "helloworld.Test", HandlerType: (*TestServer)(nil), Methods: []grpc.MethodDesc{ diff --git a/server/http/proto/test.pb.go b/server/http/proto/test.pb.go index 18999fd..1b28f35 100644 --- a/server/http/proto/test.pb.go +++ b/server/http/proto/test.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: test.proto package pb import ( - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/unistack-org/micro-proto/api" _ "github.com/unistack-org/micro-proto/openapiv2" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -107,8 +107,8 @@ type Nested struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - StringArgs []string `protobuf:"bytes,1,rep,name=string_args,json=stringArgs,proto3" json:"string_args,omitempty"` - Uint64Args []*wrappers.UInt64Value `protobuf:"bytes,2,rep,name=uint64_args,json=uint64Args,proto3" json:"uint64_args,omitempty"` + StringArgs []string `protobuf:"bytes,1,rep,name=string_args,json=stringArgs,proto3" json:"string_args,omitempty"` + Uint64Args []*wrapperspb.UInt64Value `protobuf:"bytes,2,rep,name=uint64_args,json=uint64Args,proto3" json:"uint64_args,omitempty"` } func (x *Nested) Reset() { @@ -150,7 +150,7 @@ func (x *Nested) GetStringArgs() []string { return nil } -func (x *Nested) GetUint64Args() []*wrappers.UInt64Value { +func (x *Nested) GetUint64Args() []*wrapperspb.UInt64Value { if x != nil { return x.Uint64Args } @@ -433,13 +433,13 @@ func file_test_proto_rawDescGZIP() []byte { var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_test_proto_goTypes = []interface{}{ - (*CallReq)(nil), // 0: test.CallReq - (*Nested)(nil), // 1: test.Nested - (*CallRsp)(nil), // 2: test.CallRsp - (*CallReq1)(nil), // 3: test.CallReq1 - (*CallRsp1)(nil), // 4: test.CallRsp1 - (*Error)(nil), // 5: test.Error - (*wrappers.UInt64Value)(nil), // 6: google.protobuf.UInt64Value + (*CallReq)(nil), // 0: test.CallReq + (*Nested)(nil), // 1: test.Nested + (*CallRsp)(nil), // 2: test.CallRsp + (*CallReq1)(nil), // 3: test.CallReq1 + (*CallRsp1)(nil), // 4: test.CallRsp1 + (*Error)(nil), // 5: test.Error + (*wrapperspb.UInt64Value)(nil), // 6: google.protobuf.UInt64Value } var file_test_proto_depIdxs = []int32{ 1, // 0: test.CallReq.nested:type_name -> test.Nested