diff --git a/cmd/rove-server/internal/server.go b/cmd/rove-server/internal/server.go index 3e290e3..c63a743 100644 --- a/cmd/rove-server/internal/server.go +++ b/cmd/rove-server/internal/server.go @@ -132,7 +132,7 @@ func (s *Server) Initialise(fillWorld bool) (err error) { log.Fatalf("failed to listen: %v", err) } s.grpcServ = grpc.NewServer() - rove.RegisterRoveServerServer(s.grpcServ, s) + rove.RegisterRoveServer(s.grpcServ, s) return nil } diff --git a/cmd/rove/main.go b/cmd/rove/main.go index 2ecd94f..79ca85c 100644 --- a/cmd/rove/main.go +++ b/cmd/rove/main.go @@ -98,7 +98,7 @@ func InnerMain(command string) error { if err != nil { return err } - var client = rove.NewRoveServerClient(clientConn) + var client = rove.NewRoveClient(clientConn) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() diff --git a/pkg/rove/rove.pb.go b/pkg/rove/rove.pb.go index 1dff955..e0a8cfe 100644 --- a/pkg/rove/rove.pb.go +++ b/pkg/rove/rove.pb.go @@ -651,33 +651,33 @@ var file_rove_rove_proto_rawDesc = []byte{ 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x24, 0x0a, 0x06, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x79, - 0x32, 0xfb, 0x02, 0x0a, 0x0a, 0x52, 0x6f, 0x76, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, - 0x47, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x1a, 0x14, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x09, 0x12, - 0x07, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x4f, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x12, 0x15, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x22, 0x09, 0x2f, 0x72, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x01, 0x2a, 0x12, 0x4f, 0x0a, 0x08, 0x43, 0x6f, 0x6d, - 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x15, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x43, 0x6f, 0x6d, - 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x22, 0x09, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x3a, 0x01, 0x2a, 0x12, 0x40, 0x0a, 0x05, 0x52, 0x61, - 0x64, 0x61, 0x72, 0x12, 0x12, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x61, 0x64, 0x61, 0x72, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, - 0x61, 0x64, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0e, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x08, 0x12, 0x06, 0x2f, 0x72, 0x61, 0x64, 0x61, 0x72, 0x12, 0x40, 0x0a, 0x05, - 0x52, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x12, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x6f, 0x76, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x6f, 0x76, 0x65, - 0x2e, 0x52, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0e, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x08, 0x12, 0x06, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x72, 0x42, 0x21, - 0x5a, 0x1f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x64, 0x69, - 0x6c, 0x75, 0x7a, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x6f, 0x76, - 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x32, 0xf5, 0x02, 0x0a, 0x04, 0x52, 0x6f, 0x76, 0x65, 0x12, 0x47, 0x0a, 0x06, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x14, 0x2e, 0x72, 0x6f, + 0x76, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x0f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x09, 0x12, 0x07, 0x2f, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x12, 0x4f, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x15, + 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x14, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x22, 0x09, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, + 0x3a, 0x01, 0x2a, 0x12, 0x4f, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, + 0x15, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x14, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x22, 0x09, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, + 0x73, 0x3a, 0x01, 0x2a, 0x12, 0x40, 0x0a, 0x05, 0x52, 0x61, 0x64, 0x61, 0x72, 0x12, 0x12, 0x2e, + 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x61, 0x64, 0x61, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x61, 0x64, 0x61, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x08, 0x12, 0x06, + 0x2f, 0x72, 0x61, 0x64, 0x61, 0x72, 0x12, 0x40, 0x0a, 0x05, 0x52, 0x6f, 0x76, 0x65, 0x72, 0x12, + 0x12, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x6f, 0x76, 0x65, 0x2e, 0x52, 0x6f, 0x76, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x08, + 0x12, 0x06, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x72, 0x42, 0x21, 0x5a, 0x1f, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x64, 0x69, 0x6c, 0x75, 0x7a, 0x2f, 0x72, 0x6f, + 0x76, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x6f, 0x76, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -709,16 +709,16 @@ var file_rove_rove_proto_goTypes = []interface{}{ var file_rove_rove_proto_depIdxs = []int32{ 0, // 0: rove.CommandsRequest.commands:type_name -> rove.Command 9, // 1: rove.RoverResponse.position:type_name -> rove.Vector - 10, // 2: rove.RoveServer.Status:input_type -> google.protobuf.Empty - 5, // 3: rove.RoveServer.Register:input_type -> rove.RegisterRequest - 1, // 4: rove.RoveServer.Commands:input_type -> rove.CommandsRequest - 3, // 5: rove.RoveServer.Radar:input_type -> rove.RadarRequest - 6, // 6: rove.RoveServer.Rover:input_type -> rove.RoverRequest - 8, // 7: rove.RoveServer.Status:output_type -> rove.StatusResponse - 10, // 8: rove.RoveServer.Register:output_type -> google.protobuf.Empty - 10, // 9: rove.RoveServer.Commands:output_type -> google.protobuf.Empty - 4, // 10: rove.RoveServer.Radar:output_type -> rove.RadarResponse - 7, // 11: rove.RoveServer.Rover:output_type -> rove.RoverResponse + 10, // 2: rove.Rove.Status:input_type -> google.protobuf.Empty + 5, // 3: rove.Rove.Register:input_type -> rove.RegisterRequest + 1, // 4: rove.Rove.Commands:input_type -> rove.CommandsRequest + 3, // 5: rove.Rove.Radar:input_type -> rove.RadarRequest + 6, // 6: rove.Rove.Rover:input_type -> rove.RoverRequest + 8, // 7: rove.Rove.Status:output_type -> rove.StatusResponse + 10, // 8: rove.Rove.Register:output_type -> google.protobuf.Empty + 10, // 9: rove.Rove.Commands:output_type -> google.protobuf.Empty + 4, // 10: rove.Rove.Radar:output_type -> rove.RadarResponse + 7, // 11: rove.Rove.Rover:output_type -> rove.RoverResponse 7, // [7:12] is the sub-list for method output_type 2, // [2:7] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -881,10 +881,10 @@ var _ grpc.ClientConnInterface // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion6 -// RoveServerClient is the client API for RoveServer service. +// RoveClient is the client API for Rove service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type RoveServerClient interface { +type RoveClient interface { // Server status // // Responds with various details about the current server status @@ -907,61 +907,61 @@ type RoveServerClient interface { Rover(ctx context.Context, in *RoverRequest, opts ...grpc.CallOption) (*RoverResponse, error) } -type roveServerClient struct { +type roveClient struct { cc grpc.ClientConnInterface } -func NewRoveServerClient(cc grpc.ClientConnInterface) RoveServerClient { - return &roveServerClient{cc} +func NewRoveClient(cc grpc.ClientConnInterface) RoveClient { + return &roveClient{cc} } -func (c *roveServerClient) Status(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*StatusResponse, error) { +func (c *roveClient) Status(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*StatusResponse, error) { out := new(StatusResponse) - err := c.cc.Invoke(ctx, "/rove.RoveServer/Status", in, out, opts...) + err := c.cc.Invoke(ctx, "/rove.Rove/Status", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *roveServerClient) Register(ctx context.Context, in *RegisterRequest, opts ...grpc.CallOption) (*empty.Empty, error) { +func (c *roveClient) Register(ctx context.Context, in *RegisterRequest, opts ...grpc.CallOption) (*empty.Empty, error) { out := new(empty.Empty) - err := c.cc.Invoke(ctx, "/rove.RoveServer/Register", in, out, opts...) + err := c.cc.Invoke(ctx, "/rove.Rove/Register", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *roveServerClient) Commands(ctx context.Context, in *CommandsRequest, opts ...grpc.CallOption) (*empty.Empty, error) { +func (c *roveClient) Commands(ctx context.Context, in *CommandsRequest, opts ...grpc.CallOption) (*empty.Empty, error) { out := new(empty.Empty) - err := c.cc.Invoke(ctx, "/rove.RoveServer/Commands", in, out, opts...) + err := c.cc.Invoke(ctx, "/rove.Rove/Commands", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *roveServerClient) Radar(ctx context.Context, in *RadarRequest, opts ...grpc.CallOption) (*RadarResponse, error) { +func (c *roveClient) Radar(ctx context.Context, in *RadarRequest, opts ...grpc.CallOption) (*RadarResponse, error) { out := new(RadarResponse) - err := c.cc.Invoke(ctx, "/rove.RoveServer/Radar", in, out, opts...) + err := c.cc.Invoke(ctx, "/rove.Rove/Radar", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *roveServerClient) Rover(ctx context.Context, in *RoverRequest, opts ...grpc.CallOption) (*RoverResponse, error) { +func (c *roveClient) Rover(ctx context.Context, in *RoverRequest, opts ...grpc.CallOption) (*RoverResponse, error) { out := new(RoverResponse) - err := c.cc.Invoke(ctx, "/rove.RoveServer/Rover", in, out, opts...) + err := c.cc.Invoke(ctx, "/rove.Rove/Rover", in, out, opts...) if err != nil { return nil, err } return out, nil } -// RoveServerServer is the server API for RoveServer service. -type RoveServerServer interface { +// RoveServer is the server API for Rove service. +type RoveServer interface { // Server status // // Responds with various details about the current server status @@ -984,143 +984,143 @@ type RoveServerServer interface { Rover(context.Context, *RoverRequest) (*RoverResponse, error) } -// UnimplementedRoveServerServer can be embedded to have forward compatible implementations. -type UnimplementedRoveServerServer struct { +// UnimplementedRoveServer can be embedded to have forward compatible implementations. +type UnimplementedRoveServer struct { } -func (*UnimplementedRoveServerServer) Status(context.Context, *empty.Empty) (*StatusResponse, error) { +func (*UnimplementedRoveServer) Status(context.Context, *empty.Empty) (*StatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Status not implemented") } -func (*UnimplementedRoveServerServer) Register(context.Context, *RegisterRequest) (*empty.Empty, error) { +func (*UnimplementedRoveServer) Register(context.Context, *RegisterRequest) (*empty.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Register not implemented") } -func (*UnimplementedRoveServerServer) Commands(context.Context, *CommandsRequest) (*empty.Empty, error) { +func (*UnimplementedRoveServer) Commands(context.Context, *CommandsRequest) (*empty.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Commands not implemented") } -func (*UnimplementedRoveServerServer) Radar(context.Context, *RadarRequest) (*RadarResponse, error) { +func (*UnimplementedRoveServer) Radar(context.Context, *RadarRequest) (*RadarResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Radar not implemented") } -func (*UnimplementedRoveServerServer) Rover(context.Context, *RoverRequest) (*RoverResponse, error) { +func (*UnimplementedRoveServer) Rover(context.Context, *RoverRequest) (*RoverResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Rover not implemented") } -func RegisterRoveServerServer(s *grpc.Server, srv RoveServerServer) { - s.RegisterService(&_RoveServer_serviceDesc, srv) +func RegisterRoveServer(s *grpc.Server, srv RoveServer) { + s.RegisterService(&_Rove_serviceDesc, srv) } -func _RoveServer_Status_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Rove_Status_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(empty.Empty) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RoveServerServer).Status(ctx, in) + return srv.(RoveServer).Status(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rove.RoveServer/Status", + FullMethod: "/rove.Rove/Status", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RoveServerServer).Status(ctx, req.(*empty.Empty)) + return srv.(RoveServer).Status(ctx, req.(*empty.Empty)) } return interceptor(ctx, in, info, handler) } -func _RoveServer_Register_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Rove_Register_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RegisterRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RoveServerServer).Register(ctx, in) + return srv.(RoveServer).Register(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rove.RoveServer/Register", + FullMethod: "/rove.Rove/Register", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RoveServerServer).Register(ctx, req.(*RegisterRequest)) + return srv.(RoveServer).Register(ctx, req.(*RegisterRequest)) } return interceptor(ctx, in, info, handler) } -func _RoveServer_Commands_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Rove_Commands_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CommandsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RoveServerServer).Commands(ctx, in) + return srv.(RoveServer).Commands(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rove.RoveServer/Commands", + FullMethod: "/rove.Rove/Commands", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RoveServerServer).Commands(ctx, req.(*CommandsRequest)) + return srv.(RoveServer).Commands(ctx, req.(*CommandsRequest)) } return interceptor(ctx, in, info, handler) } -func _RoveServer_Radar_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Rove_Radar_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RadarRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RoveServerServer).Radar(ctx, in) + return srv.(RoveServer).Radar(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rove.RoveServer/Radar", + FullMethod: "/rove.Rove/Radar", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RoveServerServer).Radar(ctx, req.(*RadarRequest)) + return srv.(RoveServer).Radar(ctx, req.(*RadarRequest)) } return interceptor(ctx, in, info, handler) } -func _RoveServer_Rover_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Rove_Rover_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RoverRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RoveServerServer).Rover(ctx, in) + return srv.(RoveServer).Rover(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rove.RoveServer/Rover", + FullMethod: "/rove.Rove/Rover", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RoveServerServer).Rover(ctx, req.(*RoverRequest)) + return srv.(RoveServer).Rover(ctx, req.(*RoverRequest)) } return interceptor(ctx, in, info, handler) } -var _RoveServer_serviceDesc = grpc.ServiceDesc{ - ServiceName: "rove.RoveServer", - HandlerType: (*RoveServerServer)(nil), +var _Rove_serviceDesc = grpc.ServiceDesc{ + ServiceName: "rove.Rove", + HandlerType: (*RoveServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Status", - Handler: _RoveServer_Status_Handler, + Handler: _Rove_Status_Handler, }, { MethodName: "Register", - Handler: _RoveServer_Register_Handler, + Handler: _Rove_Register_Handler, }, { MethodName: "Commands", - Handler: _RoveServer_Commands_Handler, + Handler: _Rove_Commands_Handler, }, { MethodName: "Radar", - Handler: _RoveServer_Radar_Handler, + Handler: _Rove_Radar_Handler, }, { MethodName: "Rover", - Handler: _RoveServer_Rover_Handler, + Handler: _Rove_Rover_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/pkg/rove/rove.pb.gw.go b/pkg/rove/rove.pb.gw.go index f67af75..cdd011c 100644 --- a/pkg/rove/rove.pb.gw.go +++ b/pkg/rove/rove.pb.gw.go @@ -32,7 +32,7 @@ var _ = runtime.String var _ = utilities.NewDoubleArray var _ = descriptor.ForMessage -func request_RoveServer_Status_0(ctx context.Context, marshaler runtime.Marshaler, client RoveServerClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Rove_Status_0(ctx context.Context, marshaler runtime.Marshaler, client RoveClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq empty.Empty var metadata runtime.ServerMetadata @@ -41,7 +41,7 @@ func request_RoveServer_Status_0(ctx context.Context, marshaler runtime.Marshale } -func local_request_RoveServer_Status_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServerServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Rove_Status_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq empty.Empty var metadata runtime.ServerMetadata @@ -50,7 +50,7 @@ func local_request_RoveServer_Status_0(ctx context.Context, marshaler runtime.Ma } -func request_RoveServer_Register_0(ctx context.Context, marshaler runtime.Marshaler, client RoveServerClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Rove_Register_0(ctx context.Context, marshaler runtime.Marshaler, client RoveClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RegisterRequest var metadata runtime.ServerMetadata @@ -67,7 +67,7 @@ func request_RoveServer_Register_0(ctx context.Context, marshaler runtime.Marsha } -func local_request_RoveServer_Register_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServerServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Rove_Register_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RegisterRequest var metadata runtime.ServerMetadata @@ -84,7 +84,7 @@ func local_request_RoveServer_Register_0(ctx context.Context, marshaler runtime. } -func request_RoveServer_Commands_0(ctx context.Context, marshaler runtime.Marshaler, client RoveServerClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Rove_Commands_0(ctx context.Context, marshaler runtime.Marshaler, client RoveClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq CommandsRequest var metadata runtime.ServerMetadata @@ -101,7 +101,7 @@ func request_RoveServer_Commands_0(ctx context.Context, marshaler runtime.Marsha } -func local_request_RoveServer_Commands_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServerServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Rove_Commands_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq CommandsRequest var metadata runtime.ServerMetadata @@ -119,17 +119,17 @@ func local_request_RoveServer_Commands_0(ctx context.Context, marshaler runtime. } var ( - filter_RoveServer_Radar_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Rove_Radar_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_RoveServer_Radar_0(ctx context.Context, marshaler runtime.Marshaler, client RoveServerClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Rove_Radar_0(ctx context.Context, marshaler runtime.Marshaler, client RoveClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RadarRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RoveServer_Radar_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Rove_Radar_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -138,14 +138,14 @@ func request_RoveServer_Radar_0(ctx context.Context, marshaler runtime.Marshaler } -func local_request_RoveServer_Radar_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServerServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Rove_Radar_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RadarRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RoveServer_Radar_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Rove_Radar_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -155,17 +155,17 @@ func local_request_RoveServer_Radar_0(ctx context.Context, marshaler runtime.Mar } var ( - filter_RoveServer_Rover_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Rove_Rover_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_RoveServer_Rover_0(ctx context.Context, marshaler runtime.Marshaler, client RoveServerClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Rove_Rover_0(ctx context.Context, marshaler runtime.Marshaler, client RoveClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RoverRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RoveServer_Rover_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Rove_Rover_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -174,14 +174,14 @@ func request_RoveServer_Rover_0(ctx context.Context, marshaler runtime.Marshaler } -func local_request_RoveServer_Rover_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServerServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Rove_Rover_0(ctx context.Context, marshaler runtime.Marshaler, server RoveServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq RoverRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RoveServer_Rover_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Rove_Rover_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -190,12 +190,12 @@ func local_request_RoveServer_Rover_0(ctx context.Context, marshaler runtime.Mar } -// RegisterRoveServerHandlerServer registers the http handlers for service RoveServer to "mux". -// UnaryRPC :call RoveServerServer directly. +// RegisterRoveHandlerServer registers the http handlers for service Rove to "mux". +// UnaryRPC :call RoveServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, server RoveServerServer) error { +func RegisterRoveHandlerServer(ctx context.Context, mux *runtime.ServeMux, server RoveServer) error { - mux.Handle("GET", pattern_RoveServer_Status_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Status_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -204,18 +204,18 @@ func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_RoveServer_Status_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Rove_Status_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Status_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Status_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("POST", pattern_RoveServer_Register_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_Rove_Register_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -224,18 +224,18 @@ func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_RoveServer_Register_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Rove_Register_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Register_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Register_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("POST", pattern_RoveServer_Commands_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_Rove_Commands_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -244,18 +244,18 @@ func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_RoveServer_Commands_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Rove_Commands_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Commands_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Commands_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_RoveServer_Radar_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Radar_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -264,18 +264,18 @@ func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_RoveServer_Radar_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Rove_Radar_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Radar_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Radar_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_RoveServer_Rover_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Rover_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -284,23 +284,23 @@ func RegisterRoveServerHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_RoveServer_Rover_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Rove_Rover_0(rctx, inboundMarshaler, server, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Rover_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Rover_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) return nil } -// RegisterRoveServerHandlerFromEndpoint is same as RegisterRoveServerHandler but +// RegisterRoveHandlerFromEndpoint is same as RegisterRoveHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterRoveServerHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { +func RegisterRoveHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err @@ -320,23 +320,23 @@ func RegisterRoveServerHandlerFromEndpoint(ctx context.Context, mux *runtime.Ser }() }() - return RegisterRoveServerHandler(ctx, mux, conn) + return RegisterRoveHandler(ctx, mux, conn) } -// RegisterRoveServerHandler registers the http handlers for service RoveServer to "mux". +// RegisterRoveHandler registers the http handlers for service Rove to "mux". // The handlers forward requests to the grpc endpoint over "conn". -func RegisterRoveServerHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - return RegisterRoveServerHandlerClient(ctx, mux, NewRoveServerClient(conn)) +func RegisterRoveHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterRoveHandlerClient(ctx, mux, NewRoveClient(conn)) } -// RegisterRoveServerHandlerClient registers the http handlers for service RoveServer -// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "RoveServerClient". -// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "RoveServerClient" +// RegisterRoveHandlerClient registers the http handlers for service Rove +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "RoveClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "RoveClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "RoveServerClient" to call the correct interceptors. -func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, client RoveServerClient) error { +// "RoveClient" to call the correct interceptors. +func RegisterRoveHandlerClient(ctx context.Context, mux *runtime.ServeMux, client RoveClient) error { - mux.Handle("GET", pattern_RoveServer_Status_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Status_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -345,18 +345,18 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_RoveServer_Status_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Rove_Status_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Status_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Status_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("POST", pattern_RoveServer_Register_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_Rove_Register_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -365,18 +365,18 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_RoveServer_Register_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Rove_Register_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Register_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Register_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("POST", pattern_RoveServer_Commands_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_Rove_Commands_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -385,18 +385,18 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_RoveServer_Commands_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Rove_Commands_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Commands_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Commands_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_RoveServer_Radar_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Radar_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -405,18 +405,18 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_RoveServer_Radar_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Rove_Radar_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Radar_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Radar_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_RoveServer_Rover_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Rove_Rover_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -425,14 +425,14 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_RoveServer_Rover_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Rove_Rover_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_RoveServer_Rover_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Rove_Rover_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -440,25 +440,25 @@ func RegisterRoveServerHandlerClient(ctx context.Context, mux *runtime.ServeMux, } var ( - pattern_RoveServer_Status_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"status"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Rove_Status_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"status"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_RoveServer_Register_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"register"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Rove_Register_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"register"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_RoveServer_Commands_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"commands"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Rove_Commands_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"commands"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_RoveServer_Radar_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"radar"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Rove_Radar_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"radar"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_RoveServer_Rover_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"rover"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Rove_Rover_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"rover"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( - forward_RoveServer_Status_0 = runtime.ForwardResponseMessage + forward_Rove_Status_0 = runtime.ForwardResponseMessage - forward_RoveServer_Register_0 = runtime.ForwardResponseMessage + forward_Rove_Register_0 = runtime.ForwardResponseMessage - forward_RoveServer_Commands_0 = runtime.ForwardResponseMessage + forward_Rove_Commands_0 = runtime.ForwardResponseMessage - forward_RoveServer_Radar_0 = runtime.ForwardResponseMessage + forward_Rove_Radar_0 = runtime.ForwardResponseMessage - forward_RoveServer_Rover_0 = runtime.ForwardResponseMessage + forward_Rove_Rover_0 = runtime.ForwardResponseMessage ) diff --git a/proto/rove/rove.proto b/proto/rove/rove.proto index 9546d52..c400cb8 100644 --- a/proto/rove/rove.proto +++ b/proto/rove/rove.proto @@ -7,7 +7,7 @@ option go_package = "github.com/mdiluz/rove/pkg/rove"; import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; -service RoveServer { +service Rove { // Server status // // Responds with various details about the current server status