From 7b99f840221e92527bc565e4ceb8ec4e4eafb08c Mon Sep 17 00:00:00 2001 From: naiba Date: Wed, 26 Apr 2023 11:16:36 +0800 Subject: [PATCH] upgrade protoc && protoc-gen-go --- go.mod | 4 +- go.sum | 4 +- proto/nezha.pb.go | 229 +------------------------------------- proto/nezha_grpc.pb.go | 246 +++++++++++++++++++++++++++++++++++++++++ script/proto.sh | 2 +- 5 files changed, 253 insertions(+), 232 deletions(-) create mode 100644 proto/nezha_grpc.pb.go diff --git a/go.mod b/go.mod index 68dad76..fc6d080 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/gin-contrib/pprof v1.4.0 github.com/gin-gonic/gin v1.9.0 github.com/go-ping/ping v1.1.0 - github.com/golang/protobuf v1.5.3 github.com/google/go-github/v47 v47.1.0 github.com/gorilla/websocket v1.5.0 github.com/hashicorp/go-uuid v1.0.3 @@ -32,7 +31,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.2 - github.com/xanzy/go-gitlab v0.82.0 + github.com/xanzy/go-gitlab v0.83.0 golang.org/x/crypto v0.8.0 golang.org/x/oauth2 v0.7.0 golang.org/x/sync v0.1.0 @@ -57,6 +56,7 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.11.2 // indirect github.com/goccy/go-json v0.10.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-github v17.0.0+incompatible // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.3.0 // indirect diff --git a/go.sum b/go.sum index 99eff2b..43bb770 100644 --- a/go.sum +++ b/go.sum @@ -349,8 +349,8 @@ github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/xanzy/go-gitlab v0.82.0 h1:WUAqZqNj/VGsXvFM9mYC0MEpPpmK4sHoOAryRQJARp4= -github.com/xanzy/go-gitlab v0.82.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= +github.com/xanzy/go-gitlab v0.83.0 h1:37p0MpTPNbsTMKX/JnmJtY8Ch1sFiJzVF342+RvZEGw= +github.com/xanzy/go-gitlab v0.83.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/proto/nezha.pb.go b/proto/nezha.pb.go index dc60941..5e4330d 100644 --- a/proto/nezha.pb.go +++ b/proto/nezha.pb.go @@ -1,17 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.17.3 +// protoc-gen-go v1.30.0 +// protoc v3.21.12 // source: proto/nezha.proto package proto import ( - context "context" - proto "github.com/golang/protobuf/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -25,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Host struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -721,219 +712,3 @@ func file_proto_nezha_proto_init() { file_proto_nezha_proto_goTypes = nil file_proto_nezha_proto_depIdxs = nil } - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConnInterface - -// 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 - -// NezhaServiceClient is the client API for NezhaService service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type NezhaServiceClient interface { - ReportSystemState(ctx context.Context, in *State, opts ...grpc.CallOption) (*Receipt, error) - ReportSystemInfo(ctx context.Context, in *Host, opts ...grpc.CallOption) (*Receipt, error) - ReportTask(ctx context.Context, in *TaskResult, opts ...grpc.CallOption) (*Receipt, error) - RequestTask(ctx context.Context, in *Host, opts ...grpc.CallOption) (NezhaService_RequestTaskClient, error) -} - -type nezhaServiceClient struct { - cc grpc.ClientConnInterface -} - -func NewNezhaServiceClient(cc grpc.ClientConnInterface) NezhaServiceClient { - return &nezhaServiceClient{cc} -} - -func (c *nezhaServiceClient) ReportSystemState(ctx context.Context, in *State, opts ...grpc.CallOption) (*Receipt, error) { - out := new(Receipt) - err := c.cc.Invoke(ctx, "/proto.NezhaService/ReportSystemState", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *nezhaServiceClient) ReportSystemInfo(ctx context.Context, in *Host, opts ...grpc.CallOption) (*Receipt, error) { - out := new(Receipt) - err := c.cc.Invoke(ctx, "/proto.NezhaService/ReportSystemInfo", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *nezhaServiceClient) ReportTask(ctx context.Context, in *TaskResult, opts ...grpc.CallOption) (*Receipt, error) { - out := new(Receipt) - err := c.cc.Invoke(ctx, "/proto.NezhaService/ReportTask", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *nezhaServiceClient) RequestTask(ctx context.Context, in *Host, opts ...grpc.CallOption) (NezhaService_RequestTaskClient, error) { - stream, err := c.cc.NewStream(ctx, &_NezhaService_serviceDesc.Streams[0], "/proto.NezhaService/RequestTask", opts...) - if err != nil { - return nil, err - } - x := &nezhaServiceRequestTaskClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type NezhaService_RequestTaskClient interface { - Recv() (*Task, error) - grpc.ClientStream -} - -type nezhaServiceRequestTaskClient struct { - grpc.ClientStream -} - -func (x *nezhaServiceRequestTaskClient) Recv() (*Task, error) { - m := new(Task) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -// NezhaServiceServer is the server API for NezhaService service. -type NezhaServiceServer interface { - ReportSystemState(context.Context, *State) (*Receipt, error) - ReportSystemInfo(context.Context, *Host) (*Receipt, error) - ReportTask(context.Context, *TaskResult) (*Receipt, error) - RequestTask(*Host, NezhaService_RequestTaskServer) error -} - -// UnimplementedNezhaServiceServer can be embedded to have forward compatible implementations. -type UnimplementedNezhaServiceServer struct { -} - -func (*UnimplementedNezhaServiceServer) ReportSystemState(context.Context, *State) (*Receipt, error) { - return nil, status.Errorf(codes.Unimplemented, "method ReportSystemState not implemented") -} -func (*UnimplementedNezhaServiceServer) ReportSystemInfo(context.Context, *Host) (*Receipt, error) { - return nil, status.Errorf(codes.Unimplemented, "method ReportSystemInfo not implemented") -} -func (*UnimplementedNezhaServiceServer) ReportTask(context.Context, *TaskResult) (*Receipt, error) { - return nil, status.Errorf(codes.Unimplemented, "method ReportTask not implemented") -} -func (*UnimplementedNezhaServiceServer) RequestTask(*Host, NezhaService_RequestTaskServer) error { - return status.Errorf(codes.Unimplemented, "method RequestTask not implemented") -} - -func RegisterNezhaServiceServer(s *grpc.Server, srv NezhaServiceServer) { - s.RegisterService(&_NezhaService_serviceDesc, srv) -} - -func _NezhaService_ReportSystemState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(State) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(NezhaServiceServer).ReportSystemState(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.NezhaService/ReportSystemState", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NezhaServiceServer).ReportSystemState(ctx, req.(*State)) - } - return interceptor(ctx, in, info, handler) -} - -func _NezhaService_ReportSystemInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(Host) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(NezhaServiceServer).ReportSystemInfo(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.NezhaService/ReportSystemInfo", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NezhaServiceServer).ReportSystemInfo(ctx, req.(*Host)) - } - return interceptor(ctx, in, info, handler) -} - -func _NezhaService_ReportTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(TaskResult) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(NezhaServiceServer).ReportTask(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/proto.NezhaService/ReportTask", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NezhaServiceServer).ReportTask(ctx, req.(*TaskResult)) - } - return interceptor(ctx, in, info, handler) -} - -func _NezhaService_RequestTask_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(Host) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(NezhaServiceServer).RequestTask(m, &nezhaServiceRequestTaskServer{stream}) -} - -type NezhaService_RequestTaskServer interface { - Send(*Task) error - grpc.ServerStream -} - -type nezhaServiceRequestTaskServer struct { - grpc.ServerStream -} - -func (x *nezhaServiceRequestTaskServer) Send(m *Task) error { - return x.ServerStream.SendMsg(m) -} - -var _NezhaService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "proto.NezhaService", - HandlerType: (*NezhaServiceServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "ReportSystemState", - Handler: _NezhaService_ReportSystemState_Handler, - }, - { - MethodName: "ReportSystemInfo", - Handler: _NezhaService_ReportSystemInfo_Handler, - }, - { - MethodName: "ReportTask", - Handler: _NezhaService_ReportTask_Handler, - }, - }, - Streams: []grpc.StreamDesc{ - { - StreamName: "RequestTask", - Handler: _NezhaService_RequestTask_Handler, - ServerStreams: true, - }, - }, - Metadata: "proto/nezha.proto", -} diff --git a/proto/nezha_grpc.pb.go b/proto/nezha_grpc.pb.go new file mode 100644 index 0000000..34f45a2 --- /dev/null +++ b/proto/nezha_grpc.pb.go @@ -0,0 +1,246 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.21.12 +// source: proto/nezha.proto + +package proto + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 + +const ( + NezhaService_ReportSystemState_FullMethodName = "/proto.NezhaService/ReportSystemState" + NezhaService_ReportSystemInfo_FullMethodName = "/proto.NezhaService/ReportSystemInfo" + NezhaService_ReportTask_FullMethodName = "/proto.NezhaService/ReportTask" + NezhaService_RequestTask_FullMethodName = "/proto.NezhaService/RequestTask" +) + +// NezhaServiceClient is the client API for NezhaService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type NezhaServiceClient interface { + ReportSystemState(ctx context.Context, in *State, opts ...grpc.CallOption) (*Receipt, error) + ReportSystemInfo(ctx context.Context, in *Host, opts ...grpc.CallOption) (*Receipt, error) + ReportTask(ctx context.Context, in *TaskResult, opts ...grpc.CallOption) (*Receipt, error) + RequestTask(ctx context.Context, in *Host, opts ...grpc.CallOption) (NezhaService_RequestTaskClient, error) +} + +type nezhaServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewNezhaServiceClient(cc grpc.ClientConnInterface) NezhaServiceClient { + return &nezhaServiceClient{cc} +} + +func (c *nezhaServiceClient) ReportSystemState(ctx context.Context, in *State, opts ...grpc.CallOption) (*Receipt, error) { + out := new(Receipt) + err := c.cc.Invoke(ctx, NezhaService_ReportSystemState_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *nezhaServiceClient) ReportSystemInfo(ctx context.Context, in *Host, opts ...grpc.CallOption) (*Receipt, error) { + out := new(Receipt) + err := c.cc.Invoke(ctx, NezhaService_ReportSystemInfo_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *nezhaServiceClient) ReportTask(ctx context.Context, in *TaskResult, opts ...grpc.CallOption) (*Receipt, error) { + out := new(Receipt) + err := c.cc.Invoke(ctx, NezhaService_ReportTask_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *nezhaServiceClient) RequestTask(ctx context.Context, in *Host, opts ...grpc.CallOption) (NezhaService_RequestTaskClient, error) { + stream, err := c.cc.NewStream(ctx, &NezhaService_ServiceDesc.Streams[0], NezhaService_RequestTask_FullMethodName, opts...) + if err != nil { + return nil, err + } + x := &nezhaServiceRequestTaskClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type NezhaService_RequestTaskClient interface { + Recv() (*Task, error) + grpc.ClientStream +} + +type nezhaServiceRequestTaskClient struct { + grpc.ClientStream +} + +func (x *nezhaServiceRequestTaskClient) Recv() (*Task, error) { + m := new(Task) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// NezhaServiceServer is the server API for NezhaService service. +// All implementations should embed UnimplementedNezhaServiceServer +// for forward compatibility +type NezhaServiceServer interface { + ReportSystemState(context.Context, *State) (*Receipt, error) + ReportSystemInfo(context.Context, *Host) (*Receipt, error) + ReportTask(context.Context, *TaskResult) (*Receipt, error) + RequestTask(*Host, NezhaService_RequestTaskServer) error +} + +// UnimplementedNezhaServiceServer should be embedded to have forward compatible implementations. +type UnimplementedNezhaServiceServer struct { +} + +func (UnimplementedNezhaServiceServer) ReportSystemState(context.Context, *State) (*Receipt, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReportSystemState not implemented") +} +func (UnimplementedNezhaServiceServer) ReportSystemInfo(context.Context, *Host) (*Receipt, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReportSystemInfo not implemented") +} +func (UnimplementedNezhaServiceServer) ReportTask(context.Context, *TaskResult) (*Receipt, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReportTask not implemented") +} +func (UnimplementedNezhaServiceServer) RequestTask(*Host, NezhaService_RequestTaskServer) error { + return status.Errorf(codes.Unimplemented, "method RequestTask not implemented") +} + +// UnsafeNezhaServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to NezhaServiceServer will +// result in compilation errors. +type UnsafeNezhaServiceServer interface { + mustEmbedUnimplementedNezhaServiceServer() +} + +func RegisterNezhaServiceServer(s grpc.ServiceRegistrar, srv NezhaServiceServer) { + s.RegisterService(&NezhaService_ServiceDesc, srv) +} + +func _NezhaService_ReportSystemState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(State) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NezhaServiceServer).ReportSystemState(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: NezhaService_ReportSystemState_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NezhaServiceServer).ReportSystemState(ctx, req.(*State)) + } + return interceptor(ctx, in, info, handler) +} + +func _NezhaService_ReportSystemInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Host) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NezhaServiceServer).ReportSystemInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: NezhaService_ReportSystemInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NezhaServiceServer).ReportSystemInfo(ctx, req.(*Host)) + } + return interceptor(ctx, in, info, handler) +} + +func _NezhaService_ReportTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TaskResult) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NezhaServiceServer).ReportTask(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: NezhaService_ReportTask_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NezhaServiceServer).ReportTask(ctx, req.(*TaskResult)) + } + return interceptor(ctx, in, info, handler) +} + +func _NezhaService_RequestTask_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(Host) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(NezhaServiceServer).RequestTask(m, &nezhaServiceRequestTaskServer{stream}) +} + +type NezhaService_RequestTaskServer interface { + Send(*Task) error + grpc.ServerStream +} + +type nezhaServiceRequestTaskServer struct { + grpc.ServerStream +} + +func (x *nezhaServiceRequestTaskServer) Send(m *Task) error { + return x.ServerStream.SendMsg(m) +} + +// NezhaService_ServiceDesc is the grpc.ServiceDesc for NezhaService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var NezhaService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "proto.NezhaService", + HandlerType: (*NezhaServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "ReportSystemState", + Handler: _NezhaService_ReportSystemState_Handler, + }, + { + MethodName: "ReportSystemInfo", + Handler: _NezhaService_ReportSystemInfo_Handler, + }, + { + MethodName: "ReportTask", + Handler: _NezhaService_ReportTask_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "RequestTask", + Handler: _NezhaService_RequestTask_Handler, + ServerStreams: true, + }, + }, + Metadata: "proto/nezha.proto", +} diff --git a/script/proto.sh b/script/proto.sh index 6950cbd..1147e16 100755 --- a/script/proto.sh +++ b/script/proto.sh @@ -1 +1 @@ -protoc --go_out="plugins=grpc:." proto/*.proto \ No newline at end of file +protoc --go-grpc_out="require_unimplemented_servers=false:." --go_out="." proto/*.proto \ No newline at end of file