From 73838c26e2f8b36208e5b5777f454ebb3571487a Mon Sep 17 00:00:00 2001 From: SoXX Date: Sat, 6 Jul 2024 22:08:19 +0200 Subject: [PATCH] feat: updated protobuf files --- pkg/grpc/plug.pb.go | 32 ++++++++++++++++---------------- pkg/grpc/plug_grpc.pb.go | 27 ++++++++++----------------- scripts/README.md | 6 +++--- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/pkg/grpc/plug.pb.go b/pkg/grpc/plug.pb.go index fc4fbcd..dfd0067 100644 --- a/pkg/grpc/plug.pb.go +++ b/pkg/grpc/plug.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v3.19.6 +// protoc-gen-go v1.28.1 +// protoc v3.12.4 // source: plug.proto package gRPC import ( + timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -78,8 +78,8 @@ type PingRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` // Optional message field, can be removed if not needed - Timestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` // Optional message field, can be removed if not needed + Timestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } func (x *PingRequest) Reset() { @@ -121,7 +121,7 @@ func (x *PingRequest) GetMessage() string { return "" } -func (x *PingRequest) GetTimestamp() *timestamppb.Timestamp { +func (x *PingRequest) GetTimestamp() *timestamp.Timestamp { if x != nil { return x.Timestamp } @@ -133,8 +133,8 @@ type PongResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` // Optional message field, can be removed if not needed - Timestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` // Optional message field, can be removed if not needed + Timestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } func (x *PongResponse) Reset() { @@ -176,7 +176,7 @@ func (x *PongResponse) GetMessage() string { return "" } -func (x *PongResponse) GetTimestamp() *timestamppb.Timestamp { +func (x *PongResponse) GetTimestamp() *timestamp.Timestamp { if x != nil { return x.Timestamp } @@ -419,13 +419,13 @@ func file_plug_proto_rawDescGZIP() []byte { var file_plug_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_plug_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_plug_proto_goTypes = []interface{}{ - (PlugTaskState)(0), // 0: PlugTaskState - (*PingRequest)(nil), // 1: PingRequest - (*PongResponse)(nil), // 2: PongResponse - (*PlugTaskStatus)(nil), // 3: PlugTaskStatus - (*PlugTask)(nil), // 4: PlugTask - (*PlugTaskCreation)(nil), // 5: PlugTaskCreation - (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp + (PlugTaskState)(0), // 0: PlugTaskState + (*PingRequest)(nil), // 1: PingRequest + (*PongResponse)(nil), // 2: PongResponse + (*PlugTaskStatus)(nil), // 3: PlugTaskStatus + (*PlugTask)(nil), // 4: PlugTask + (*PlugTaskCreation)(nil), // 5: PlugTaskCreation + (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp } var file_plug_proto_depIdxs = []int32{ 6, // 0: PingRequest.timestamp:type_name -> google.protobuf.Timestamp diff --git a/pkg/grpc/plug_grpc.pb.go b/pkg/grpc/plug_grpc.pb.go index b4dfb18..26b8695 100644 --- a/pkg/grpc/plug_grpc.pb.go +++ b/pkg/grpc/plug_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.19.6 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.12.4 // source: plug.proto package gRPC @@ -18,13 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - PlugConnector_TaskStart_FullMethodName = "/PlugConnector/TaskStart" - PlugConnector_TaskStatus_FullMethodName = "/PlugConnector/TaskStatus" - PlugConnector_TaskCancel_FullMethodName = "/PlugConnector/TaskCancel" - PlugConnector_Ping_FullMethodName = "/PlugConnector/Ping" -) - // PlugConnectorClient is the client API for PlugConnector 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. @@ -45,7 +38,7 @@ func NewPlugConnectorClient(cc grpc.ClientConnInterface) PlugConnectorClient { func (c *plugConnectorClient) TaskStart(ctx context.Context, in *PlugTaskCreation, opts ...grpc.CallOption) (*PlugTaskStatus, error) { out := new(PlugTaskStatus) - err := c.cc.Invoke(ctx, PlugConnector_TaskStart_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PlugConnector/TaskStart", in, out, opts...) if err != nil { return nil, err } @@ -54,7 +47,7 @@ func (c *plugConnectorClient) TaskStart(ctx context.Context, in *PlugTaskCreatio func (c *plugConnectorClient) TaskStatus(ctx context.Context, in *PlugTask, opts ...grpc.CallOption) (*PlugTaskStatus, error) { out := new(PlugTaskStatus) - err := c.cc.Invoke(ctx, PlugConnector_TaskStatus_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PlugConnector/TaskStatus", in, out, opts...) if err != nil { return nil, err } @@ -63,7 +56,7 @@ func (c *plugConnectorClient) TaskStatus(ctx context.Context, in *PlugTask, opts func (c *plugConnectorClient) TaskCancel(ctx context.Context, in *PlugTask, opts ...grpc.CallOption) (*PlugTaskStatus, error) { out := new(PlugTaskStatus) - err := c.cc.Invoke(ctx, PlugConnector_TaskCancel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PlugConnector/TaskCancel", in, out, opts...) if err != nil { return nil, err } @@ -72,7 +65,7 @@ func (c *plugConnectorClient) TaskCancel(ctx context.Context, in *PlugTask, opts func (c *plugConnectorClient) Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PongResponse, error) { out := new(PongResponse) - err := c.cc.Invoke(ctx, PlugConnector_Ping_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PlugConnector/Ping", in, out, opts...) if err != nil { return nil, err } @@ -129,7 +122,7 @@ func _PlugConnector_TaskStart_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PlugConnector_TaskStart_FullMethodName, + FullMethod: "/PlugConnector/TaskStart", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PlugConnectorServer).TaskStart(ctx, req.(*PlugTaskCreation)) @@ -147,7 +140,7 @@ func _PlugConnector_TaskStatus_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PlugConnector_TaskStatus_FullMethodName, + FullMethod: "/PlugConnector/TaskStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PlugConnectorServer).TaskStatus(ctx, req.(*PlugTask)) @@ -165,7 +158,7 @@ func _PlugConnector_TaskCancel_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PlugConnector_TaskCancel_FullMethodName, + FullMethod: "/PlugConnector/TaskCancel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PlugConnectorServer).TaskCancel(ctx, req.(*PlugTask)) @@ -183,7 +176,7 @@ func _PlugConnector_Ping_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PlugConnector_Ping_FullMethodName, + FullMethod: "/PlugConnector/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PlugConnectorServer).Ping(ctx, req.(*PingRequest)) diff --git a/scripts/README.md b/scripts/README.md index c615f7c..73da469 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -7,9 +7,9 @@ To generate the gRPC files you need to do the following: 1. You need to install the [gRPC Compiler](https://grpc.io/docs/protoc-installation/) 2. Install the Golang Plugin for the compiler ````bash - go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - ```` - + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 + `````` ## Generate: 1. Download the Git submodules (if you didn't clone this repo with ``git clone --recurse-submodules``) ```bash