From 9e6db79860e77bee754d4fbbc57413608b3c2b2e Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 30 Mar 2020 23:58:32 +0300 Subject: [PATCH] regenerate all proto (#1440) * regenerate all proto Signed-off-by: Vasiliy Tolstov * regenerate from proto Signed-off-by: Vasiliy Tolstov * regenerate from proto Signed-off-by: Vasiliy Tolstov --- .github/generate.sh | 9 + agent/proto/bot.pb.go | 167 ++++- agent/proto/bot.pb.micro.go | 8 +- api/proto/api.pb.go | 69 +- api/proto/api.pb.micro.go | 2 +- api/service/proto/api.pb.go | 159 ++++- api/service/proto/api.pb.micro.go | 2 +- auth/service/proto/accounts.pb.go | 117 +++- auth/service/proto/accounts.pb.micro.go | 2 +- auth/service/proto/accounts.proto | 2 +- auth/service/proto/auth.pb.go | 267 ++++++-- auth/service/proto/auth.pb.micro.go | 2 +- auth/service/proto/rules.pb.go | 225 +++++-- auth/service/proto/rules.pb.micro.go | 2 +- auth/service/proto/rules.proto | 2 +- broker/service/proto/broker.pb.go | 203 +++++- broker/service/proto/broker.pb.micro.go | 18 +- client/service/proto/client.pb.go | 244 ++++++- client/service/proto/client.pb.micro.go | 18 +- codec/protorpc/envelope.pb.go | 131 ++-- codec/protorpc/envelope.pb.micro.go | 21 + codec/protorpc/envelope.proto | 12 +- codec/protorpc/protorpc.go | 8 +- config/source/service/proto/service.pb.go | 387 ++++++++++-- .../source/service/proto/service.pb.micro.go | 2 +- debug/service/proto/debug.pb.go | 324 ++++++++-- debug/service/proto/debug.pb.micro.go | 2 +- errors/errors.pb.go | 26 +- errors/errors.pb.micro.go | 21 + generate.go | 3 + go.mod | 1 + go.sum | 4 + network/service/proto/network.pb.go | 413 ++++++++++-- network/service/proto/network.pb.micro.go | 8 +- network/service/proto/network.proto | 2 +- registry/service/proto/registry.pb.go | 374 +++++++++-- registry/service/proto/registry.pb.micro.go | 18 +- router/service/proto/router.pb.go | 593 ++++++++++++++++-- router/service/proto/router.pb.micro.go | 36 +- router/service/proto/router.proto | 115 ++-- runtime/service/proto/runtime.pb.go | 335 ++++++++-- runtime/service/proto/runtime.pb.micro.go | 2 +- server/grpc/proto/test.pb.go | 44 +- .../proto/{test.micro.go => test.pb.micro.go} | 8 +- server/proto/server.pb.go | 165 ++++- server/proto/server.pb.micro.go | 8 +- service/grpc/proto/test.pb.go | 44 +- .../proto/{test.micro.go => test.pb.micro.go} | 8 +- store/etcd/config.go | 2 +- store/service/proto/store.pb.go | 313 +++++++-- store/service/proto/store.pb.micro.go | 2 +- transport/grpc/proto/transport.pb.go | 60 +- ...ansport.micro.go => transport.pb.micro.go} | 20 +- transport/grpc/proto/transport.proto | 2 +- 54 files changed, 4106 insertions(+), 926 deletions(-) create mode 100755 .github/generate.sh create mode 100644 codec/protorpc/envelope.pb.micro.go create mode 100644 errors/errors.pb.micro.go create mode 100644 generate.go rename server/grpc/proto/{test.micro.go => test.pb.micro.go} (93%) rename service/grpc/proto/{test.micro.go => test.pb.micro.go} (93%) rename transport/grpc/proto/{transport.micro.go => transport.pb.micro.go} (92%) diff --git a/.github/generate.sh b/.github/generate.sh new file mode 100755 index 00000000..059277a9 --- /dev/null +++ b/.github/generate.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e + +find . -type f -name '*.pb.*.go' -o -name '*.pb.go' -a ! -name 'message.pb.go' -delete +PROTOS=$(find . -type f -name '*.proto') + +for PROTO in $PROTOS; do + echo $PROTO + protoc -I./ -I$(dirname $PROTO) --go_out=plugins=grpc,paths=source_relative:. --micro_out=paths=source_relative:. $PROTO +done diff --git a/agent/proto/bot.pb.go b/agent/proto/bot.pb.go index db35f945..10fde8f6 100644 --- a/agent/proto/bot.pb.go +++ b/agent/proto/bot.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/agent/proto/bot.proto +// source: agent/proto/bot.proto package go_micro_bot import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -30,7 +34,7 @@ func (m *HelpRequest) Reset() { *m = HelpRequest{} } func (m *HelpRequest) String() string { return proto.CompactTextString(m) } func (*HelpRequest) ProtoMessage() {} func (*HelpRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_018e8d5b14a89d12, []int{0} + return fileDescriptor_79b974b8c77805fa, []int{0} } func (m *HelpRequest) XXX_Unmarshal(b []byte) error { @@ -63,7 +67,7 @@ func (m *HelpResponse) Reset() { *m = HelpResponse{} } func (m *HelpResponse) String() string { return proto.CompactTextString(m) } func (*HelpResponse) ProtoMessage() {} func (*HelpResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_018e8d5b14a89d12, []int{1} + return fileDescriptor_79b974b8c77805fa, []int{1} } func (m *HelpResponse) XXX_Unmarshal(b []byte) error { @@ -109,7 +113,7 @@ func (m *ExecRequest) Reset() { *m = ExecRequest{} } func (m *ExecRequest) String() string { return proto.CompactTextString(m) } func (*ExecRequest) ProtoMessage() {} func (*ExecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_018e8d5b14a89d12, []int{2} + return fileDescriptor_79b974b8c77805fa, []int{2} } func (m *ExecRequest) XXX_Unmarshal(b []byte) error { @@ -149,7 +153,7 @@ func (m *ExecResponse) Reset() { *m = ExecResponse{} } func (m *ExecResponse) String() string { return proto.CompactTextString(m) } func (*ExecResponse) ProtoMessage() {} func (*ExecResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_018e8d5b14a89d12, []int{3} + return fileDescriptor_79b974b8c77805fa, []int{3} } func (m *ExecResponse) XXX_Unmarshal(b []byte) error { @@ -191,26 +195,139 @@ func init() { proto.RegisterType((*ExecResponse)(nil), "go.micro.bot.ExecResponse") } -func init() { - proto.RegisterFile("github.com/micro/go-micro/v2/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12) +func init() { proto.RegisterFile("agent/proto/bot.proto", fileDescriptor_79b974b8c77805fa) } + +var fileDescriptor_79b974b8c77805fa = []byte{ + // 234 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x3f, 0x4f, 0xc3, 0x30, + 0x10, 0xc5, 0x1b, 0x28, 0x45, 0xbd, 0x84, 0xc5, 0x02, 0x14, 0x3a, 0x05, 0x4f, 0x9d, 0x5c, 0x09, + 0x56, 0x24, 0x06, 0x04, 0x62, 0xce, 0x37, 0x48, 0xd2, 0x53, 0x14, 0xa9, 0xf1, 0x99, 0xb3, 0x23, + 0xf1, 0x1d, 0xf8, 0xd2, 0xc8, 0x7f, 0x06, 0xab, 0xea, 0x76, 0xcf, 0x67, 0xbd, 0xf7, 0x7b, 0x07, + 0x0f, 0xdd, 0x88, 0xda, 0x1d, 0x0c, 0x93, 0xa3, 0x43, 0x4f, 0x4e, 0x85, 0x49, 0x54, 0x23, 0xa9, + 0x79, 0x1a, 0x98, 0x54, 0x4f, 0x4e, 0xde, 0x41, 0xf9, 0x8d, 0x27, 0xd3, 0xe2, 0xcf, 0x82, 0xd6, + 0xc9, 0x2f, 0xa8, 0xa2, 0xb4, 0x86, 0xb4, 0x45, 0x71, 0x0f, 0x37, 0x8b, 0xed, 0x46, 0xac, 0x8b, + 0xa6, 0xd8, 0x6f, 0xdb, 0x28, 0x44, 0x03, 0xe5, 0x11, 0xed, 0xc0, 0x93, 0x71, 0x13, 0xe9, 0xfa, + 0x2a, 0xec, 0xf2, 0x27, 0xf9, 0x0c, 0xe5, 0xe7, 0x2f, 0x0e, 0xc9, 0x56, 0x08, 0x58, 0x77, 0x3c, + 0xda, 0xba, 0x68, 0xae, 0xf7, 0xdb, 0x36, 0xcc, 0xf2, 0x0d, 0xaa, 0xf8, 0x25, 0x45, 0x3d, 0xc2, + 0x86, 0xd1, 0x2e, 0x27, 0x17, 0xb2, 0xaa, 0x36, 0x29, 0x8f, 0x80, 0xcc, 0xc4, 0x29, 0x26, 0x8a, + 0x97, 0xbf, 0x02, 0x6e, 0x3f, 0x68, 0x9e, 0x3b, 0x7d, 0x14, 0xef, 0xb0, 0xf6, 0xd0, 0xe2, 0x49, + 0xe5, 0xd5, 0x54, 0xd6, 0x6b, 0xb7, 0xbb, 0xb4, 0x8a, 0xc1, 0x72, 0xe5, 0x0d, 0x3c, 0xca, 0xb9, + 0x41, 0xd6, 0xe0, 0xdc, 0x20, 0x27, 0x97, 0xab, 0x7e, 0x13, 0x4e, 0xfb, 0xfa, 0x1f, 0x00, 0x00, + 0xff, 0xff, 0xe8, 0x08, 0x5e, 0xad, 0x73, 0x01, 0x00, 0x00, } -var fileDescriptor_018e8d5b14a89d12 = []byte{ - // 246 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x50, 0x4d, 0x4b, 0xc4, 0x30, - 0x10, 0xdd, 0xea, 0xba, 0xb2, 0xd3, 0x7a, 0x09, 0x22, 0x75, 0x4f, 0x35, 0xa7, 0xbd, 0x98, 0x80, - 0x5e, 0x05, 0x0f, 0xa2, 0x78, 0xee, 0x3f, 0x68, 0xbb, 0x43, 0x2c, 0x6c, 0x3b, 0x35, 0x99, 0x82, - 0xff, 0xc1, 0x3f, 0x2d, 0x4d, 0x72, 0x08, 0xc5, 0xdb, 0x7b, 0x79, 0xe1, 0x7d, 0x0c, 0x68, 0xd3, - 0xf3, 0xd7, 0xdc, 0xaa, 0x8e, 0x06, 0x3d, 0xf4, 0x9d, 0x25, 0x6d, 0xe8, 0x31, 0x80, 0xc6, 0xe0, - 0xc8, 0x7a, 0xb2, 0xc4, 0xa4, 0x5b, 0x62, 0xe5, 0x91, 0x28, 0x0c, 0x29, 0xaf, 0xab, 0x96, 0x58, - 0xde, 0x40, 0xfe, 0x89, 0xe7, 0xa9, 0xc6, 0xef, 0x19, 0x1d, 0xcb, 0x0f, 0x28, 0x02, 0x75, 0x13, - 0x8d, 0x0e, 0xc5, 0x2d, 0x5c, 0xcd, 0xae, 0x31, 0x58, 0x66, 0x55, 0x76, 0xdc, 0xd7, 0x81, 0x88, - 0x0a, 0xf2, 0x13, 0xba, 0xce, 0xf6, 0x13, 0xf7, 0x34, 0x96, 0x17, 0x5e, 0x4b, 0x9f, 0xe4, 0x03, - 0xe4, 0xef, 0x3f, 0xd8, 0x45, 0x5b, 0x21, 0x60, 0xdb, 0x58, 0xe3, 0xca, 0xac, 0xba, 0x3c, 0xee, - 0x6b, 0x8f, 0xe5, 0x0b, 0x14, 0xe1, 0x4b, 0x8c, 0xba, 0x83, 0x9d, 0x45, 0x37, 0x9f, 0xd9, 0x67, - 0x15, 0x75, 0x64, 0x4b, 0x05, 0xb4, 0x96, 0x6c, 0x8c, 0x09, 0xe4, 0xe9, 0x37, 0x83, 0xeb, 0x37, - 0x1a, 0x86, 0x66, 0x3c, 0x89, 0x57, 0xd8, 0x2e, 0xa5, 0xc5, 0xbd, 0x4a, 0xa7, 0xa9, 0x64, 0xd7, - 0xe1, 0xf0, 0x9f, 0x14, 0x82, 0xe5, 0x66, 0x31, 0x58, 0xaa, 0xac, 0x0d, 0x92, 0x05, 0x6b, 0x83, - 0xb4, 0xb9, 0xdc, 0xb4, 0x3b, 0x7f, 0xda, 0xe7, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0xbd, - 0x39, 0x29, 0x8d, 0x01, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// CommandClient is the client API for Command service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type CommandClient interface { + Help(ctx context.Context, in *HelpRequest, opts ...grpc.CallOption) (*HelpResponse, error) + Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error) +} + +type commandClient struct { + cc *grpc.ClientConn +} + +func NewCommandClient(cc *grpc.ClientConn) CommandClient { + return &commandClient{cc} +} + +func (c *commandClient) Help(ctx context.Context, in *HelpRequest, opts ...grpc.CallOption) (*HelpResponse, error) { + out := new(HelpResponse) + err := c.cc.Invoke(ctx, "/go.micro.bot.Command/Help", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *commandClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error) { + out := new(ExecResponse) + err := c.cc.Invoke(ctx, "/go.micro.bot.Command/Exec", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// CommandServer is the server API for Command service. +type CommandServer interface { + Help(context.Context, *HelpRequest) (*HelpResponse, error) + Exec(context.Context, *ExecRequest) (*ExecResponse, error) +} + +// UnimplementedCommandServer can be embedded to have forward compatible implementations. +type UnimplementedCommandServer struct { +} + +func (*UnimplementedCommandServer) Help(ctx context.Context, req *HelpRequest) (*HelpResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Help not implemented") +} +func (*UnimplementedCommandServer) Exec(ctx context.Context, req *ExecRequest) (*ExecResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Exec not implemented") +} + +func RegisterCommandServer(s *grpc.Server, srv CommandServer) { + s.RegisterService(&_Command_serviceDesc, srv) +} + +func _Command_Help_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(HelpRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommandServer).Help(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.bot.Command/Help", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommandServer).Help(ctx, req.(*HelpRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Command_Exec_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ExecRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(CommandServer).Exec(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.bot.Command/Exec", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(CommandServer).Exec(ctx, req.(*ExecRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Command_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.bot.Command", + HandlerType: (*CommandServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Help", + Handler: _Command_Help_Handler, + }, + { + MethodName: "Exec", + Handler: _Command_Exec_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "agent/proto/bot.proto", } diff --git a/agent/proto/bot.pb.micro.go b/agent/proto/bot.pb.micro.go index 61e678db..60338cda 100644 --- a/agent/proto/bot.pb.micro.go +++ b/agent/proto/bot.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/agent/proto/bot.proto +// source: agent/proto/bot.proto package go_micro_bot @@ -44,12 +44,6 @@ type commandService struct { } func NewCommandService(name string, c client.Client) CommandService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.bot" - } return &commandService{ c: c, name: name, diff --git a/api/proto/api.pb.go b/api/proto/api.pb.go index b9dba1fb..e5d88473 100644 --- a/api/proto/api.pb.go +++ b/api/proto/api.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/api/proto/api.proto +// source: api/proto/api.proto package go_api @@ -32,7 +32,7 @@ func (m *Pair) Reset() { *m = Pair{} } func (m *Pair) String() string { return proto.CompactTextString(m) } func (*Pair) ProtoMessage() {} func (*Pair) Descriptor() ([]byte, []int) { - return fileDescriptor_7b6696ef87ec1943, []int{0} + return fileDescriptor_2df576b66d12087a, []int{0} } func (m *Pair) XXX_Unmarshal(b []byte) error { @@ -86,7 +86,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_7b6696ef87ec1943, []int{1} + return fileDescriptor_2df576b66d12087a, []int{1} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -171,7 +171,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_7b6696ef87ec1943, []int{2} + return fileDescriptor_2df576b66d12087a, []int{2} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -235,7 +235,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_7b6696ef87ec1943, []int{3} + return fileDescriptor_2df576b66d12087a, []int{3} } func (m *Event) XXX_Unmarshal(b []byte) error { @@ -303,36 +303,33 @@ func init() { proto.RegisterMapType((map[string]*Pair)(nil), "go.api.Event.HeaderEntry") } -func init() { - proto.RegisterFile("github.com/micro/go-micro/v2/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943) -} +func init() { proto.RegisterFile("api/proto/api.proto", fileDescriptor_2df576b66d12087a) } -var fileDescriptor_7b6696ef87ec1943 = []byte{ - // 408 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x4d, 0x8f, 0xd3, 0x30, - 0x10, 0x55, 0xe2, 0x24, 0xbb, 0x99, 0x22, 0x84, 0x7c, 0x40, 0x66, 0x59, 0xa1, 0x2a, 0xa7, 0x0a, - 0xa9, 0x29, 0xec, 0x72, 0x40, 0x5c, 0xa1, 0x5a, 0x8e, 0x2b, 0xff, 0x03, 0x77, 0x63, 0x25, 0x16, - 0x4d, 0x1c, 0x62, 0xa7, 0x52, 0x7f, 0x1c, 0x07, 0x7e, 0x06, 0xff, 0x06, 0x79, 0xec, 0x7e, 0x50, - 0x95, 0x0b, 0xf4, 0xf6, 0x62, 0xbf, 0x79, 0xf3, 0xe6, 0x8d, 0x03, 0xf3, 0x5a, 0xd9, 0x66, 0x5c, - 0x95, 0x4f, 0xba, 0x5d, 0xb4, 0xea, 0x69, 0xd0, 0x8b, 0x5a, 0xcf, 0x3d, 0x10, 0xbd, 0x5a, 0xf4, - 0x83, 0xb6, 0x88, 0x4a, 0x44, 0x34, 0xab, 0x75, 0x29, 0x7a, 0x55, 0xbc, 0x83, 0xe4, 0x51, 0xa8, - 0x81, 0xbe, 0x00, 0xf2, 0x4d, 0x6e, 0x59, 0x34, 0x8d, 0x66, 0x39, 0x77, 0x90, 0xbe, 0x84, 0x6c, - 0x23, 0xd6, 0xa3, 0x34, 0x2c, 0x9e, 0x92, 0x59, 0xce, 0xc3, 0x57, 0xf1, 0x93, 0xc0, 0x15, 0x97, - 0xdf, 0x47, 0x69, 0xac, 0xe3, 0xb4, 0xd2, 0x36, 0xba, 0x0a, 0x85, 0xe1, 0x8b, 0x52, 0x48, 0x7a, - 0x61, 0x1b, 0x16, 0xe3, 0x29, 0x62, 0x7a, 0x0f, 0x59, 0x23, 0x45, 0x25, 0x07, 0x46, 0xa6, 0x64, - 0x36, 0xb9, 0x7b, 0x5d, 0x7a, 0x0b, 0x65, 0x10, 0x2b, 0xbf, 0xe2, 0xed, 0xb2, 0xb3, 0xc3, 0x96, - 0x07, 0x2a, 0x7d, 0x0b, 0xa4, 0x96, 0x96, 0x25, 0x58, 0xc1, 0x4e, 0x2b, 0x1e, 0xa4, 0xf5, 0x74, - 0x47, 0xa2, 0x73, 0x48, 0x7a, 0x6d, 0x2c, 0x4b, 0x91, 0xfc, 0xea, 0x94, 0xfc, 0xa8, 0x4d, 0x60, - 0x23, 0xcd, 0x79, 0x5c, 0xe9, 0x6a, 0xcb, 0x32, 0xef, 0xd1, 0x61, 0x97, 0xc2, 0x38, 0xac, 0xd9, - 0x95, 0x4f, 0x61, 0x1c, 0xd6, 0x37, 0x0f, 0x30, 0x39, 0xf2, 0x75, 0x26, 0xa6, 0x02, 0x52, 0x0c, - 0x06, 0x67, 0x9d, 0xdc, 0x3d, 0xdb, 0xb5, 0x75, 0xa9, 0x72, 0x7f, 0xf5, 0x29, 0xfe, 0x18, 0xdd, - 0x7c, 0x81, 0xeb, 0x9d, 0xdd, 0xff, 0x50, 0x59, 0x42, 0xbe, 0x9f, 0xe3, 0xdf, 0x65, 0x8a, 0x1f, - 0x11, 0x5c, 0x73, 0x69, 0x7a, 0xdd, 0x19, 0x49, 0xdf, 0x00, 0x18, 0x2b, 0xec, 0x68, 0x3e, 0xeb, - 0x4a, 0xa2, 0x5a, 0xca, 0x8f, 0x4e, 0xe8, 0x87, 0xfd, 0xe2, 0x62, 0x4c, 0xf6, 0xf6, 0x90, 0xac, - 0x57, 0x38, 0xbb, 0xb9, 0x5d, 0xbc, 0xe4, 0x10, 0xef, 0xc5, 0xc2, 0x2c, 0x7e, 0x45, 0x90, 0x2e, - 0x37, 0xb2, 0xc3, 0x2d, 0x76, 0xa2, 0x95, 0x41, 0x04, 0x31, 0x7d, 0x0e, 0xb1, 0xaa, 0xc2, 0xdb, - 0x8b, 0x55, 0x45, 0x6f, 0x21, 0xb7, 0xaa, 0x95, 0xc6, 0x8a, 0xb6, 0x47, 0x3f, 0x84, 0x1f, 0x0e, - 0xe8, 0xfb, 0xfd, 0x78, 0xc9, 0x9f, 0x0f, 0x07, 0x1b, 0xfc, 0x6d, 0xb6, 0x4a, 0x58, 0xc1, 0x52, - 0xdf, 0xd4, 0xe1, 0x8b, 0xcd, 0xb6, 0xca, 0xf0, 0x07, 0xbd, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, - 0x97, 0xf3, 0x59, 0x6e, 0xd1, 0x03, 0x00, 0x00, +var fileDescriptor_2df576b66d12087a = []byte{ + // 393 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0xce, 0xd3, 0x30, + 0x10, 0x54, 0xe2, 0x24, 0x6d, 0xb6, 0x08, 0x21, 0x23, 0x21, 0x53, 0x2a, 0x54, 0xe5, 0x54, 0x21, + 0x91, 0x42, 0xcb, 0x01, 0x71, 0x85, 0xaa, 0x1c, 0x2b, 0xbf, 0x81, 0xab, 0x58, 0x6d, 0x44, 0x13, + 0x9b, 0xd8, 0xa9, 0xd4, 0x87, 0xe3, 0xc0, 0x63, 0xf0, 0x36, 0xc8, 0x1b, 0xf7, 0xe7, 0xab, 0xfa, + 0x5d, 0xbe, 0xaf, 0xb7, 0x89, 0x3d, 0x3b, 0x3b, 0x3b, 0xeb, 0xc0, 0x6b, 0xa1, 0xcb, 0xa9, 0x6e, + 0x94, 0x55, 0x53, 0xa1, 0xcb, 0x1c, 0x11, 0x4d, 0x36, 0x2a, 0x17, 0xba, 0xcc, 0x3e, 0x41, 0xb4, + 0x12, 0x65, 0x43, 0x5f, 0x01, 0xf9, 0x25, 0x0f, 0x2c, 0x18, 0x07, 0x93, 0x94, 0x3b, 0x48, 0xdf, + 0x40, 0xb2, 0x17, 0xbb, 0x56, 0x1a, 0x16, 0x8e, 0xc9, 0x24, 0xe5, 0xfe, 0x2b, 0xfb, 0x4b, 0xa0, + 0xc7, 0xe5, 0xef, 0x56, 0x1a, 0xeb, 0x38, 0x95, 0xb4, 0x5b, 0x55, 0xf8, 0x42, 0xff, 0x45, 0x29, + 0x44, 0x5a, 0xd8, 0x2d, 0x0b, 0xf1, 0x14, 0x31, 0x9d, 0x43, 0xb2, 0x95, 0xa2, 0x90, 0x0d, 0x23, + 0x63, 0x32, 0x19, 0xcc, 0xde, 0xe5, 0x9d, 0x85, 0xdc, 0x8b, 0xe5, 0x3f, 0xf1, 0x76, 0x51, 0xdb, + 0xe6, 0xc0, 0x3d, 0x95, 0x7e, 0x00, 0xb2, 0x91, 0x96, 0x45, 0x58, 0xc1, 0xae, 0x2b, 0x96, 0xd2, + 0x76, 0x74, 0x47, 0xa2, 0x1f, 0x21, 0xd2, 0xca, 0x58, 0x16, 0x23, 0xf9, 0xed, 0x35, 0x79, 0xa5, + 0x8c, 0x67, 0x23, 0xcd, 0x79, 0x5c, 0xab, 0xe2, 0xc0, 0x92, 0xce, 0xa3, 0xc3, 0x2e, 0x85, 0xb6, + 0xd9, 0xb1, 0x5e, 0x97, 0x42, 0xdb, 0xec, 0x86, 0x4b, 0x18, 0x5c, 0xf8, 0xba, 0x11, 0x53, 0x06, + 0x31, 0x06, 0x83, 0xb3, 0x0e, 0x66, 0x2f, 0x8e, 0x6d, 0x5d, 0xaa, 0xbc, 0xbb, 0xfa, 0x16, 0x7e, + 0x0d, 0x86, 0x3f, 0xa0, 0x7f, 0xb4, 0xfb, 0x0c, 0x95, 0x05, 0xa4, 0xa7, 0x39, 0x9e, 0x2e, 0x93, + 0xfd, 0x09, 0xa0, 0xcf, 0xa5, 0xd1, 0xaa, 0x36, 0x92, 0xbe, 0x07, 0x30, 0x56, 0xd8, 0xd6, 0x7c, + 0x57, 0x85, 0x44, 0xb5, 0x98, 0x5f, 0x9c, 0xd0, 0x2f, 0xa7, 0xc5, 0x85, 0x98, 0xec, 0xe8, 0x9c, + 0x6c, 0xa7, 0x70, 0x73, 0x73, 0xc7, 0x78, 0xc9, 0x39, 0xde, 0xbb, 0x85, 0x99, 0xfd, 0x0b, 0x20, + 0x5e, 0xec, 0x65, 0x8d, 0x5b, 0xac, 0x45, 0x25, 0xbd, 0x08, 0x62, 0xfa, 0x12, 0xc2, 0xb2, 0xf0, + 0x6f, 0x2f, 0x2c, 0x0b, 0x3a, 0x82, 0xd4, 0x96, 0x95, 0x34, 0x56, 0x54, 0x1a, 0xfd, 0x10, 0x7e, + 0x3e, 0xa0, 0x9f, 0x4f, 0xe3, 0x45, 0x0f, 0x1f, 0x0e, 0x36, 0x78, 0x6c, 0xb6, 0x42, 0x58, 0xc1, + 0xe2, 0xae, 0xa9, 0xc3, 0x77, 0x9b, 0x6d, 0x9d, 0xe0, 0x0f, 0x3a, 0xff, 0x1f, 0x00, 0x00, 0xff, + 0xff, 0xd4, 0x6d, 0x70, 0x51, 0xb7, 0x03, 0x00, 0x00, } diff --git a/api/proto/api.pb.micro.go b/api/proto/api.pb.micro.go index 494a7ce5..9b91e09d 100644 --- a/api/proto/api.pb.micro.go +++ b/api/proto/api.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/api/proto/api.proto +// source: api/proto/api.proto package go_api diff --git a/api/service/proto/api.pb.go b/api/service/proto/api.pb.go index b643fd79..7cdff499 100644 --- a/api/service/proto/api.pb.go +++ b/api/service/proto/api.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: api.proto +// source: api/service/proto/api.proto package go_micro_api import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -35,7 +39,7 @@ func (m *Endpoint) Reset() { *m = Endpoint{} } func (m *Endpoint) String() string { return proto.CompactTextString(m) } func (*Endpoint) ProtoMessage() {} func (*Endpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{0} + return fileDescriptor_c4a48b6b680b5c31, []int{0} } func (m *Endpoint) XXX_Unmarshal(b []byte) error { @@ -101,7 +105,7 @@ func (m *EmptyResponse) Reset() { *m = EmptyResponse{} } func (m *EmptyResponse) String() string { return proto.CompactTextString(m) } func (*EmptyResponse) ProtoMessage() {} func (*EmptyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{1} + return fileDescriptor_c4a48b6b680b5c31, []int{1} } func (m *EmptyResponse) XXX_Unmarshal(b []byte) error { @@ -127,23 +131,138 @@ func init() { proto.RegisterType((*EmptyResponse)(nil), "go.micro.api.EmptyResponse") } -func init() { - proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) +func init() { proto.RegisterFile("api/service/proto/api.proto", fileDescriptor_c4a48b6b680b5c31) } + +var fileDescriptor_c4a48b6b680b5c31 = []byte{ + // 212 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0xd0, 0xc1, 0x4a, 0x03, 0x31, + 0x10, 0x80, 0x61, 0xd7, 0xad, 0x65, 0x1d, 0x14, 0x21, 0x87, 0x12, 0xec, 0x65, 0xd9, 0x53, 0x4f, + 0x59, 0xd0, 0x27, 0x28, 0xda, 0x17, 0xd8, 0x37, 0x88, 0xed, 0xd0, 0x9d, 0x43, 0x32, 0x43, 0x32, + 0x14, 0x7c, 0x08, 0xdf, 0x59, 0x12, 0x2b, 0x2c, 0x5e, 0xbd, 0xfd, 0xf3, 0x1d, 0x86, 0x61, 0x60, + 0xeb, 0x85, 0xc6, 0x8c, 0xe9, 0x42, 0x47, 0x1c, 0x25, 0xb1, 0xf2, 0xe8, 0x85, 0x5c, 0x2d, 0xf3, + 0x70, 0x66, 0x17, 0xe8, 0x98, 0xd8, 0x79, 0xa1, 0xe1, 0x02, 0xdd, 0x21, 0x9e, 0x84, 0x29, 0xaa, + 0x31, 0xb0, 0x8a, 0x3e, 0xa0, 0x6d, 0xfa, 0x66, 0x77, 0x3f, 0xd5, 0x2e, 0x36, 0x73, 0x56, 0x7b, + 0xdb, 0xb7, 0xc5, 0x4a, 0x17, 0x13, 0xaf, 0xb3, 0x6d, 0x7f, 0xac, 0xb4, 0xd9, 0xc0, 0x3a, 0xa0, + 0xce, 0x7c, 0xb2, 0xab, 0xaa, 0xd7, 0xa9, 0x78, 0xd6, 0x84, 0x3e, 0xd8, 0xbb, 0xbe, 0xd9, 0x75, + 0xd3, 0x75, 0x1a, 0x9e, 0xe0, 0xf1, 0x10, 0x44, 0x3f, 0x27, 0xcc, 0xc2, 0x31, 0xe3, 0xcb, 0x57, + 0x03, 0xed, 0x5e, 0xc8, 0xec, 0xa1, 0x9b, 0xf0, 0x4c, 0x59, 0x31, 0x99, 0x8d, 0x5b, 0xde, 0xea, + 0x7e, 0x0f, 0x7d, 0xde, 0xfe, 0xf1, 0xe5, 0xa2, 0xe1, 0xc6, 0xbc, 0x01, 0xbc, 0x63, 0xfa, 0xdf, + 0x92, 0x8f, 0x75, 0xfd, 0xd6, 0xeb, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x46, 0x62, 0x67, 0x30, + 0x4c, 0x01, 0x00, 0x00, } -var fileDescriptor_00212fb1f9d3bf1c = []byte{ - // 201 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0xd0, 0x41, 0x4a, 0xc5, 0x30, - 0x10, 0x06, 0x60, 0x63, 0x9f, 0x8f, 0xbe, 0x41, 0x11, 0xb2, 0x78, 0x04, 0xdd, 0x94, 0xae, 0xde, - 0x2a, 0x0b, 0x3d, 0x41, 0xd1, 0x5e, 0x20, 0x37, 0x88, 0x76, 0x68, 0xb3, 0x48, 0x66, 0x48, 0x06, - 0xc1, 0x43, 0x78, 0x67, 0x49, 0xad, 0x50, 0xdc, 0xba, 0xfb, 0xe7, 0x5b, 0xfc, 0xfc, 0x0c, 0x9c, - 0x3c, 0x07, 0xcb, 0x99, 0x84, 0xf4, 0xed, 0x4c, 0x36, 0x86, 0xf7, 0x4c, 0xd6, 0x73, 0xe8, 0x3f, - 0xa0, 0x1d, 0xd3, 0xc4, 0x14, 0x92, 0x68, 0x0d, 0x87, 0xe4, 0x23, 0x1a, 0xd5, 0xa9, 0xcb, 0xc9, - 0xad, 0xb9, 0xda, 0x42, 0x45, 0xcc, 0x75, 0xd7, 0x54, 0xab, 0xb9, 0x1a, 0x7b, 0x59, 0x4c, 0xf3, - 0x63, 0x35, 0xeb, 0x33, 0x1c, 0x23, 0xca, 0x42, 0x93, 0x39, 0xac, 0xba, 0x5d, 0xd5, 0x8b, 0x64, - 0xf4, 0xd1, 0xdc, 0x74, 0xea, 0xd2, 0xba, 0xed, 0xea, 0xef, 0xe1, 0x6e, 0x8c, 0x2c, 0x9f, 0x0e, - 0x0b, 0x53, 0x2a, 0xf8, 0xf4, 0xa5, 0xa0, 0x19, 0x38, 0xe8, 0x01, 0x5a, 0x87, 0x73, 0x28, 0x82, - 0x59, 0x9f, 0xed, 0x7e, 0xab, 0xfd, 0x1d, 0xfa, 0xf0, 0xf8, 0xc7, 0xf7, 0x45, 0xfd, 0x95, 0x7e, - 0x01, 0x78, 0xc5, 0xfc, 0xbf, 0x92, 0xb7, 0xe3, 0xfa, 0xad, 0xe7, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x1f, 0xf0, 0xd9, 0x19, 0x3a, 0x01, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// ApiClient is the client API for Api service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ApiClient interface { + Register(ctx context.Context, in *Endpoint, opts ...grpc.CallOption) (*EmptyResponse, error) + Deregister(ctx context.Context, in *Endpoint, opts ...grpc.CallOption) (*EmptyResponse, error) +} + +type apiClient struct { + cc *grpc.ClientConn +} + +func NewApiClient(cc *grpc.ClientConn) ApiClient { + return &apiClient{cc} +} + +func (c *apiClient) Register(ctx context.Context, in *Endpoint, opts ...grpc.CallOption) (*EmptyResponse, error) { + out := new(EmptyResponse) + err := c.cc.Invoke(ctx, "/go.micro.api.Api/Register", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *apiClient) Deregister(ctx context.Context, in *Endpoint, opts ...grpc.CallOption) (*EmptyResponse, error) { + out := new(EmptyResponse) + err := c.cc.Invoke(ctx, "/go.micro.api.Api/Deregister", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ApiServer is the server API for Api service. +type ApiServer interface { + Register(context.Context, *Endpoint) (*EmptyResponse, error) + Deregister(context.Context, *Endpoint) (*EmptyResponse, error) +} + +// UnimplementedApiServer can be embedded to have forward compatible implementations. +type UnimplementedApiServer struct { +} + +func (*UnimplementedApiServer) Register(ctx context.Context, req *Endpoint) (*EmptyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Register not implemented") +} +func (*UnimplementedApiServer) Deregister(ctx context.Context, req *Endpoint) (*EmptyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deregister not implemented") +} + +func RegisterApiServer(s *grpc.Server, srv ApiServer) { + s.RegisterService(&_Api_serviceDesc, srv) +} + +func _Api_Register_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Endpoint) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApiServer).Register(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.api.Api/Register", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApiServer).Register(ctx, req.(*Endpoint)) + } + return interceptor(ctx, in, info, handler) +} + +func _Api_Deregister_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Endpoint) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApiServer).Deregister(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.api.Api/Deregister", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApiServer).Deregister(ctx, req.(*Endpoint)) + } + return interceptor(ctx, in, info, handler) +} + +var _Api_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.api.Api", + HandlerType: (*ApiServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Register", + Handler: _Api_Register_Handler, + }, + { + MethodName: "Deregister", + Handler: _Api_Deregister_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "api/service/proto/api.proto", } diff --git a/api/service/proto/api.pb.micro.go b/api/service/proto/api.pb.micro.go index 6754bcca..301b7c55 100644 --- a/api/service/proto/api.pb.micro.go +++ b/api/service/proto/api.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: api.proto +// source: api/service/proto/api.proto package go_micro_api diff --git a/auth/service/proto/accounts.pb.go b/auth/service/proto/accounts.pb.go index f389386c..5d7a415c 100644 --- a/auth/service/proto/accounts.pb.go +++ b/auth/service/proto/accounts.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: accounts.proto +// source: auth/service/proto/accounts.proto package go_micro_auth import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -30,7 +34,7 @@ func (m *ListAccountsRequest) Reset() { *m = ListAccountsRequest{} } func (m *ListAccountsRequest) String() string { return proto.CompactTextString(m) } func (*ListAccountsRequest) ProtoMessage() {} func (*ListAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_e1e7723af4c007b7, []int{0} + return fileDescriptor_fdbfb9fc95541122, []int{0} } func (m *ListAccountsRequest) XXX_Unmarshal(b []byte) error { @@ -62,7 +66,7 @@ func (m *ListAccountsResponse) Reset() { *m = ListAccountsResponse{} } func (m *ListAccountsResponse) String() string { return proto.CompactTextString(m) } func (*ListAccountsResponse) ProtoMessage() {} func (*ListAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e1e7723af4c007b7, []int{1} + return fileDescriptor_fdbfb9fc95541122, []int{1} } func (m *ListAccountsResponse) XXX_Unmarshal(b []byte) error { @@ -95,20 +99,99 @@ func init() { proto.RegisterType((*ListAccountsResponse)(nil), "go.micro.auth.ListAccountsResponse") } -func init() { - proto.RegisterFile("accounts.proto", fileDescriptor_e1e7723af4c007b7) +func init() { proto.RegisterFile("auth/service/proto/accounts.proto", fileDescriptor_fdbfb9fc95541122) } + +var fileDescriptor_fdbfb9fc95541122 = []byte{ + // 164 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0x2c, 0x2d, 0xc9, + 0xd0, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x4f, + 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, 0xd6, 0x03, 0x73, 0x85, 0x78, 0xd3, 0xf3, 0xf5, 0x72, + 0x33, 0x93, 0x8b, 0xf2, 0xf5, 0x40, 0x6a, 0xa5, 0x64, 0xb1, 0xe9, 0x28, 0x2d, 0xc9, 0x80, 0xa8, + 0x56, 0x12, 0xe5, 0x12, 0xf6, 0xc9, 0x2c, 0x2e, 0x71, 0x84, 0x9a, 0x11, 0x94, 0x5a, 0x58, 0x9a, + 0x5a, 0x5c, 0xa2, 0xe4, 0xc5, 0x25, 0x82, 0x2a, 0x5c, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x2a, 0x64, + 0xc4, 0xc5, 0x01, 0xb3, 0x4e, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4c, 0x0f, 0xc5, 0x3e, + 0x3d, 0xa8, 0x96, 0x20, 0xb8, 0x3a, 0xa3, 0x58, 0x2e, 0x0e, 0x98, 0x39, 0x42, 0x81, 0x5c, 0x2c, + 0x20, 0x73, 0x85, 0x94, 0xd0, 0x74, 0x61, 0x71, 0x83, 0x94, 0x32, 0x5e, 0x35, 0x10, 0x07, 0x29, + 0x31, 0x24, 0xb1, 0x81, 0x3d, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x82, 0x00, 0x19, 0x2f, + 0x1b, 0x01, 0x00, 0x00, } -var fileDescriptor_e1e7723af4c007b7 = []byte{ - // 147 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0x4c, 0x4e, 0xce, - 0x2f, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4d, 0xcf, 0xd7, 0xcb, - 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x4b, 0x2c, 0x2d, 0xc9, 0x90, 0xe2, 0x02, 0x91, 0x10, 0x29, 0x25, - 0x51, 0x2e, 0x61, 0x9f, 0xcc, 0xe2, 0x12, 0x47, 0xa8, 0x86, 0xa0, 0xd4, 0xc2, 0xd2, 0xd4, 0xe2, - 0x12, 0x25, 0x2f, 0x2e, 0x11, 0x54, 0xe1, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x23, 0x2e, - 0x0e, 0x98, 0xd9, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x62, 0x7a, 0x28, 0x86, 0xeb, 0x41, - 0xb5, 0x04, 0xc1, 0xd5, 0x19, 0xc5, 0x72, 0x71, 0xc0, 0xcc, 0x11, 0x0a, 0xe4, 0x62, 0x01, 0x99, - 0x2b, 0xa4, 0x84, 0xa6, 0x0b, 0x8b, 0x1b, 0xa4, 0x94, 0xf1, 0xaa, 0x81, 0x38, 0x48, 0x89, 0x21, - 0x89, 0x0d, 0xec, 0x11, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xbb, 0xf1, 0x10, 0xf5, - 0x00, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// AccountsClient is the client API for Accounts service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type AccountsClient interface { + List(ctx context.Context, in *ListAccountsRequest, opts ...grpc.CallOption) (*ListAccountsResponse, error) +} + +type accountsClient struct { + cc *grpc.ClientConn +} + +func NewAccountsClient(cc *grpc.ClientConn) AccountsClient { + return &accountsClient{cc} +} + +func (c *accountsClient) List(ctx context.Context, in *ListAccountsRequest, opts ...grpc.CallOption) (*ListAccountsResponse, error) { + out := new(ListAccountsResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Accounts/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// AccountsServer is the server API for Accounts service. +type AccountsServer interface { + List(context.Context, *ListAccountsRequest) (*ListAccountsResponse, error) +} + +// UnimplementedAccountsServer can be embedded to have forward compatible implementations. +type UnimplementedAccountsServer struct { +} + +func (*UnimplementedAccountsServer) List(ctx context.Context, req *ListAccountsRequest) (*ListAccountsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} + +func RegisterAccountsServer(s *grpc.Server, srv AccountsServer) { + s.RegisterService(&_Accounts_serviceDesc, srv) +} + +func _Accounts_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListAccountsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AccountsServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Accounts/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AccountsServer).List(ctx, req.(*ListAccountsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Accounts_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.auth.Accounts", + HandlerType: (*AccountsServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "List", + Handler: _Accounts_List_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "auth/service/proto/accounts.proto", } diff --git a/auth/service/proto/accounts.pb.micro.go b/auth/service/proto/accounts.pb.micro.go index 56408164..d83f2a9f 100644 --- a/auth/service/proto/accounts.pb.micro.go +++ b/auth/service/proto/accounts.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: accounts.proto +// source: auth/service/proto/accounts.proto package go_micro_auth diff --git a/auth/service/proto/accounts.proto b/auth/service/proto/accounts.proto index 47143693..77967b51 100644 --- a/auth/service/proto/accounts.proto +++ b/auth/service/proto/accounts.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package go.micro.auth; -import "auth.proto"; +import "auth/service/proto/auth.proto"; service Accounts { rpc List(ListAccountsRequest) returns (ListAccountsResponse) {}; diff --git a/auth/service/proto/auth.pb.go b/auth/service/proto/auth.pb.go index df741fe8..7d7d2ab5 100644 --- a/auth/service/proto/auth.pb.go +++ b/auth/service/proto/auth.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: auth.proto +// source: auth/service/proto/auth.proto package go_micro_auth import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -38,7 +42,7 @@ func (m *Token) Reset() { *m = Token{} } func (m *Token) String() string { return proto.CompactTextString(m) } func (*Token) ProtoMessage() {} func (*Token) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{0} + return fileDescriptor_21300bfacc51fc2a, []int{0} } func (m *Token) XXX_Unmarshal(b []byte) error { @@ -130,7 +134,7 @@ func (m *Account) Reset() { *m = Account{} } func (m *Account) String() string { return proto.CompactTextString(m) } func (*Account) ProtoMessage() {} func (*Account) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{1} + return fileDescriptor_21300bfacc51fc2a, []int{1} } func (m *Account) XXX_Unmarshal(b []byte) error { @@ -199,7 +203,7 @@ func (m *Resource) Reset() { *m = Resource{} } func (m *Resource) String() string { return proto.CompactTextString(m) } func (*Resource) ProtoMessage() {} func (*Resource) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{2} + return fileDescriptor_21300bfacc51fc2a, []int{2} } func (m *Resource) XXX_Unmarshal(b []byte) error { @@ -256,7 +260,7 @@ func (m *GenerateRequest) Reset() { *m = GenerateRequest{} } func (m *GenerateRequest) String() string { return proto.CompactTextString(m) } func (*GenerateRequest) ProtoMessage() {} func (*GenerateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{3} + return fileDescriptor_21300bfacc51fc2a, []int{3} } func (m *GenerateRequest) XXX_Unmarshal(b []byte) error { @@ -323,7 +327,7 @@ func (m *GenerateResponse) Reset() { *m = GenerateResponse{} } func (m *GenerateResponse) String() string { return proto.CompactTextString(m) } func (*GenerateResponse) ProtoMessage() {} func (*GenerateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{4} + return fileDescriptor_21300bfacc51fc2a, []int{4} } func (m *GenerateResponse) XXX_Unmarshal(b []byte) error { @@ -363,7 +367,7 @@ func (m *GrantRequest) Reset() { *m = GrantRequest{} } func (m *GrantRequest) String() string { return proto.CompactTextString(m) } func (*GrantRequest) ProtoMessage() {} func (*GrantRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{5} + return fileDescriptor_21300bfacc51fc2a, []int{5} } func (m *GrantRequest) XXX_Unmarshal(b []byte) error { @@ -408,7 +412,7 @@ func (m *GrantResponse) Reset() { *m = GrantResponse{} } func (m *GrantResponse) String() string { return proto.CompactTextString(m) } func (*GrantResponse) ProtoMessage() {} func (*GrantResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{6} + return fileDescriptor_21300bfacc51fc2a, []int{6} } func (m *GrantResponse) XXX_Unmarshal(b []byte) error { @@ -441,7 +445,7 @@ func (m *RevokeRequest) Reset() { *m = RevokeRequest{} } func (m *RevokeRequest) String() string { return proto.CompactTextString(m) } func (*RevokeRequest) ProtoMessage() {} func (*RevokeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{7} + return fileDescriptor_21300bfacc51fc2a, []int{7} } func (m *RevokeRequest) XXX_Unmarshal(b []byte) error { @@ -486,7 +490,7 @@ func (m *RevokeResponse) Reset() { *m = RevokeResponse{} } func (m *RevokeResponse) String() string { return proto.CompactTextString(m) } func (*RevokeResponse) ProtoMessage() {} func (*RevokeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{8} + return fileDescriptor_21300bfacc51fc2a, []int{8} } func (m *RevokeResponse) XXX_Unmarshal(b []byte) error { @@ -518,7 +522,7 @@ func (m *InspectRequest) Reset() { *m = InspectRequest{} } func (m *InspectRequest) String() string { return proto.CompactTextString(m) } func (*InspectRequest) ProtoMessage() {} func (*InspectRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{9} + return fileDescriptor_21300bfacc51fc2a, []int{9} } func (m *InspectRequest) XXX_Unmarshal(b []byte) error { @@ -557,7 +561,7 @@ func (m *InspectResponse) Reset() { *m = InspectResponse{} } func (m *InspectResponse) String() string { return proto.CompactTextString(m) } func (*InspectResponse) ProtoMessage() {} func (*InspectResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{10} + return fileDescriptor_21300bfacc51fc2a, []int{10} } func (m *InspectResponse) XXX_Unmarshal(b []byte) error { @@ -597,7 +601,7 @@ func (m *RefreshRequest) Reset() { *m = RefreshRequest{} } func (m *RefreshRequest) String() string { return proto.CompactTextString(m) } func (*RefreshRequest) ProtoMessage() {} func (*RefreshRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{11} + return fileDescriptor_21300bfacc51fc2a, []int{11} } func (m *RefreshRequest) XXX_Unmarshal(b []byte) error { @@ -643,7 +647,7 @@ func (m *RefreshResponse) Reset() { *m = RefreshResponse{} } func (m *RefreshResponse) String() string { return proto.CompactTextString(m) } func (*RefreshResponse) ProtoMessage() {} func (*RefreshResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8bbd6f3875b0e874, []int{12} + return fileDescriptor_21300bfacc51fc2a, []int{12} } func (m *RefreshResponse) XXX_Unmarshal(b []byte) error { @@ -690,48 +694,199 @@ func init() { proto.RegisterType((*RefreshResponse)(nil), "go.micro.auth.RefreshResponse") } -func init() { - proto.RegisterFile("auth.proto", fileDescriptor_8bbd6f3875b0e874) +func init() { proto.RegisterFile("auth/service/proto/auth.proto", fileDescriptor_21300bfacc51fc2a) } + +var fileDescriptor_21300bfacc51fc2a = []byte{ + // 612 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xae, 0xed, 0xfc, 0xb8, 0x93, 0x5f, 0xad, 0xaa, 0x60, 0x45, 0xb4, 0x04, 0x83, 0x50, 0x84, + 0x2a, 0x07, 0xa5, 0x17, 0x04, 0x02, 0x51, 0x41, 0x55, 0x7e, 0x54, 0x0e, 0x16, 0x12, 0xdc, 0x90, + 0xeb, 0x0c, 0xc4, 0xa4, 0xb1, 0xcd, 0x7a, 0x1d, 0x91, 0x23, 0x2f, 0xc4, 0x9b, 0xf1, 0x02, 0x9c, + 0xd0, 0xae, 0x77, 0x1d, 0xc7, 0x49, 0x10, 0x42, 0xe5, 0x36, 0x33, 0x3b, 0xf3, 0xcd, 0xcc, 0x37, + 0x5f, 0x1c, 0x38, 0xf4, 0x52, 0x36, 0x1d, 0x25, 0x48, 0x17, 0x81, 0x8f, 0xa3, 0x98, 0x46, 0x2c, + 0x1a, 0xf1, 0x90, 0x23, 0x4c, 0xd2, 0xfa, 0x1c, 0x39, 0xf3, 0xc0, 0xa7, 0x91, 0xc3, 0x83, 0xf6, + 0x0f, 0x1d, 0xaa, 0xef, 0xa2, 0x19, 0x86, 0xe4, 0x00, 0xaa, 0x8c, 0x1b, 0x96, 0x36, 0xd0, 0x86, + 0xfb, 0x6e, 0xe6, 0x10, 0x02, 0x15, 0xb6, 0x8c, 0xd1, 0xd2, 0x45, 0x50, 0xd8, 0xc4, 0x82, 0xba, + 0x4f, 0xd1, 0x63, 0x38, 0xb1, 0x8c, 0x81, 0x36, 0x34, 0x5c, 0xe5, 0x92, 0x1e, 0xd4, 0xf0, 0x5b, + 0x1c, 0xd0, 0xa5, 0x55, 0x11, 0x0f, 0xd2, 0xe3, 0x15, 0x49, 0x7a, 0xf9, 0x05, 0x7d, 0x66, 0x55, + 0x05, 0x90, 0x72, 0x79, 0x57, 0x1a, 0x5d, 0x61, 0x62, 0xd5, 0x06, 0x06, 0xef, 0x2a, 0x1c, 0xf2, + 0x14, 0xcc, 0x39, 0x32, 0x6f, 0xe2, 0x31, 0xcf, 0xaa, 0x0f, 0x8c, 0x61, 0x63, 0x6c, 0x3b, 0x6b, + 0x73, 0x3b, 0x62, 0x66, 0xe7, 0x42, 0x26, 0x9d, 0x85, 0x8c, 0x2e, 0xdd, 0xbc, 0x86, 0xdc, 0x84, + 0xfd, 0xd0, 0x9b, 0x63, 0x12, 0x7b, 0x3e, 0x5a, 0xa6, 0xe8, 0xb8, 0x0a, 0xf4, 0x1f, 0x43, 0x6b, + 0xad, 0x90, 0x74, 0xc1, 0x98, 0xe1, 0x52, 0x2e, 0xce, 0x4d, 0x3e, 0xd6, 0xc2, 0xbb, 0x4a, 0xd5, + 0xde, 0x99, 0xf3, 0x48, 0x7f, 0xa8, 0xd9, 0xbf, 0x34, 0xa8, 0x9f, 0xfa, 0x7e, 0x94, 0x86, 0x8c, + 0xb4, 0x41, 0x0f, 0x26, 0xb2, 0x4c, 0x0f, 0x26, 0xe4, 0x18, 0x6a, 0x09, 0xfa, 0x14, 0x99, 0x28, + 0x6b, 0x8c, 0x0f, 0xb6, 0x0d, 0xed, 0xca, 0x9c, 0xd5, 0xea, 0x46, 0x71, 0xf5, 0x67, 0x85, 0xd5, + 0x2b, 0x62, 0xf5, 0xbb, 0x25, 0x14, 0xd9, 0xfd, 0xef, 0x96, 0xaf, 0x5e, 0xeb, 0xf2, 0x6f, 0xc1, + 0x74, 0x31, 0x89, 0x52, 0xea, 0x23, 0x57, 0x06, 0x47, 0x95, 0x85, 0xc2, 0xde, 0xaa, 0x96, 0x3e, + 0x98, 0x18, 0x4e, 0xe2, 0x28, 0x08, 0x99, 0x90, 0xcb, 0xbe, 0x9b, 0xfb, 0xf6, 0x77, 0x1d, 0x3a, + 0xe7, 0x18, 0x22, 0xf5, 0x18, 0xba, 0xf8, 0x35, 0xc5, 0x64, 0x93, 0xd4, 0x9c, 0x26, 0xbd, 0x48, + 0xd3, 0xcb, 0x02, 0x4d, 0x86, 0xa0, 0xe9, 0xb8, 0x44, 0x53, 0x09, 0x77, 0x27, 0x5d, 0x77, 0xa0, + 0x95, 0x1d, 0xe4, 0xe3, 0x9a, 0x74, 0x9b, 0x59, 0xf0, 0x2c, 0x13, 0xf0, 0x7f, 0xe4, 0xf4, 0x05, + 0x74, 0x57, 0xa3, 0x26, 0x71, 0x14, 0x26, 0x48, 0x1e, 0x40, 0xdd, 0xcb, 0xae, 0x2c, 0x30, 0x1a, + 0xe3, 0xde, 0x76, 0x0d, 0xb8, 0x2a, 0xcd, 0x7e, 0x0f, 0xcd, 0x73, 0xea, 0x85, 0x4c, 0xb1, 0x48, + 0xa0, 0xc2, 0x89, 0x52, 0xd7, 0xe1, 0x36, 0x39, 0x01, 0x93, 0xca, 0xeb, 0x49, 0x81, 0xde, 0x28, + 0xc1, 0xaa, 0xe3, 0xba, 0x79, 0xa2, 0xdd, 0x81, 0x96, 0x04, 0xce, 0x66, 0xb3, 0x3f, 0x40, 0xcb, + 0xc5, 0x45, 0x34, 0xc3, 0x6b, 0x6f, 0xd5, 0x85, 0xb6, 0x42, 0x96, 0xbd, 0xee, 0x41, 0xfb, 0x55, + 0x98, 0xc4, 0xe8, 0xe7, 0x7b, 0x6d, 0xfd, 0x4a, 0xd9, 0xcf, 0xa1, 0x93, 0xe7, 0xfd, 0x33, 0x85, + 0x6f, 0x78, 0xfb, 0x4f, 0x14, 0x93, 0xa9, 0x6a, 0xd6, 0xcb, 0x7f, 0xcf, 0x59, 0x37, 0xf5, 0xcb, + 0xbd, 0x0d, 0x4d, 0xd1, 0x57, 0x29, 0x46, 0x17, 0x8a, 0x69, 0x88, 0x58, 0x26, 0x18, 0xfb, 0x09, + 0x74, 0x72, 0x30, 0x39, 0xd1, 0xfd, 0xe2, 0xe8, 0xbb, 0x3e, 0x0e, 0x59, 0xca, 0xf8, 0xa7, 0x06, + 0x95, 0xd3, 0x94, 0x4d, 0xc9, 0x05, 0x98, 0x4a, 0x1d, 0xe4, 0xe8, 0xcf, 0x0a, 0xef, 0xdf, 0xda, + 0xf9, 0x2e, 0xe9, 0xdc, 0x23, 0xaf, 0xa1, 0x2e, 0x89, 0x22, 0x87, 0xa5, 0xec, 0x75, 0xa2, 0xfb, + 0x47, 0xbb, 0x9e, 0x8b, 0x58, 0x72, 0xc5, 0x0d, 0xac, 0x75, 0x1e, 0x37, 0xb0, 0x4a, 0xcc, 0xd8, + 0x7b, 0x97, 0x35, 0xf1, 0xe7, 0x74, 0xf2, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xe4, 0x21, 0xa9, + 0xbd, 0x06, 0x00, 0x00, } -var fileDescriptor_8bbd6f3875b0e874 = []byte{ - // 601 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0xed, 0x7c, 0x38, 0x93, 0x4f, 0xad, 0xaa, 0x60, 0x45, 0x50, 0x82, 0x41, 0x28, 0x42, - 0x95, 0x85, 0xd2, 0x0b, 0x02, 0x81, 0xa8, 0xa0, 0x2a, 0x1f, 0x2a, 0x07, 0x0b, 0x09, 0x6e, 0xc8, - 0x75, 0x06, 0x12, 0xd2, 0x78, 0xcd, 0x7a, 0x5d, 0x91, 0x23, 0x7f, 0x88, 0x7f, 0xc6, 0x1f, 0xe0, - 0x84, 0x76, 0xbd, 0xeb, 0x38, 0x4e, 0x82, 0x10, 0x6a, 0x6f, 0x3b, 0xbb, 0x33, 0x6f, 0xe6, 0xbd, - 0x79, 0x71, 0x00, 0x82, 0x94, 0x4f, 0xbd, 0x98, 0x51, 0x4e, 0x49, 0xfb, 0x0b, 0xf5, 0x16, 0xb3, - 0x90, 0x51, 0x4f, 0x5c, 0xba, 0x3f, 0x4d, 0xa8, 0xbe, 0xa7, 0x73, 0x8c, 0xc8, 0x3e, 0x54, 0xb9, - 0x38, 0x38, 0xc6, 0xd0, 0x18, 0x35, 0xfc, 0x2c, 0x20, 0x04, 0x2a, 0x7c, 0x19, 0xa3, 0x63, 0xca, - 0x4b, 0x79, 0x26, 0x0e, 0xd4, 0x43, 0x86, 0x01, 0xc7, 0x89, 0x63, 0x0d, 0x8d, 0x91, 0xe5, 0xeb, - 0x90, 0xf4, 0xa1, 0x86, 0xdf, 0xe3, 0x19, 0x5b, 0x3a, 0x15, 0xf9, 0xa0, 0x22, 0x51, 0x91, 0xa4, - 0xe7, 0x5f, 0x31, 0xe4, 0x4e, 0x55, 0x02, 0xe9, 0x50, 0x74, 0x65, 0xf4, 0x02, 0x13, 0xa7, 0x36, - 0xb4, 0x44, 0x57, 0x19, 0x90, 0x67, 0x60, 0x2f, 0x90, 0x07, 0x93, 0x80, 0x07, 0x4e, 0x7d, 0x68, - 0x8d, 0x9a, 0x63, 0xd7, 0x5b, 0x9b, 0xdb, 0x93, 0x33, 0x7b, 0x67, 0x2a, 0xe9, 0x24, 0xe2, 0x6c, - 0xe9, 0xe7, 0x35, 0xe4, 0x26, 0x34, 0xa2, 0x60, 0x81, 0x49, 0x1c, 0x84, 0xe8, 0xd8, 0xb2, 0xe3, - 0xea, 0x62, 0xf0, 0x04, 0xda, 0x6b, 0x85, 0xa4, 0x07, 0xd6, 0x1c, 0x97, 0x8a, 0xb8, 0x38, 0x8a, - 0xb1, 0x2e, 0x83, 0x8b, 0x54, 0xf3, 0xce, 0x82, 0xc7, 0xe6, 0x23, 0xc3, 0xfd, 0x6d, 0x40, 0xfd, - 0x38, 0x0c, 0x69, 0x1a, 0x71, 0xd2, 0x01, 0x73, 0x36, 0x51, 0x65, 0xe6, 0x6c, 0x42, 0x0e, 0xa1, - 0x96, 0x60, 0xc8, 0x90, 0xcb, 0xb2, 0xe6, 0x78, 0x7f, 0xdb, 0xd0, 0xbe, 0xca, 0x59, 0x51, 0xb7, - 0x8a, 0xd4, 0x9f, 0x17, 0xa8, 0x57, 0x24, 0xf5, 0x7b, 0x25, 0x14, 0xd5, 0xfd, 0xdf, 0xc8, 0x57, - 0xaf, 0x94, 0xfc, 0x3b, 0xb0, 0x7d, 0x4c, 0x68, 0xca, 0x42, 0x14, 0xce, 0x10, 0xa8, 0xaa, 0x50, - 0x9e, 0xb7, 0xba, 0x65, 0x00, 0x36, 0x46, 0x93, 0x98, 0xce, 0x22, 0x2e, 0xed, 0xd2, 0xf0, 0xf3, - 0xd8, 0xfd, 0x61, 0x42, 0xf7, 0x14, 0x23, 0x64, 0x01, 0x47, 0x1f, 0xbf, 0xa5, 0x98, 0x6c, 0x8a, - 0x9a, 0xcb, 0x64, 0x16, 0x65, 0x7a, 0x55, 0x90, 0xc9, 0x92, 0x32, 0x1d, 0x96, 0x64, 0x2a, 0xe1, - 0xee, 0x94, 0xeb, 0x2e, 0xb4, 0xb3, 0x85, 0x7c, 0x5a, 0xb3, 0x6e, 0x2b, 0xbb, 0x3c, 0xc9, 0x0c, - 0x7c, 0x8d, 0x9a, 0xbe, 0x84, 0xde, 0x6a, 0xd4, 0x24, 0xa6, 0x51, 0x82, 0xe4, 0x21, 0xd4, 0x83, - 0x6c, 0xcb, 0x12, 0xa3, 0x39, 0xee, 0x6f, 0xf7, 0x80, 0xaf, 0xd3, 0xdc, 0x0f, 0xd0, 0x3a, 0x65, - 0x41, 0xc4, 0xb5, 0x8a, 0x04, 0x2a, 0x42, 0x28, 0xbd, 0x1d, 0x71, 0x26, 0x47, 0x60, 0x33, 0xb5, - 0x3d, 0x65, 0xd0, 0x1b, 0x25, 0x58, 0xbd, 0x5c, 0x3f, 0x4f, 0x74, 0xbb, 0xd0, 0x56, 0xc0, 0xd9, - 0x6c, 0xee, 0x47, 0x68, 0xfb, 0x78, 0x49, 0xe7, 0x78, 0xe5, 0xad, 0x7a, 0xd0, 0xd1, 0xc8, 0xaa, - 0xd7, 0x7d, 0xe8, 0xbc, 0x8e, 0x92, 0x18, 0xc3, 0x9c, 0xd7, 0xd6, 0xaf, 0x94, 0xfb, 0x02, 0xba, - 0x79, 0xde, 0x7f, 0x4b, 0xf8, 0x56, 0xb4, 0xff, 0xcc, 0x30, 0x99, 0xea, 0x66, 0xfd, 0xfc, 0xf7, - 0x9c, 0x75, 0xd3, 0xbf, 0xdc, 0x3b, 0xd0, 0x92, 0x7d, 0xb5, 0x63, 0x4c, 0xe9, 0x98, 0xa6, 0xbc, - 0xcb, 0x0c, 0xe3, 0x3e, 0x85, 0x6e, 0x0e, 0xa6, 0x26, 0x7a, 0x50, 0x1c, 0x7d, 0xd7, 0xc7, 0x21, - 0x4b, 0x19, 0xff, 0x32, 0xa0, 0x72, 0x9c, 0xf2, 0x29, 0x39, 0x03, 0x5b, 0xbb, 0x83, 0x1c, 0xfc, - 0xdd, 0xe1, 0x83, 0xdb, 0x3b, 0xdf, 0x95, 0x9c, 0x7b, 0xe4, 0x0d, 0xd4, 0x95, 0x50, 0xe4, 0x56, - 0x29, 0x7b, 0x5d, 0xe8, 0xc1, 0xc1, 0xae, 0xe7, 0x22, 0x96, 0xa2, 0xb8, 0x81, 0xb5, 0xae, 0xe3, - 0x06, 0x56, 0x49, 0x19, 0x77, 0xef, 0xbc, 0x26, 0xff, 0x9c, 0x8e, 0xfe, 0x04, 0x00, 0x00, 0xff, - 0xff, 0x9a, 0xf4, 0x9d, 0x85, 0xaa, 0x06, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// AuthClient is the client API for Auth service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type AuthClient interface { + Generate(ctx context.Context, in *GenerateRequest, opts ...grpc.CallOption) (*GenerateResponse, error) + Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (*InspectResponse, error) + Refresh(ctx context.Context, in *RefreshRequest, opts ...grpc.CallOption) (*RefreshResponse, error) +} + +type authClient struct { + cc *grpc.ClientConn +} + +func NewAuthClient(cc *grpc.ClientConn) AuthClient { + return &authClient{cc} +} + +func (c *authClient) Generate(ctx context.Context, in *GenerateRequest, opts ...grpc.CallOption) (*GenerateResponse, error) { + out := new(GenerateResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Auth/Generate", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *authClient) Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (*InspectResponse, error) { + out := new(InspectResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Auth/Inspect", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *authClient) Refresh(ctx context.Context, in *RefreshRequest, opts ...grpc.CallOption) (*RefreshResponse, error) { + out := new(RefreshResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Auth/Refresh", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// AuthServer is the server API for Auth service. +type AuthServer interface { + Generate(context.Context, *GenerateRequest) (*GenerateResponse, error) + Inspect(context.Context, *InspectRequest) (*InspectResponse, error) + Refresh(context.Context, *RefreshRequest) (*RefreshResponse, error) +} + +// UnimplementedAuthServer can be embedded to have forward compatible implementations. +type UnimplementedAuthServer struct { +} + +func (*UnimplementedAuthServer) Generate(ctx context.Context, req *GenerateRequest) (*GenerateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Generate not implemented") +} +func (*UnimplementedAuthServer) Inspect(ctx context.Context, req *InspectRequest) (*InspectResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Inspect not implemented") +} +func (*UnimplementedAuthServer) Refresh(ctx context.Context, req *RefreshRequest) (*RefreshResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Refresh not implemented") +} + +func RegisterAuthServer(s *grpc.Server, srv AuthServer) { + s.RegisterService(&_Auth_serviceDesc, srv) +} + +func _Auth_Generate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GenerateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServer).Generate(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Auth/Generate", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServer).Generate(ctx, req.(*GenerateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Auth_Inspect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(InspectRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServer).Inspect(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Auth/Inspect", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServer).Inspect(ctx, req.(*InspectRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Auth_Refresh_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RefreshRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServer).Refresh(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Auth/Refresh", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServer).Refresh(ctx, req.(*RefreshRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Auth_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.auth.Auth", + HandlerType: (*AuthServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Generate", + Handler: _Auth_Generate_Handler, + }, + { + MethodName: "Inspect", + Handler: _Auth_Inspect_Handler, + }, + { + MethodName: "Refresh", + Handler: _Auth_Refresh_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "auth/service/proto/auth.proto", } diff --git a/auth/service/proto/auth.pb.micro.go b/auth/service/proto/auth.pb.micro.go index f304e32b..db0d2a70 100644 --- a/auth/service/proto/auth.pb.micro.go +++ b/auth/service/proto/auth.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: auth.proto +// source: auth/service/proto/auth.proto package go_micro_auth diff --git a/auth/service/proto/rules.pb.go b/auth/service/proto/rules.pb.go index 04d02a75..dc75ff0d 100644 --- a/auth/service/proto/rules.pb.go +++ b/auth/service/proto/rules.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: rules.proto +// source: auth/service/proto/rules.proto package go_micro_auth import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -45,7 +49,7 @@ func (x Access) String() string { } func (Access) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{0} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{0} } type Rule struct { @@ -62,7 +66,7 @@ func (m *Rule) Reset() { *m = Rule{} } func (m *Rule) String() string { return proto.CompactTextString(m) } func (*Rule) ProtoMessage() {} func (*Rule) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{0} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{0} } func (m *Rule) XXX_Unmarshal(b []byte) error { @@ -124,7 +128,7 @@ func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{1} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{1} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { @@ -176,7 +180,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{2} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{2} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { @@ -210,7 +214,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{3} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{3} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { @@ -262,7 +266,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{4} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{4} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -293,7 +297,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{5} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{5} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -325,7 +329,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8e722d3e922f0937, []int{6} + return fileDescriptor_ce1ef0aa40cdd6dc, []int{6} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -364,32 +368,183 @@ func init() { proto.RegisterType((*ListResponse)(nil), "go.micro.auth.ListResponse") } -func init() { - proto.RegisterFile("rules.proto", fileDescriptor_8e722d3e922f0937) +func init() { proto.RegisterFile("auth/service/proto/rules.proto", fileDescriptor_ce1ef0aa40cdd6dc) } + +var fileDescriptor_ce1ef0aa40cdd6dc = []byte{ + // 362 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0x51, 0x4b, 0xeb, 0x30, + 0x1c, 0xc5, 0x97, 0xae, 0xeb, 0xbd, 0xf7, 0xdf, 0xbb, 0x51, 0x72, 0xb9, 0x58, 0xaa, 0x93, 0xb2, + 0xa7, 0x2a, 0xd8, 0x41, 0xf7, 0xe4, 0xe3, 0xb0, 0x63, 0x88, 0x52, 0x21, 0x28, 0x3e, 0xcf, 0xee, + 0x8f, 0x16, 0xaa, 0x99, 0x49, 0xeb, 0x57, 0xf0, 0xcd, 0x4f, 0xe8, 0x87, 0x91, 0x26, 0xdd, 0x70, + 0xdd, 0x06, 0xfa, 0xe6, 0x5b, 0x92, 0x73, 0x72, 0xf2, 0xcb, 0x69, 0x03, 0x87, 0xb3, 0xb2, 0x78, + 0x18, 0x4a, 0x14, 0x2f, 0x59, 0x8a, 0xc3, 0x85, 0xe0, 0x05, 0x1f, 0x8a, 0x32, 0x47, 0x19, 0xaa, + 0x31, 0xed, 0xde, 0xf3, 0xf0, 0x31, 0x4b, 0x05, 0x0f, 0x2b, 0xa3, 0xd7, 0xdf, 0x62, 0xaf, 0x96, + 0xb4, 0x7b, 0xf0, 0x46, 0xc0, 0x64, 0x65, 0x8e, 0xb4, 0x07, 0x46, 0x36, 0x77, 0x89, 0x4f, 0x82, + 0x3f, 0xcc, 0xc8, 0xe6, 0x94, 0x82, 0x29, 0x78, 0x8e, 0xae, 0xa1, 0x56, 0xd4, 0x98, 0x8e, 0xe0, + 0xb7, 0x40, 0xc9, 0x4b, 0x91, 0xa2, 0xdb, 0xf6, 0x49, 0x60, 0x47, 0x7b, 0xe1, 0xda, 0x69, 0x21, + 0xab, 0x65, 0xb6, 0x32, 0xd2, 0x13, 0xb0, 0x66, 0x69, 0x8a, 0x52, 0xba, 0xa6, 0x4f, 0x82, 0x5e, + 0xf4, 0xbf, 0xb1, 0x65, 0xac, 0x44, 0x56, 0x9b, 0x06, 0xaf, 0x04, 0xba, 0x67, 0x02, 0x67, 0x05, + 0x32, 0x7c, 0x2e, 0x51, 0x16, 0x2b, 0x12, 0xb2, 0x83, 0xc4, 0xf8, 0x3e, 0x49, 0xfb, 0x2b, 0x24, + 0x0e, 0xf4, 0x96, 0x20, 0x72, 0xc1, 0x9f, 0x24, 0x2a, 0xb6, 0x18, 0x73, 0xfc, 0x11, 0x6c, 0x4b, + 0x90, 0x9a, 0xad, 0x0b, 0xf6, 0x65, 0x26, 0x8b, 0x1a, 0x6c, 0x70, 0x0a, 0x7f, 0xf5, 0x54, 0xcb, + 0xf4, 0x08, 0x3a, 0xea, 0x27, 0x71, 0x89, 0xdf, 0x0e, 0xec, 0xe8, 0x5f, 0x93, 0xa8, 0xcc, 0x91, + 0x69, 0xc7, 0x71, 0x08, 0x96, 0x3e, 0x8d, 0xda, 0xf0, 0xeb, 0x26, 0xb9, 0x48, 0xae, 0x6e, 0x13, + 0xa7, 0x55, 0x4d, 0xa6, 0x6c, 0x9c, 0x5c, 0x4f, 0x62, 0x87, 0x50, 0x00, 0x2b, 0x9e, 0x24, 0xe7, + 0x93, 0xd8, 0x31, 0xa2, 0x77, 0x02, 0x9d, 0x6a, 0xbf, 0xa4, 0x53, 0xb0, 0x74, 0x63, 0xf4, 0xa0, + 0x91, 0xbf, 0xf6, 0x45, 0xbd, 0xfe, 0x0e, 0xb5, 0xbe, 0x4a, 0xab, 0x0a, 0xd2, 0xd7, 0xdb, 0x08, + 0x5a, 0xab, 0x7f, 0x23, 0xa8, 0xd1, 0x49, 0x8b, 0x8e, 0xc1, 0xac, 0x6a, 0xa0, 0x5e, 0xc3, 0xf8, + 0xa9, 0x2a, 0x6f, 0x7f, 0xab, 0xb6, 0x8c, 0xb8, 0xb3, 0xd4, 0x43, 0x19, 0x7d, 0x04, 0x00, 0x00, + 0xff, 0xff, 0xd9, 0x7d, 0x25, 0xd9, 0x78, 0x03, 0x00, 0x00, } -var fileDescriptor_8e722d3e922f0937 = []byte{ - // 346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0xc1, 0x4e, 0xb3, 0x40, - 0x14, 0x85, 0x3b, 0x94, 0xf2, 0xff, 0x5e, 0x6c, 0x43, 0xae, 0x31, 0x12, 0xd4, 0x84, 0x74, 0x85, - 0x26, 0xb2, 0xa0, 0x2b, 0x97, 0x8d, 0x34, 0x8d, 0xd1, 0x60, 0x32, 0xd1, 0xb8, 0xae, 0xf4, 0x46, - 0x49, 0xd0, 0xa9, 0x33, 0xf0, 0x0c, 0xee, 0x7c, 0x42, 0x1f, 0xc6, 0xc0, 0xd0, 0xc6, 0x52, 0x9b, - 0xe8, 0xce, 0x0d, 0x61, 0x38, 0x67, 0x0e, 0xdf, 0x3d, 0x30, 0x60, 0xcb, 0x32, 0x27, 0x15, 0x2e, - 0xa4, 0x28, 0x04, 0xf6, 0x1f, 0x45, 0xf8, 0x9c, 0xa5, 0x52, 0x84, 0xb3, 0xb2, 0x78, 0xf2, 0xa0, - 0xba, 0x6a, 0x69, 0xf8, 0xce, 0xc0, 0xe4, 0x65, 0x4e, 0x38, 0x00, 0x23, 0x9b, 0xbb, 0xcc, 0x67, - 0xc1, 0x0e, 0x37, 0xb2, 0x39, 0x22, 0x98, 0x52, 0xe4, 0xe4, 0x1a, 0xf5, 0x93, 0xfa, 0x1e, 0x47, - 0xf0, 0x5f, 0x92, 0x12, 0xa5, 0x4c, 0xc9, 0xed, 0xfa, 0x2c, 0xb0, 0xa3, 0x83, 0x70, 0x2d, 0x3a, - 0xe4, 0x8d, 0xcc, 0x57, 0x46, 0x3c, 0x03, 0x6b, 0x96, 0xa6, 0xa4, 0x94, 0x6b, 0xfa, 0x2c, 0x18, - 0x44, 0xfb, 0xad, 0x2d, 0xe3, 0x5a, 0xe4, 0x8d, 0x69, 0xf8, 0xc6, 0xa0, 0x7f, 0x21, 0x69, 0x56, - 0x10, 0xa7, 0xd7, 0x92, 0x54, 0xb1, 0x22, 0x61, 0x5b, 0x48, 0x8c, 0xdf, 0x93, 0x74, 0x7f, 0x42, - 0xe2, 0xc0, 0x60, 0x09, 0xa2, 0x16, 0xe2, 0x45, 0x51, 0xcd, 0x16, 0x53, 0x4e, 0x7f, 0x82, 0x6d, - 0x09, 0xd2, 0xb0, 0xf5, 0xc1, 0xbe, 0xce, 0x54, 0xd1, 0x80, 0x0d, 0xcf, 0x61, 0x57, 0x2f, 0xb5, - 0x8c, 0x27, 0xd0, 0xab, 0xff, 0x08, 0x97, 0xf9, 0xdd, 0xc0, 0x8e, 0xf6, 0xda, 0x44, 0x65, 0x4e, - 0x5c, 0x3b, 0x4e, 0x43, 0xb0, 0xf4, 0xdb, 0xd0, 0x86, 0x7f, 0x77, 0xc9, 0x55, 0x72, 0x73, 0x9f, - 0x38, 0x9d, 0x6a, 0x31, 0xe5, 0xe3, 0xe4, 0x76, 0x12, 0x3b, 0x0c, 0x01, 0xac, 0x78, 0x92, 0x5c, - 0x4e, 0x62, 0xc7, 0x88, 0x3e, 0x18, 0xf4, 0xaa, 0xfd, 0x0a, 0xa7, 0x60, 0xe9, 0xc6, 0xf0, 0xa8, - 0x95, 0xbf, 0xf6, 0x45, 0xbd, 0xe3, 0x2d, 0x6a, 0x33, 0x4a, 0xa7, 0x0a, 0xd2, 0xe3, 0x6d, 0x04, - 0xad, 0xd5, 0xbf, 0x11, 0xd4, 0xea, 0xa4, 0x83, 0x63, 0x30, 0xab, 0x1a, 0xd0, 0x6b, 0x19, 0xbf, - 0x54, 0xe5, 0x1d, 0x7e, 0xab, 0x2d, 0x23, 0x1e, 0xac, 0xfa, 0xa0, 0x8c, 0x3e, 0x03, 0x00, 0x00, - 0xff, 0xff, 0xb8, 0x06, 0xc3, 0x53, 0x52, 0x03, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// RulesClient is the client API for Rules service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type RulesClient interface { + Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) +} + +type rulesClient struct { + cc *grpc.ClientConn +} + +func NewRulesClient(cc *grpc.ClientConn) RulesClient { + return &rulesClient{cc} +} + +func (c *rulesClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { + out := new(CreateResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Rules/Create", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rulesClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Rules/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *rulesClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/go.micro.auth.Rules/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// RulesServer is the server API for Rules service. +type RulesServer interface { + Create(context.Context, *CreateRequest) (*CreateResponse, error) + Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) + List(context.Context, *ListRequest) (*ListResponse, error) +} + +// UnimplementedRulesServer can be embedded to have forward compatible implementations. +type UnimplementedRulesServer struct { +} + +func (*UnimplementedRulesServer) Create(ctx context.Context, req *CreateRequest) (*CreateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") +} +func (*UnimplementedRulesServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} +func (*UnimplementedRulesServer) List(ctx context.Context, req *ListRequest) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} + +func RegisterRulesServer(s *grpc.Server, srv RulesServer) { + s.RegisterService(&_Rules_serviceDesc, srv) +} + +func _Rules_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RulesServer).Create(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Rules/Create", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RulesServer).Create(ctx, req.(*CreateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Rules_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RulesServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Rules/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RulesServer).Delete(ctx, req.(*DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Rules_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RulesServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.auth.Rules/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RulesServer).List(ctx, req.(*ListRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Rules_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.auth.Rules", + HandlerType: (*RulesServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Create", + Handler: _Rules_Create_Handler, + }, + { + MethodName: "Delete", + Handler: _Rules_Delete_Handler, + }, + { + MethodName: "List", + Handler: _Rules_List_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "auth/service/proto/rules.proto", } diff --git a/auth/service/proto/rules.pb.micro.go b/auth/service/proto/rules.pb.micro.go index fa25ba61..9e24fe06 100644 --- a/auth/service/proto/rules.pb.micro.go +++ b/auth/service/proto/rules.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: rules.proto +// source: auth/service/proto/rules.proto package go_micro_auth diff --git a/auth/service/proto/rules.proto b/auth/service/proto/rules.proto index cc941952..35355e5a 100644 --- a/auth/service/proto/rules.proto +++ b/auth/service/proto/rules.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package go.micro.auth; -import "auth.proto"; +import "auth/service/proto/auth.proto"; service Rules { rpc Create(CreateRequest) returns (CreateResponse) {}; diff --git a/broker/service/proto/broker.pb.go b/broker/service/proto/broker.pb.go index e602e4b1..cb561cc9 100644 --- a/broker/service/proto/broker.pb.go +++ b/broker/service/proto/broker.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: micro/go-micro/broker/service/proto/broker.proto +// source: broker/service/proto/broker.proto package go_micro_broker import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -30,7 +34,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_178fdc60944ff5e5, []int{0} + return fileDescriptor_df4d8f04292cf3fe, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { @@ -63,7 +67,7 @@ func (m *PublishRequest) Reset() { *m = PublishRequest{} } func (m *PublishRequest) String() string { return proto.CompactTextString(m) } func (*PublishRequest) ProtoMessage() {} func (*PublishRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_178fdc60944ff5e5, []int{1} + return fileDescriptor_df4d8f04292cf3fe, []int{1} } func (m *PublishRequest) XXX_Unmarshal(b []byte) error { @@ -110,7 +114,7 @@ func (m *SubscribeRequest) Reset() { *m = SubscribeRequest{} } func (m *SubscribeRequest) String() string { return proto.CompactTextString(m) } func (*SubscribeRequest) ProtoMessage() {} func (*SubscribeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_178fdc60944ff5e5, []int{2} + return fileDescriptor_df4d8f04292cf3fe, []int{2} } func (m *SubscribeRequest) XXX_Unmarshal(b []byte) error { @@ -157,7 +161,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_178fdc60944ff5e5, []int{3} + return fileDescriptor_df4d8f04292cf3fe, []int{3} } func (m *Message) XXX_Unmarshal(b []byte) error { @@ -200,30 +204,171 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "go.micro.broker.Message.HeaderEntry") } -func init() { - proto.RegisterFile("micro/go-micro/broker/service/proto/broker.proto", fileDescriptor_178fdc60944ff5e5) +func init() { proto.RegisterFile("broker/service/proto/broker.proto", fileDescriptor_df4d8f04292cf3fe) } + +var fileDescriptor_df4d8f04292cf3fe = []byte{ + // 299 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x4d, 0x4b, 0xc3, 0x40, + 0x14, 0xec, 0xb6, 0xb6, 0xa1, 0xaf, 0xa2, 0x65, 0x29, 0x12, 0x7a, 0x31, 0x0d, 0x1e, 0x72, 0xda, + 0x48, 0xbc, 0xa8, 0x88, 0x07, 0xb1, 0xe0, 0x41, 0x41, 0xd6, 0x9b, 0xb7, 0x6c, 0xfa, 0x68, 0x43, + 0x1b, 0x37, 0xdd, 0x4d, 0x0a, 0xf9, 0x23, 0x9e, 0xfc, 0xb1, 0xd2, 0xdd, 0xf8, 0xd5, 0x50, 0x6f, + 0x6f, 0xde, 0xce, 0xce, 0x1b, 0x66, 0x60, 0x22, 0x94, 0x5c, 0xa2, 0x0a, 0x35, 0xaa, 0x4d, 0x9a, + 0x60, 0x98, 0x2b, 0x59, 0xc8, 0xd0, 0x2e, 0x99, 0x01, 0xf4, 0x78, 0x2e, 0x59, 0x96, 0x26, 0x4a, + 0x32, 0xbb, 0xf6, 0x1d, 0xe8, 0x4e, 0xb3, 0xbc, 0xa8, 0xfc, 0x57, 0x38, 0x7a, 0x2e, 0xc5, 0x2a, + 0xd5, 0x0b, 0x8e, 0xeb, 0x12, 0x75, 0x41, 0x47, 0xd0, 0x2d, 0x64, 0x9e, 0x26, 0x2e, 0xf1, 0x48, + 0xd0, 0xe7, 0x16, 0xd0, 0x08, 0x9c, 0x0c, 0xb5, 0x8e, 0xe7, 0xe8, 0xb6, 0x3d, 0x12, 0x0c, 0x22, + 0x97, 0xed, 0x68, 0xb2, 0x27, 0xfb, 0xce, 0xbf, 0x88, 0xfe, 0x2d, 0x0c, 0x5f, 0x4a, 0xa1, 0x13, + 0x95, 0x0a, 0xfc, 0x5f, 0x7d, 0x04, 0xdd, 0x75, 0x89, 0xa5, 0xd5, 0xee, 0x73, 0x0b, 0xfc, 0x77, + 0x02, 0x4e, 0x2d, 0x4a, 0x6f, 0xa0, 0xb7, 0xc0, 0x78, 0x86, 0xca, 0x25, 0x5e, 0x27, 0x18, 0x44, + 0x67, 0xfb, 0xce, 0xb3, 0x07, 0x43, 0x9b, 0xbe, 0x15, 0xaa, 0xe2, 0xf5, 0x1f, 0x4a, 0xe1, 0x40, + 0xc8, 0x59, 0x65, 0xe4, 0x0f, 0xb9, 0x99, 0xc7, 0x57, 0x30, 0xf8, 0x45, 0xa5, 0x43, 0xe8, 0x2c, + 0xb1, 0xaa, 0x6d, 0x6d, 0xc7, 0xad, 0xa9, 0x4d, 0xbc, 0xfa, 0x31, 0x65, 0xc0, 0x75, 0xfb, 0x92, + 0x44, 0x1f, 0x04, 0x7a, 0x77, 0xe6, 0x2a, 0xbd, 0x07, 0xa7, 0xce, 0x8f, 0x9e, 0x36, 0x2c, 0xfd, + 0x4d, 0x76, 0x7c, 0xd2, 0x20, 0xd8, 0x0e, 0x5a, 0xf4, 0x11, 0xfa, 0xdf, 0x49, 0xd1, 0x49, 0x83, + 0xb6, 0x9b, 0xe2, 0x78, 0x6f, 0xf8, 0x7e, 0xeb, 0x9c, 0x88, 0x9e, 0x29, 0xfd, 0xe2, 0x33, 0x00, + 0x00, 0xff, 0xff, 0x19, 0x9f, 0x10, 0x75, 0x19, 0x02, 0x00, 0x00, } -var fileDescriptor_178fdc60944ff5e5 = []byte{ - // 305 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0x4d, 0x4f, 0xc2, 0x40, - 0x14, 0x64, 0x41, 0x68, 0x78, 0x18, 0x25, 0x1b, 0x62, 0x1a, 0x2e, 0x62, 0xe3, 0x81, 0x8b, 0x5b, - 0x52, 0x2f, 0x6a, 0x8c, 0x07, 0x23, 0x89, 0x07, 0x4d, 0xcc, 0x7a, 0xf3, 0xd6, 0x2d, 0x2f, 0xa5, - 0x81, 0xba, 0x65, 0xb7, 0x25, 0xe9, 0x1f, 0xf1, 0xe4, 0x8f, 0x35, 0xec, 0x16, 0x3f, 0x68, 0xf0, - 0x36, 0xf3, 0x76, 0x76, 0xde, 0x64, 0x1e, 0x4c, 0xd2, 0x24, 0x52, 0xd2, 0x8f, 0xe5, 0x85, 0x05, - 0x42, 0xc9, 0x05, 0x2a, 0x5f, 0xa3, 0x5a, 0x27, 0x11, 0xfa, 0x99, 0x92, 0xf9, 0x76, 0xc8, 0x0c, - 0xa1, 0xc7, 0xb1, 0x64, 0x46, 0xcb, 0xec, 0xd8, 0x73, 0xa0, 0x3d, 0x4d, 0xb3, 0xbc, 0xf4, 0xde, - 0xe0, 0xe8, 0xa5, 0x10, 0xcb, 0x44, 0xcf, 0x39, 0xae, 0x0a, 0xd4, 0x39, 0x1d, 0x40, 0x3b, 0x97, - 0x59, 0x12, 0xb9, 0x64, 0x44, 0xc6, 0x5d, 0x6e, 0x09, 0x0d, 0xc0, 0x49, 0x51, 0xeb, 0x30, 0x46, - 0xb7, 0x39, 0x22, 0xe3, 0x5e, 0xe0, 0xb2, 0x1d, 0x4f, 0xf6, 0x6c, 0xdf, 0xf9, 0x56, 0xe8, 0xdd, - 0x41, 0xff, 0xb5, 0x10, 0x3a, 0x52, 0x89, 0xc0, 0xff, 0xdd, 0x07, 0xd0, 0x5e, 0x15, 0x58, 0x58, - 0xef, 0x2e, 0xb7, 0xc4, 0xfb, 0x20, 0xe0, 0x54, 0xa6, 0xf4, 0x16, 0x3a, 0x73, 0x0c, 0x67, 0xa8, - 0x5c, 0x32, 0x6a, 0x8d, 0x7b, 0xc1, 0xf9, 0xbe, 0xf5, 0xec, 0xd1, 0xc8, 0xa6, 0xef, 0xb9, 0x2a, - 0x79, 0xf5, 0x87, 0x52, 0x38, 0x10, 0x72, 0x56, 0x1a, 0xfb, 0x43, 0x6e, 0xf0, 0xf0, 0x1a, 0x7a, - 0xbf, 0xa4, 0xb4, 0x0f, 0xad, 0x05, 0x96, 0x55, 0xac, 0x0d, 0xdc, 0x84, 0x5a, 0x87, 0xcb, 0x9f, - 0x50, 0x86, 0xdc, 0x34, 0xaf, 0x48, 0xf0, 0x49, 0xa0, 0x73, 0x6f, 0xb6, 0xd2, 0x07, 0x70, 0xaa, - 0xfe, 0xe8, 0x69, 0x2d, 0xd2, 0xdf, 0x66, 0x87, 0x27, 0x35, 0x81, 0xbd, 0x41, 0x83, 0x3e, 0x41, - 0xf7, 0xbb, 0x29, 0x7a, 0x56, 0x93, 0xed, 0xb6, 0x38, 0xdc, 0x5b, 0xbe, 0xd7, 0x98, 0x10, 0xd1, - 0x31, 0x47, 0xbf, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x60, 0x8c, 0x40, 0xd5, 0x28, 0x02, 0x00, - 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// BrokerClient is the client API for Broker service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type BrokerClient interface { + Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*Empty, error) + Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (Broker_SubscribeClient, error) +} + +type brokerClient struct { + cc *grpc.ClientConn +} + +func NewBrokerClient(cc *grpc.ClientConn) BrokerClient { + return &brokerClient{cc} +} + +func (c *brokerClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*Empty, error) { + out := new(Empty) + err := c.cc.Invoke(ctx, "/go.micro.broker.Broker/Publish", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *brokerClient) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (Broker_SubscribeClient, error) { + stream, err := c.cc.NewStream(ctx, &_Broker_serviceDesc.Streams[0], "/go.micro.broker.Broker/Subscribe", opts...) + if err != nil { + return nil, err + } + x := &brokerSubscribeClient{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 Broker_SubscribeClient interface { + Recv() (*Message, error) + grpc.ClientStream +} + +type brokerSubscribeClient struct { + grpc.ClientStream +} + +func (x *brokerSubscribeClient) Recv() (*Message, error) { + m := new(Message) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// BrokerServer is the server API for Broker service. +type BrokerServer interface { + Publish(context.Context, *PublishRequest) (*Empty, error) + Subscribe(*SubscribeRequest, Broker_SubscribeServer) error +} + +// UnimplementedBrokerServer can be embedded to have forward compatible implementations. +type UnimplementedBrokerServer struct { +} + +func (*UnimplementedBrokerServer) Publish(ctx context.Context, req *PublishRequest) (*Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method Publish not implemented") +} +func (*UnimplementedBrokerServer) Subscribe(req *SubscribeRequest, srv Broker_SubscribeServer) error { + return status.Errorf(codes.Unimplemented, "method Subscribe not implemented") +} + +func RegisterBrokerServer(s *grpc.Server, srv BrokerServer) { + s.RegisterService(&_Broker_serviceDesc, srv) +} + +func _Broker_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PublishRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(BrokerServer).Publish(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.broker.Broker/Publish", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(BrokerServer).Publish(ctx, req.(*PublishRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Broker_Subscribe_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(SubscribeRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(BrokerServer).Subscribe(m, &brokerSubscribeServer{stream}) +} + +type Broker_SubscribeServer interface { + Send(*Message) error + grpc.ServerStream +} + +type brokerSubscribeServer struct { + grpc.ServerStream +} + +func (x *brokerSubscribeServer) Send(m *Message) error { + return x.ServerStream.SendMsg(m) +} + +var _Broker_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.broker.Broker", + HandlerType: (*BrokerServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Publish", + Handler: _Broker_Publish_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Subscribe", + Handler: _Broker_Subscribe_Handler, + ServerStreams: true, + }, + }, + Metadata: "broker/service/proto/broker.proto", } diff --git a/broker/service/proto/broker.pb.micro.go b/broker/service/proto/broker.pb.micro.go index 4ce6cd52..384f66f6 100644 --- a/broker/service/proto/broker.pb.micro.go +++ b/broker/service/proto/broker.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: micro/go-micro/broker/service/proto/broker.proto +// source: broker/service/proto/broker.proto package go_micro_broker @@ -44,12 +44,6 @@ type brokerService struct { } func NewBrokerService(name string, c client.Client) BrokerService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.broker" - } return &brokerService{ c: c, name: name, @@ -79,6 +73,7 @@ func (c *brokerService) Subscribe(ctx context.Context, in *SubscribeRequest, opt } type Broker_SubscribeService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -93,6 +88,10 @@ func (x *brokerServiceSubscribe) Close() error { return x.stream.Close() } +func (x *brokerServiceSubscribe) Context() context.Context { + return x.stream.Context() +} + func (x *brokerServiceSubscribe) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -146,6 +145,7 @@ func (h *brokerHandler) Subscribe(ctx context.Context, stream server.Stream) err } type Broker_SubscribeStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -160,6 +160,10 @@ func (x *brokerSubscribeStream) Close() error { return x.stream.Close() } +func (x *brokerSubscribeStream) Context() context.Context { + return x.stream.Context() +} + func (x *brokerSubscribeStream) SendMsg(m interface{}) error { return x.stream.Send(m) } diff --git a/client/service/proto/client.pb.go b/client/service/proto/client.pb.go index 071c1c16..8d82354e 100644 --- a/client/service/proto/client.pb.go +++ b/client/service/proto/client.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/client/proto/client.proto +// source: client/service/proto/client.proto package go_micro_client import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -34,7 +38,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_d418333f021a3308, []int{0} + return fileDescriptor_27c3d425ddd1a066, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -94,7 +98,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_d418333f021a3308, []int{1} + return fileDescriptor_27c3d425ddd1a066, []int{1} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -135,7 +139,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_d418333f021a3308, []int{2} + return fileDescriptor_27c3d425ddd1a066, []int{2} } func (m *Message) XXX_Unmarshal(b []byte) error { @@ -183,28 +187,216 @@ func init() { proto.RegisterType((*Message)(nil), "go.micro.client.Message") } -func init() { - proto.RegisterFile("github.com/micro/go-micro/v2/client/proto/client.proto", fileDescriptor_d418333f021a3308) +func init() { proto.RegisterFile("client/service/proto/client.proto", fileDescriptor_27c3d425ddd1a066) } + +var fileDescriptor_27c3d425ddd1a066 = []byte{ + // 267 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xc1, 0x4b, 0xc3, 0x30, + 0x14, 0xc6, 0x97, 0x6d, 0xb6, 0xf3, 0x39, 0x10, 0x1e, 0x1e, 0x62, 0x0f, 0xb2, 0xf5, 0xd4, 0x53, + 0x2b, 0x7a, 0x16, 0x0f, 0x3d, 0x0b, 0x52, 0xc5, 0xab, 0xb4, 0xd9, 0x63, 0x06, 0xba, 0x24, 0x36, + 0xd9, 0xa0, 0x7f, 0xa4, 0xff, 0x93, 0x90, 0x46, 0x27, 0xba, 0x5d, 0xbc, 0xe5, 0xfb, 0x7e, 0xe4, + 0x7b, 0x2f, 0x5f, 0x60, 0x29, 0x5a, 0x49, 0xca, 0x15, 0x96, 0xba, 0x9d, 0x14, 0x54, 0x98, 0x4e, + 0x3b, 0x5d, 0x0c, 0x66, 0xee, 0x05, 0x9e, 0xaf, 0x75, 0xbe, 0x91, 0xa2, 0xd3, 0xf9, 0x60, 0xa7, + 0x3b, 0x88, 0x2b, 0x7a, 0xdf, 0x92, 0x75, 0xc8, 0x21, 0x0e, 0x37, 0x39, 0x5b, 0xb0, 0xec, 0xb4, + 0xfa, 0x92, 0x98, 0xc0, 0x8c, 0xd4, 0xca, 0x68, 0xa9, 0x1c, 0x1f, 0x7b, 0xf4, 0xad, 0x71, 0x09, + 0x73, 0xa1, 0x95, 0x23, 0xe5, 0x5e, 0x5d, 0x6f, 0x88, 0x4f, 0x3c, 0x3f, 0x0b, 0xde, 0x73, 0x6f, + 0x08, 0x11, 0xa6, 0x8d, 0x5e, 0xf5, 0x7c, 0xba, 0x60, 0xd9, 0xbc, 0xf2, 0xe7, 0xf4, 0x0a, 0x66, + 0x15, 0x59, 0xa3, 0x95, 0xdd, 0x73, 0xf6, 0x83, 0xbf, 0x40, 0xfc, 0x40, 0xd6, 0xd6, 0x6b, 0xc2, + 0x0b, 0x38, 0x71, 0xda, 0x48, 0x11, 0xb6, 0x1a, 0xc4, 0x9f, 0xb9, 0xe3, 0xe3, 0x73, 0x27, 0xfb, + 0xdc, 0x9b, 0x0f, 0x06, 0x51, 0xe9, 0x9f, 0x8e, 0x77, 0x30, 0x2d, 0xeb, 0xb6, 0x45, 0x9e, 0xff, + 0x2a, 0x25, 0x0f, 0x8d, 0x24, 0x97, 0x07, 0xc8, 0xb0, 0x73, 0x3a, 0xc2, 0x12, 0xa2, 0x27, 0xd7, + 0x51, 0xbd, 0xf9, 0x67, 0x40, 0xc6, 0xae, 0x19, 0xde, 0x43, 0xfc, 0xb8, 0x6d, 0x5a, 0x69, 0xdf, + 0x0e, 0xa4, 0x84, 0x02, 0x92, 0xa3, 0x24, 0x1d, 0x35, 0x91, 0xff, 0xd7, 0xdb, 0xcf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xd6, 0x3f, 0xc3, 0xa1, 0xfc, 0x01, 0x00, 0x00, } -var fileDescriptor_d418333f021a3308 = []byte{ - // 279 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0x31, 0x4f, 0xfb, 0x30, - 0x10, 0xc5, 0xeb, 0xb6, 0xff, 0xa4, 0xff, 0xa3, 0x12, 0x92, 0xc5, 0x60, 0x32, 0xa0, 0x92, 0x29, - 0x0b, 0x0e, 0xa2, 0x33, 0x62, 0xc8, 0x8c, 0x84, 0x02, 0x62, 0x45, 0x89, 0x7b, 0x4a, 0x2d, 0x25, - 0xb6, 0x89, 0x9d, 0x4a, 0xf9, 0x90, 0x7c, 0x27, 0x24, 0x27, 0xa5, 0x08, 0xda, 0x85, 0xed, 0xde, - 0xfd, 0xac, 0x77, 0xe7, 0x77, 0xb0, 0xae, 0xa4, 0xdb, 0x76, 0x25, 0x17, 0xba, 0x49, 0x1b, 0x29, - 0x5a, 0x9d, 0x56, 0xfa, 0x66, 0x28, 0x44, 0x2d, 0x51, 0xb9, 0xd4, 0xb4, 0xda, 0xed, 0x05, 0xf7, - 0x82, 0x9e, 0x57, 0x9a, 0xfb, 0x37, 0x7c, 0x68, 0xc7, 0x3b, 0x08, 0x73, 0x7c, 0xef, 0xd0, 0x3a, - 0xca, 0x20, 0xb4, 0xd8, 0xee, 0xa4, 0x40, 0x46, 0x56, 0x24, 0xf9, 0x9f, 0xef, 0x25, 0x8d, 0x60, - 0x81, 0x6a, 0x63, 0xb4, 0x54, 0x8e, 0x4d, 0x3d, 0xfa, 0xd2, 0xf4, 0x1a, 0x96, 0x42, 0x2b, 0x87, - 0xca, 0xbd, 0xb9, 0xde, 0x20, 0x9b, 0x79, 0x7e, 0x36, 0xf6, 0x5e, 0x7a, 0x83, 0x94, 0xc2, 0xbc, - 0xd4, 0x9b, 0x9e, 0xcd, 0x57, 0x24, 0x59, 0xe6, 0xbe, 0x8e, 0xaf, 0x60, 0x91, 0xa3, 0x35, 0x5a, - 0xd9, 0x03, 0x27, 0xdf, 0xf8, 0x2b, 0x84, 0x8f, 0x68, 0x6d, 0x51, 0x21, 0xbd, 0x80, 0x7f, 0x4e, - 0x1b, 0x29, 0xc6, 0xad, 0x06, 0xf1, 0x6b, 0xee, 0xf4, 0xf4, 0xdc, 0xd9, 0xc1, 0xf7, 0xee, 0x83, - 0x40, 0x90, 0xf9, 0xaf, 0xd3, 0x7b, 0x98, 0x67, 0x45, 0x5d, 0x53, 0xc6, 0x7f, 0x84, 0xc2, 0xc7, - 0x44, 0xa2, 0xcb, 0x23, 0x64, 0xd8, 0x39, 0x9e, 0xd0, 0x0c, 0x82, 0x67, 0xd7, 0x62, 0xd1, 0xfc, - 0xd1, 0x20, 0x21, 0xb7, 0x84, 0x3e, 0x40, 0xf8, 0xd4, 0x95, 0xb5, 0xb4, 0xdb, 0x23, 0x2e, 0x63, - 0x00, 0xd1, 0x49, 0x12, 0x4f, 0xca, 0xc0, 0xdf, 0x75, 0xfd, 0x19, 0x00, 0x00, 0xff, 0xff, 0xb6, - 0x4d, 0x6e, 0xd5, 0x0e, 0x02, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// ClientClient is the client API for Client service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ClientClient interface { + // Call allows a single request to be made + Call(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) + // Stream is a bidirectional stream + Stream(ctx context.Context, opts ...grpc.CallOption) (Client_StreamClient, error) + // Publish publishes a message and returns an empty Message + Publish(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Message, error) +} + +type clientClient struct { + cc *grpc.ClientConn +} + +func NewClientClient(cc *grpc.ClientConn) ClientClient { + return &clientClient{cc} +} + +func (c *clientClient) Call(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) { + out := new(Response) + err := c.cc.Invoke(ctx, "/go.micro.client.Client/Call", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *clientClient) Stream(ctx context.Context, opts ...grpc.CallOption) (Client_StreamClient, error) { + stream, err := c.cc.NewStream(ctx, &_Client_serviceDesc.Streams[0], "/go.micro.client.Client/Stream", opts...) + if err != nil { + return nil, err + } + x := &clientStreamClient{stream} + return x, nil +} + +type Client_StreamClient interface { + Send(*Request) error + Recv() (*Response, error) + grpc.ClientStream +} + +type clientStreamClient struct { + grpc.ClientStream +} + +func (x *clientStreamClient) Send(m *Request) error { + return x.ClientStream.SendMsg(m) +} + +func (x *clientStreamClient) Recv() (*Response, error) { + m := new(Response) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *clientClient) Publish(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Message, error) { + out := new(Message) + err := c.cc.Invoke(ctx, "/go.micro.client.Client/Publish", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ClientServer is the server API for Client service. +type ClientServer interface { + // Call allows a single request to be made + Call(context.Context, *Request) (*Response, error) + // Stream is a bidirectional stream + Stream(Client_StreamServer) error + // Publish publishes a message and returns an empty Message + Publish(context.Context, *Message) (*Message, error) +} + +// UnimplementedClientServer can be embedded to have forward compatible implementations. +type UnimplementedClientServer struct { +} + +func (*UnimplementedClientServer) Call(ctx context.Context, req *Request) (*Response, error) { + return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") +} +func (*UnimplementedClientServer) Stream(srv Client_StreamServer) error { + return status.Errorf(codes.Unimplemented, "method Stream not implemented") +} +func (*UnimplementedClientServer) Publish(ctx context.Context, req *Message) (*Message, error) { + return nil, status.Errorf(codes.Unimplemented, "method Publish not implemented") +} + +func RegisterClientServer(s *grpc.Server, srv ClientServer) { + s.RegisterService(&_Client_serviceDesc, srv) +} + +func _Client_Call_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Request) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClientServer).Call(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.client.Client/Call", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClientServer).Call(ctx, req.(*Request)) + } + return interceptor(ctx, in, info, handler) +} + +func _Client_Stream_Handler(srv interface{}, stream grpc.ServerStream) error { + return srv.(ClientServer).Stream(&clientStreamServer{stream}) +} + +type Client_StreamServer interface { + Send(*Response) error + Recv() (*Request, error) + grpc.ServerStream +} + +type clientStreamServer struct { + grpc.ServerStream +} + +func (x *clientStreamServer) Send(m *Response) error { + return x.ServerStream.SendMsg(m) +} + +func (x *clientStreamServer) Recv() (*Request, error) { + m := new(Request) + if err := x.ServerStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func _Client_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Message) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ClientServer).Publish(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.client.Client/Publish", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ClientServer).Publish(ctx, req.(*Message)) + } + return interceptor(ctx, in, info, handler) +} + +var _Client_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.client.Client", + HandlerType: (*ClientServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Call", + Handler: _Client_Call_Handler, + }, + { + MethodName: "Publish", + Handler: _Client_Publish_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Stream", + Handler: _Client_Stream_Handler, + ServerStreams: true, + ClientStreams: true, + }, + }, + Metadata: "client/service/proto/client.proto", } diff --git a/client/service/proto/client.pb.micro.go b/client/service/proto/client.pb.micro.go index 029a6c73..671e5021 100644 --- a/client/service/proto/client.pb.micro.go +++ b/client/service/proto/client.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/client/proto/client.proto +// source: client/service/proto/client.proto package go_micro_client @@ -48,12 +48,6 @@ type clientService struct { } func NewClientService(name string, c client.Client) ClientService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.client" - } return &clientService{ c: c, name: name, @@ -80,6 +74,7 @@ func (c *clientService) Stream(ctx context.Context, opts ...client.CallOption) ( } type Client_StreamService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -95,6 +90,10 @@ func (x *clientServiceStream) Close() error { return x.stream.Close() } +func (x *clientServiceStream) Context() context.Context { + return x.stream.Context() +} + func (x *clientServiceStream) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -163,6 +162,7 @@ func (h *clientHandler) Stream(ctx context.Context, stream server.Stream) error } type Client_StreamStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -178,6 +178,10 @@ func (x *clientStreamStream) Close() error { return x.stream.Close() } +func (x *clientStreamStream) Context() context.Context { + return x.stream.Context() +} + func (x *clientStreamStream) SendMsg(m interface{}) error { return x.stream.Send(m) } diff --git a/codec/protorpc/envelope.pb.go b/codec/protorpc/envelope.pb.go index 9af273e0..b0e88066 100644 --- a/codec/protorpc/envelope.pb.go +++ b/codec/protorpc/envelope.pb.go @@ -1,83 +1,144 @@ -// Code generated by protoc-gen-go. -// source: envelope.proto -// DO NOT EDIT! +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: codec/protorpc/envelope.proto -/* -Package proto is a generated protocol buffer package. - -It is generated from these files: - envelope.proto - -It has these top-level messages: - Request - Response -*/ package protorpc -import proto "github.com/golang/protobuf/proto" -import json "encoding/json" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) -// Reference proto, json, and math imports to suppress error if they are not otherwise used. +// Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = &json.SyntaxError{} +var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + type Request struct { - ServiceMethod *string `protobuf:"bytes,1,opt,name=service_method" json:"service_method,omitempty"` - Seq *uint64 `protobuf:"fixed64,2,opt,name=seq" json:"seq,omitempty"` - XXX_unrecognized []byte `json:"-"` + ServiceMethod string `protobuf:"bytes,1,opt,name=service_method,json=serviceMethod,proto3" json:"service_method,omitempty"` + Seq uint64 `protobuf:"fixed64,2,opt,name=seq,proto3" json:"seq,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} +func (*Request) Descriptor() ([]byte, []int) { + return fileDescriptor_12fd17ed7ee86a33, []int{0} +} + +func (m *Request) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Request.Unmarshal(m, b) +} +func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Request.Marshal(b, m, deterministic) +} +func (m *Request) XXX_Merge(src proto.Message) { + xxx_messageInfo_Request.Merge(m, src) +} +func (m *Request) XXX_Size() int { + return xxx_messageInfo_Request.Size(m) +} +func (m *Request) XXX_DiscardUnknown() { + xxx_messageInfo_Request.DiscardUnknown(m) +} + +var xxx_messageInfo_Request proto.InternalMessageInfo func (m *Request) GetServiceMethod() string { - if m != nil && m.ServiceMethod != nil { - return *m.ServiceMethod + if m != nil { + return m.ServiceMethod } return "" } func (m *Request) GetSeq() uint64 { - if m != nil && m.Seq != nil { - return *m.Seq + if m != nil { + return m.Seq } return 0 } type Response struct { - ServiceMethod *string `protobuf:"bytes,1,opt,name=service_method" json:"service_method,omitempty"` - Seq *uint64 `protobuf:"fixed64,2,opt,name=seq" json:"seq,omitempty"` - Error *string `protobuf:"bytes,3,opt,name=error" json:"error,omitempty"` - XXX_unrecognized []byte `json:"-"` + ServiceMethod string `protobuf:"bytes,1,opt,name=service_method,json=serviceMethod,proto3" json:"service_method,omitempty"` + Seq uint64 `protobuf:"fixed64,2,opt,name=seq,proto3" json:"seq,omitempty"` + Error string `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} +func (*Response) Descriptor() ([]byte, []int) { + return fileDescriptor_12fd17ed7ee86a33, []int{1} +} + +func (m *Response) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Response.Unmarshal(m, b) +} +func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Response.Marshal(b, m, deterministic) +} +func (m *Response) XXX_Merge(src proto.Message) { + xxx_messageInfo_Response.Merge(m, src) +} +func (m *Response) XXX_Size() int { + return xxx_messageInfo_Response.Size(m) +} +func (m *Response) XXX_DiscardUnknown() { + xxx_messageInfo_Response.DiscardUnknown(m) +} + +var xxx_messageInfo_Response proto.InternalMessageInfo func (m *Response) GetServiceMethod() string { - if m != nil && m.ServiceMethod != nil { - return *m.ServiceMethod + if m != nil { + return m.ServiceMethod } return "" } func (m *Response) GetSeq() uint64 { - if m != nil && m.Seq != nil { - return *m.Seq + if m != nil { + return m.Seq } return 0 } func (m *Response) GetError() string { - if m != nil && m.Error != nil { - return *m.Error + if m != nil { + return m.Error } return "" } func init() { + proto.RegisterType((*Request)(nil), "protorpc.Request") + proto.RegisterType((*Response)(nil), "protorpc.Response") +} + +func init() { proto.RegisterFile("codec/protorpc/envelope.proto", fileDescriptor_12fd17ed7ee86a33) } + +var fileDescriptor_12fd17ed7ee86a33 = []byte{ + // 148 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4d, 0xce, 0x4f, 0x49, + 0x4d, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0xcd, 0x2b, 0x4b, 0xcd, + 0xc9, 0x2f, 0x48, 0xd5, 0x03, 0x8b, 0x08, 0x71, 0xc0, 0x24, 0x94, 0x9c, 0xb8, 0xd8, 0x83, 0x52, + 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x54, 0xb9, 0xf8, 0x8a, 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, + 0xe3, 0x73, 0x53, 0x4b, 0x32, 0xf2, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x78, 0xa1, + 0xa2, 0xbe, 0x60, 0x41, 0x21, 0x01, 0x2e, 0xe6, 0xe2, 0xd4, 0x42, 0x09, 0x26, 0x05, 0x46, 0x0d, + 0xb6, 0x20, 0x10, 0x53, 0x29, 0x92, 0x8b, 0x23, 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x95, + 0x6c, 0x43, 0x84, 0x44, 0xb8, 0x58, 0x53, 0x8b, 0x8a, 0xf2, 0x8b, 0x24, 0x98, 0xc1, 0xea, 0x21, + 0x9c, 0x24, 0x36, 0xb0, 0x43, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x73, 0x3a, 0x4b, + 0xd0, 0x00, 0x00, 0x00, } diff --git a/codec/protorpc/envelope.pb.micro.go b/codec/protorpc/envelope.pb.micro.go new file mode 100644 index 00000000..fcaa757c --- /dev/null +++ b/codec/protorpc/envelope.pb.micro.go @@ -0,0 +1,21 @@ +// Code generated by protoc-gen-micro. DO NOT EDIT. +// source: codec/protorpc/envelope.proto + +package protorpc + +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package diff --git a/codec/protorpc/envelope.proto b/codec/protorpc/envelope.proto index 9c4fd19d..5b2f9599 100644 --- a/codec/protorpc/envelope.proto +++ b/codec/protorpc/envelope.proto @@ -1,12 +1,14 @@ +syntax = "proto3"; + package protorpc; message Request { - optional string service_method = 1; - optional fixed64 seq = 2; + string service_method = 1; + fixed64 seq = 2; } message Response { - optional string service_method = 1; - optional fixed64 seq = 2; - optional string error = 3; + string service_method = 1; + fixed64 seq = 2; + string error = 3; } diff --git a/codec/protorpc/protorpc.go b/codec/protorpc/protorpc.go index 41f52fff..ce945693 100644 --- a/codec/protorpc/protorpc.go +++ b/codec/protorpc/protorpc.go @@ -32,13 +32,13 @@ func (c *protoCodec) String() string { return "proto-rpc" } -func id(id string) *uint64 { +func id(id string) uint64 { p, err := strconv.ParseInt(id, 10, 64) if err != nil { p = 0 } i := uint64(p) - return &i + return i } func (c *protoCodec) Write(m *codec.Message, b interface{}) error { @@ -47,7 +47,7 @@ func (c *protoCodec) Write(m *codec.Message, b interface{}) error { c.Lock() defer c.Unlock() // This is protobuf, of course we copy it. - pbr := &Request{ServiceMethod: &m.Method, Seq: id(m.Id)} + pbr := &Request{ServiceMethod: m.Method, Seq: id(m.Id)} data, err := proto.Marshal(pbr) if err != nil { return err @@ -77,7 +77,7 @@ func (c *protoCodec) Write(m *codec.Message, b interface{}) error { case codec.Response, codec.Error: c.Lock() defer c.Unlock() - rtmp := &Response{ServiceMethod: &m.Method, Seq: id(m.Id), Error: &m.Error} + rtmp := &Response{ServiceMethod: m.Method, Seq: id(m.Id), Error: m.Error} data, err := proto.Marshal(rtmp) if err != nil { return err diff --git a/config/source/service/proto/service.pb.go b/config/source/service/proto/service.pb.go index deef8a75..45e62cdf 100644 --- a/config/source/service/proto/service.pb.go +++ b/config/source/service/proto/service.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: service.proto +// source: config/source/service/proto/service.proto package service import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -35,7 +39,7 @@ func (m *ChangeSet) Reset() { *m = ChangeSet{} } func (m *ChangeSet) String() string { return proto.CompactTextString(m) } func (*ChangeSet) ProtoMessage() {} func (*ChangeSet) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{0} + return fileDescriptor_e67338fe1f659d14, []int{0} } func (m *ChangeSet) XXX_Unmarshal(b []byte) error { @@ -104,7 +108,7 @@ func (m *Change) Reset() { *m = Change{} } func (m *Change) String() string { return proto.CompactTextString(m) } func (*Change) ProtoMessage() {} func (*Change) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{1} + return fileDescriptor_e67338fe1f659d14, []int{1} } func (m *Change) XXX_Unmarshal(b []byte) error { @@ -157,7 +161,7 @@ func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{2} + return fileDescriptor_e67338fe1f659d14, []int{2} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { @@ -195,7 +199,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{3} + return fileDescriptor_e67338fe1f659d14, []int{3} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { @@ -227,7 +231,7 @@ func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } func (m *UpdateRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRequest) ProtoMessage() {} func (*UpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{4} + return fileDescriptor_e67338fe1f659d14, []int{4} } func (m *UpdateRequest) XXX_Unmarshal(b []byte) error { @@ -265,7 +269,7 @@ func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } func (m *UpdateResponse) String() string { return proto.CompactTextString(m) } func (*UpdateResponse) ProtoMessage() {} func (*UpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{5} + return fileDescriptor_e67338fe1f659d14, []int{5} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { @@ -297,7 +301,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{6} + return fileDescriptor_e67338fe1f659d14, []int{6} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { @@ -335,7 +339,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{7} + return fileDescriptor_e67338fe1f659d14, []int{7} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -366,7 +370,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{8} + return fileDescriptor_e67338fe1f659d14, []int{8} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -398,7 +402,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{9} + return fileDescriptor_e67338fe1f659d14, []int{9} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -438,7 +442,7 @@ func (m *ReadRequest) Reset() { *m = ReadRequest{} } func (m *ReadRequest) String() string { return proto.CompactTextString(m) } func (*ReadRequest) ProtoMessage() {} func (*ReadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{10} + return fileDescriptor_e67338fe1f659d14, []int{10} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { @@ -484,7 +488,7 @@ func (m *ReadResponse) Reset() { *m = ReadResponse{} } func (m *ReadResponse) String() string { return proto.CompactTextString(m) } func (*ReadResponse) ProtoMessage() {} func (*ReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{11} + return fileDescriptor_e67338fe1f659d14, []int{11} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { @@ -524,7 +528,7 @@ func (m *WatchRequest) Reset() { *m = WatchRequest{} } func (m *WatchRequest) String() string { return proto.CompactTextString(m) } func (*WatchRequest) ProtoMessage() {} func (*WatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{12} + return fileDescriptor_e67338fe1f659d14, []int{12} } func (m *WatchRequest) XXX_Unmarshal(b []byte) error { @@ -571,7 +575,7 @@ func (m *WatchResponse) Reset() { *m = WatchResponse{} } func (m *WatchResponse) String() string { return proto.CompactTextString(m) } func (*WatchResponse) ProtoMessage() {} func (*WatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{13} + return fileDescriptor_e67338fe1f659d14, []int{13} } func (m *WatchResponse) XXX_Unmarshal(b []byte) error { @@ -623,35 +627,326 @@ func init() { proto.RegisterType((*WatchResponse)(nil), "WatchResponse") } -func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } - -var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 424 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6a, 0xdb, 0x40, - 0x10, 0xc7, 0x2d, 0xdb, 0x51, 0xeb, 0xb1, 0x24, 0x97, 0x39, 0x14, 0x21, 0x0a, 0x35, 0x0b, 0x05, - 0xd3, 0xc2, 0x36, 0xb8, 0x0f, 0xd0, 0x82, 0x7b, 0xec, 0x49, 0xa5, 0xe4, 0xbc, 0x95, 0x26, 0x91, - 0x68, 0xf4, 0x51, 0xed, 0x2a, 0xef, 0x90, 0xb7, 0x2e, 0xfb, 0xa1, 0x48, 0xf2, 0xc1, 0xe0, 0xde, - 0xb4, 0xff, 0x99, 0xf9, 0xcf, 0xec, 0xfe, 0x06, 0x41, 0x28, 0xa9, 0x7b, 0x2a, 0x33, 0xe2, 0x6d, - 0xd7, 0xa8, 0x86, 0x3d, 0x7b, 0xb0, 0x39, 0x15, 0xa2, 0x7e, 0xa0, 0x9f, 0xa4, 0x10, 0x61, 0x9d, - 0x0b, 0x25, 0x62, 0x6f, 0xef, 0x1d, 0x36, 0xa9, 0xf9, 0xc6, 0x04, 0x5e, 0x67, 0x05, 0x65, 0x7f, - 0x64, 0x5f, 0xc5, 0x4b, 0xa3, 0xbf, 0x9c, 0xf1, 0x2d, 0xf8, 0xf7, 0x4d, 0x57, 0x09, 0x15, 0xaf, - 0x4c, 0xc4, 0x9d, 0xb4, 0x2e, 0x9b, 0xbe, 0xcb, 0x28, 0x5e, 0x5b, 0xdd, 0x9e, 0xf0, 0x1d, 0x6c, - 0x54, 0x59, 0x91, 0x54, 0xa2, 0x6a, 0xe3, 0x9b, 0xbd, 0x77, 0x58, 0xa5, 0xa3, 0xc0, 0x72, 0xf0, - 0xed, 0x28, 0x3a, 0xaf, 0x16, 0x15, 0xc9, 0x56, 0x64, 0xe4, 0x86, 0x19, 0x05, 0x3d, 0x65, 0x2b, - 0x54, 0xe1, 0xa6, 0x31, 0xdf, 0x78, 0x80, 0x4d, 0x36, 0x5c, 0xc3, 0x0c, 0xb3, 0x3d, 0x02, 0x7f, - 0xb9, 0x58, 0x3a, 0x06, 0xd9, 0x2d, 0x84, 0xa7, 0x8e, 0x84, 0xa2, 0x94, 0xfe, 0xf6, 0x24, 0x15, - 0xbe, 0x07, 0xdf, 0x46, 0x4d, 0xa7, 0xed, 0xf1, 0x95, 0xab, 0x4b, 0x9d, 0xcc, 0xde, 0x40, 0x34, - 0x54, 0xc8, 0xb6, 0xa9, 0x25, 0x69, 0x8f, 0x5f, 0x6d, 0x7e, 0xa5, 0xc7, 0x50, 0x31, 0x7a, 0x7c, - 0xa7, 0x47, 0xba, 0xce, 0x63, 0xa8, 0x70, 0x1e, 0x21, 0x6c, 0x7f, 0x94, 0x52, 0x39, 0x07, 0xf6, - 0x19, 0x02, 0x7b, 0xb4, 0x61, 0xed, 0xf8, 0x24, 0x1e, 0x7b, 0x92, 0xb1, 0xb7, 0x5f, 0xcd, 0x1c, - 0xad, 0xcc, 0xbe, 0xc2, 0x36, 0x25, 0x91, 0x0f, 0x13, 0x5c, 0xfd, 0xec, 0xba, 0xa3, 0x35, 0x18, - 0x3b, 0x5e, 0xbe, 0xc3, 0x37, 0x08, 0xee, 0x84, 0xca, 0x8a, 0xff, 0x6f, 0x79, 0x07, 0xa1, 0x73, - 0x70, 0x3d, 0x2f, 0x5b, 0xcc, 0x16, 0x63, 0x79, 0x61, 0x31, 0x8e, 0xcf, 0x4b, 0xf0, 0x4f, 0x4d, - 0x7d, 0x5f, 0x3e, 0xe0, 0x27, 0xf0, 0x2d, 0x71, 0x8c, 0xf8, 0x6c, 0x59, 0x92, 0x1d, 0x3f, 0x5b, - 0x85, 0x85, 0x4e, 0xb6, 0x68, 0x31, 0xe2, 0xb3, 0xad, 0x48, 0x76, 0xfc, 0x8c, 0xb9, 0x49, 0xb6, - 0x0c, 0x31, 0xe2, 0x33, 0xfc, 0xc9, 0x8e, 0x9f, 0xc1, 0x5d, 0xe0, 0x07, 0x58, 0x6b, 0x9e, 0x18, - 0xf0, 0x09, 0xe5, 0x24, 0xe4, 0x53, 0xc8, 0x36, 0x4d, 0x43, 0xc0, 0x80, 0x4f, 0x60, 0x26, 0x21, - 0x9f, 0x92, 0x61, 0x0b, 0xfc, 0x08, 0x37, 0xe6, 0xe1, 0x30, 0xe4, 0x53, 0x04, 0x49, 0xc4, 0x67, - 0xef, 0xc9, 0x16, 0xb7, 0xde, 0x6f, 0xdf, 0xfc, 0x1d, 0xbe, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, - 0x1c, 0x3e, 0x57, 0xb0, 0x2e, 0x04, 0x00, 0x00, +func init() { + proto.RegisterFile("config/source/service/proto/service.proto", fileDescriptor_e67338fe1f659d14) +} + +var fileDescriptor_e67338fe1f659d14 = []byte{ + // 434 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x8e, 0xd3, 0x30, + 0x10, 0xc7, 0x9b, 0xb6, 0x1b, 0xe8, 0xb4, 0x49, 0xd1, 0x1c, 0x50, 0x14, 0x21, 0x51, 0x59, 0x42, + 0x2a, 0x20, 0xb9, 0xab, 0xf2, 0x00, 0x20, 0x95, 0x23, 0xa7, 0x20, 0xb4, 0x67, 0xe3, 0xce, 0x6e, + 0x23, 0x36, 0x1f, 0xc4, 0xce, 0xbe, 0xc3, 0xbe, 0x35, 0xf2, 0x47, 0x36, 0x49, 0x0f, 0x95, 0xca, + 0xcd, 0xf3, 0xf5, 0x9f, 0xb1, 0x7f, 0x93, 0xc0, 0x47, 0x59, 0x95, 0xf7, 0xf9, 0xc3, 0x4e, 0x55, + 0x6d, 0x23, 0x69, 0xa7, 0xa8, 0x79, 0xca, 0x25, 0xed, 0xea, 0xa6, 0xd2, 0x55, 0x67, 0x71, 0x6b, + 0xb1, 0xe7, 0x00, 0x16, 0x87, 0x93, 0x28, 0x1f, 0xe8, 0x27, 0x69, 0x44, 0x98, 0x1f, 0x85, 0x16, + 0x49, 0xb0, 0x09, 0xb6, 0x8b, 0xcc, 0x9e, 0x31, 0x85, 0xd7, 0xf2, 0x44, 0xf2, 0x8f, 0x6a, 0x8b, + 0x64, 0x6a, 0xfd, 0x2f, 0x36, 0xbe, 0x85, 0xf0, 0xbe, 0x6a, 0x0a, 0xa1, 0x93, 0x99, 0x8d, 0x78, + 0xcb, 0xf8, 0x5d, 0xef, 0x64, 0xee, 0xfc, 0xce, 0xc2, 0x77, 0xb0, 0xd0, 0x79, 0x41, 0x4a, 0x8b, + 0xa2, 0x4e, 0x6e, 0x36, 0xc1, 0x76, 0x96, 0xf5, 0x0e, 0x76, 0x84, 0xd0, 0x8d, 0x62, 0xf2, 0x4a, + 0x51, 0x90, 0xaa, 0x85, 0x24, 0x3f, 0x4c, 0xef, 0x30, 0x53, 0xd6, 0x42, 0x9f, 0xfc, 0x34, 0xf6, + 0x8c, 0x5b, 0x58, 0xc8, 0xee, 0x1a, 0x76, 0x98, 0xe5, 0x1e, 0xf8, 0xcb, 0xc5, 0xb2, 0x3e, 0xc8, + 0x6e, 0x21, 0x3a, 0x34, 0x24, 0x34, 0x65, 0xf4, 0xb7, 0x25, 0xa5, 0xf1, 0x3d, 0x84, 0x2e, 0x6a, + 0x3b, 0x2d, 0xf7, 0xaf, 0x7c, 0x5d, 0xe6, 0xdd, 0xec, 0x0d, 0xc4, 0x5d, 0x85, 0xaa, 0xab, 0x52, + 0x91, 0xd1, 0xf8, 0x55, 0x1f, 0xaf, 0xd4, 0xe8, 0x2a, 0x7a, 0x8d, 0xef, 0xf4, 0x48, 0xd7, 0x69, + 0x74, 0x15, 0x5e, 0x23, 0x82, 0xe5, 0x8f, 0x5c, 0x69, 0xaf, 0xc0, 0x76, 0xb0, 0x72, 0xa6, 0x0b, + 0x1b, 0xc5, 0x27, 0xf1, 0xd8, 0x92, 0x4a, 0x82, 0xcd, 0x6c, 0xa4, 0xe8, 0xdc, 0xec, 0x2b, 0x2c, + 0x33, 0x12, 0xc7, 0x6e, 0x82, 0xab, 0x9f, 0xdd, 0x74, 0x74, 0x02, 0x7d, 0xc7, 0xcb, 0x77, 0xf8, + 0x06, 0xab, 0x3b, 0xa1, 0xe5, 0xe9, 0xff, 0x5b, 0xde, 0x41, 0xe4, 0x15, 0x7c, 0xcf, 0xcb, 0x12, + 0xa3, 0xc5, 0x98, 0x5e, 0x58, 0x8c, 0xfd, 0xf3, 0x14, 0xc2, 0x83, 0xfd, 0x70, 0xf0, 0x33, 0x84, + 0x8e, 0x38, 0xc6, 0x7c, 0xb4, 0x2c, 0xe9, 0x9a, 0x9f, 0xad, 0xc2, 0xc4, 0x24, 0x3b, 0xb4, 0x18, + 0xf3, 0xd1, 0x56, 0xa4, 0x6b, 0x7e, 0xc6, 0xdc, 0x26, 0x3b, 0x86, 0x18, 0xf3, 0x11, 0xfe, 0x74, + 0xcd, 0xcf, 0xe0, 0x4e, 0xf0, 0x03, 0xcc, 0x0d, 0x4f, 0x5c, 0xf1, 0x01, 0xe5, 0x34, 0xe2, 0x43, + 0xc8, 0x2e, 0xcd, 0x40, 0xc0, 0x15, 0x1f, 0xc0, 0x4c, 0x23, 0x3e, 0x24, 0xc3, 0x26, 0xf8, 0x09, + 0x6e, 0xec, 0xc3, 0x61, 0xc4, 0x87, 0x08, 0xd2, 0x98, 0x8f, 0xde, 0x93, 0x4d, 0x6e, 0x83, 0xdf, + 0xa1, 0xfd, 0x3b, 0x7c, 0xf9, 0x17, 0x00, 0x00, 0xff, 0xff, 0x05, 0xbb, 0xfd, 0xc1, 0x4a, 0x04, + 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// ConfigClient is the client API for Config service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ConfigClient interface { + Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) + Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) + Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) + Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Config_WatchClient, error) +} + +type configClient struct { + cc *grpc.ClientConn +} + +func NewConfigClient(cc *grpc.ClientConn) ConfigClient { + return &configClient{cc} +} + +func (c *configClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { + out := new(CreateResponse) + err := c.cc.Invoke(ctx, "/Config/Create", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *configClient) Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) { + out := new(UpdateResponse) + err := c.cc.Invoke(ctx, "/Config/Update", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *configClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/Config/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *configClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/Config/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *configClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) { + out := new(ReadResponse) + err := c.cc.Invoke(ctx, "/Config/Read", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *configClient) Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Config_WatchClient, error) { + stream, err := c.cc.NewStream(ctx, &_Config_serviceDesc.Streams[0], "/Config/Watch", opts...) + if err != nil { + return nil, err + } + x := &configWatchClient{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 Config_WatchClient interface { + Recv() (*WatchResponse, error) + grpc.ClientStream +} + +type configWatchClient struct { + grpc.ClientStream +} + +func (x *configWatchClient) Recv() (*WatchResponse, error) { + m := new(WatchResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// ConfigServer is the server API for Config service. +type ConfigServer interface { + Create(context.Context, *CreateRequest) (*CreateResponse, error) + Update(context.Context, *UpdateRequest) (*UpdateResponse, error) + Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) + List(context.Context, *ListRequest) (*ListResponse, error) + Read(context.Context, *ReadRequest) (*ReadResponse, error) + Watch(*WatchRequest, Config_WatchServer) error +} + +// UnimplementedConfigServer can be embedded to have forward compatible implementations. +type UnimplementedConfigServer struct { +} + +func (*UnimplementedConfigServer) Create(ctx context.Context, req *CreateRequest) (*CreateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") +} +func (*UnimplementedConfigServer) Update(ctx context.Context, req *UpdateRequest) (*UpdateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Update not implemented") +} +func (*UnimplementedConfigServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} +func (*UnimplementedConfigServer) List(ctx context.Context, req *ListRequest) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} +func (*UnimplementedConfigServer) Read(ctx context.Context, req *ReadRequest) (*ReadResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Read not implemented") +} +func (*UnimplementedConfigServer) Watch(req *WatchRequest, srv Config_WatchServer) error { + return status.Errorf(codes.Unimplemented, "method Watch not implemented") +} + +func RegisterConfigServer(s *grpc.Server, srv ConfigServer) { + s.RegisterService(&_Config_serviceDesc, srv) +} + +func _Config_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ConfigServer).Create(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Config/Create", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ConfigServer).Create(ctx, req.(*CreateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Config_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ConfigServer).Update(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Config/Update", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ConfigServer).Update(ctx, req.(*UpdateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Config_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ConfigServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Config/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ConfigServer).Delete(ctx, req.(*DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Config_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ConfigServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Config/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ConfigServer).List(ctx, req.(*ListRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Config_Read_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReadRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ConfigServer).Read(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Config/Read", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ConfigServer).Read(ctx, req.(*ReadRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Config_Watch_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(WatchRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(ConfigServer).Watch(m, &configWatchServer{stream}) +} + +type Config_WatchServer interface { + Send(*WatchResponse) error + grpc.ServerStream +} + +type configWatchServer struct { + grpc.ServerStream +} + +func (x *configWatchServer) Send(m *WatchResponse) error { + return x.ServerStream.SendMsg(m) +} + +var _Config_serviceDesc = grpc.ServiceDesc{ + ServiceName: "Config", + HandlerType: (*ConfigServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Create", + Handler: _Config_Create_Handler, + }, + { + MethodName: "Update", + Handler: _Config_Update_Handler, + }, + { + MethodName: "Delete", + Handler: _Config_Delete_Handler, + }, + { + MethodName: "List", + Handler: _Config_List_Handler, + }, + { + MethodName: "Read", + Handler: _Config_Read_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Watch", + Handler: _Config_Watch_Handler, + ServerStreams: true, + }, + }, + Metadata: "config/source/service/proto/service.proto", } diff --git a/config/source/service/proto/service.pb.micro.go b/config/source/service/proto/service.pb.micro.go index 17c0288e..58e606ee 100644 --- a/config/source/service/proto/service.pb.micro.go +++ b/config/source/service/proto/service.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: service.proto +// source: config/source/service/proto/service.proto package service diff --git a/debug/service/proto/debug.pb.go b/debug/service/proto/debug.pb.go index 83e43aaa..41e6aebe 100644 --- a/debug/service/proto/debug.pb.go +++ b/debug/service/proto/debug.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: micro/go-micro/debug/service/proto/debug.proto +// source: debug/service/proto/debug.proto package debug import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -42,7 +46,7 @@ func (x SpanType) String() string { } func (SpanType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{0} + return fileDescriptor_df91f41a5db378e6, []int{0} } type HealthRequest struct { @@ -57,7 +61,7 @@ func (m *HealthRequest) Reset() { *m = HealthRequest{} } func (m *HealthRequest) String() string { return proto.CompactTextString(m) } func (*HealthRequest) ProtoMessage() {} func (*HealthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{0} + return fileDescriptor_df91f41a5db378e6, []int{0} } func (m *HealthRequest) XXX_Unmarshal(b []byte) error { @@ -97,7 +101,7 @@ func (m *HealthResponse) Reset() { *m = HealthResponse{} } func (m *HealthResponse) String() string { return proto.CompactTextString(m) } func (*HealthResponse) ProtoMessage() {} func (*HealthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{1} + return fileDescriptor_df91f41a5db378e6, []int{1} } func (m *HealthResponse) XXX_Unmarshal(b []byte) error { @@ -137,7 +141,7 @@ func (m *StatsRequest) Reset() { *m = StatsRequest{} } func (m *StatsRequest) String() string { return proto.CompactTextString(m) } func (*StatsRequest) ProtoMessage() {} func (*StatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{2} + return fileDescriptor_df91f41a5db378e6, []int{2} } func (m *StatsRequest) XXX_Unmarshal(b []byte) error { @@ -191,7 +195,7 @@ func (m *StatsResponse) Reset() { *m = StatsResponse{} } func (m *StatsResponse) String() string { return proto.CompactTextString(m) } func (*StatsResponse) ProtoMessage() {} func (*StatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{3} + return fileDescriptor_df91f41a5db378e6, []int{3} } func (m *StatsResponse) XXX_Unmarshal(b []byte) error { @@ -289,7 +293,7 @@ func (m *LogRequest) Reset() { *m = LogRequest{} } func (m *LogRequest) String() string { return proto.CompactTextString(m) } func (*LogRequest) ProtoMessage() {} func (*LogRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{4} + return fileDescriptor_df91f41a5db378e6, []int{4} } func (m *LogRequest) XXX_Unmarshal(b []byte) error { @@ -355,7 +359,7 @@ func (m *Record) Reset() { *m = Record{} } func (m *Record) String() string { return proto.CompactTextString(m) } func (*Record) ProtoMessage() {} func (*Record) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{5} + return fileDescriptor_df91f41a5db378e6, []int{5} } func (m *Record) XXX_Unmarshal(b []byte) error { @@ -409,7 +413,7 @@ func (m *TraceRequest) Reset() { *m = TraceRequest{} } func (m *TraceRequest) String() string { return proto.CompactTextString(m) } func (*TraceRequest) ProtoMessage() {} func (*TraceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{6} + return fileDescriptor_df91f41a5db378e6, []int{6} } func (m *TraceRequest) XXX_Unmarshal(b []byte) error { @@ -448,7 +452,7 @@ func (m *TraceResponse) Reset() { *m = TraceResponse{} } func (m *TraceResponse) String() string { return proto.CompactTextString(m) } func (*TraceResponse) ProtoMessage() {} func (*TraceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{7} + return fileDescriptor_df91f41a5db378e6, []int{7} } func (m *TraceResponse) XXX_Unmarshal(b []byte) error { @@ -501,7 +505,7 @@ func (m *Span) Reset() { *m = Span{} } func (m *Span) String() string { return proto.CompactTextString(m) } func (*Span) ProtoMessage() {} func (*Span) Descriptor() ([]byte, []int) { - return fileDescriptor_dea322649cde1ef2, []int{8} + return fileDescriptor_df91f41a5db378e6, []int{8} } func (m *Span) XXX_Unmarshal(b []byte) error { @@ -593,48 +597,262 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "Span.MetadataEntry") } -func init() { - proto.RegisterFile("micro/go-micro/debug/service/proto/debug.proto", fileDescriptor_dea322649cde1ef2) +func init() { proto.RegisterFile("debug/service/proto/debug.proto", fileDescriptor_df91f41a5db378e6) } + +var fileDescriptor_df91f41a5db378e6 = []byte{ + // 594 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xdb, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0xed, 0x38, 0xb1, 0xa7, 0x8d, 0xa9, 0x96, 0x8b, 0x2c, 0x73, 0x69, 0x65, 0x09, 0x29, + 0x5c, 0xe4, 0x40, 0x79, 0x41, 0xf0, 0x86, 0x8a, 0x04, 0x52, 0x69, 0xa5, 0x6d, 0xfb, 0x01, 0x5b, + 0x7b, 0xe4, 0x1a, 0xea, 0x0b, 0xbb, 0xeb, 0x4a, 0xf9, 0x16, 0xbe, 0x80, 0x37, 0x7e, 0x86, 0xff, + 0x41, 0x7b, 0x71, 0x1b, 0x0b, 0xa1, 0x3e, 0xf0, 0xb6, 0xe7, 0xec, 0xec, 0xc9, 0xcc, 0xc9, 0xf1, + 0xc0, 0x6e, 0x81, 0xe7, 0x7d, 0xb9, 0x12, 0xc8, 0xaf, 0xaa, 0x1c, 0x57, 0x1d, 0x6f, 0x65, 0xbb, + 0xd2, 0x5c, 0xa6, 0xcf, 0xe9, 0x33, 0x58, 0x7c, 0x42, 0x76, 0x29, 0x2f, 0x28, 0x7e, 0xef, 0x51, + 0x48, 0x12, 0xc3, 0xdc, 0x56, 0xc7, 0xce, 0x9e, 0xb3, 0x0c, 0xe9, 0x00, 0xd3, 0x25, 0x44, 0x43, + 0xa9, 0xe8, 0xda, 0x46, 0x20, 0x79, 0x00, 0x33, 0x21, 0x99, 0xec, 0x85, 0x2d, 0xb5, 0x28, 0x5d, + 0xc2, 0xf6, 0x89, 0x64, 0x52, 0xdc, 0xae, 0xf9, 0xdb, 0x81, 0x85, 0x2d, 0xb5, 0x9a, 0x8f, 0x20, + 0x94, 0x55, 0x8d, 0x42, 0xb2, 0xba, 0xd3, 0xd5, 0x53, 0x7a, 0x43, 0x68, 0x25, 0xc9, 0xb8, 0xc4, + 0x22, 0x76, 0xf5, 0xdd, 0x00, 0x55, 0x2f, 0x7d, 0xa7, 0x0a, 0x63, 0x4f, 0x5f, 0x58, 0xa4, 0xf8, + 0x1a, 0xeb, 0x96, 0xaf, 0xe3, 0xa9, 0xe1, 0x0d, 0x52, 0x4a, 0xf2, 0x82, 0x23, 0x2b, 0x44, 0xec, + 0x1b, 0x25, 0x0b, 0x49, 0x04, 0x6e, 0x99, 0xc7, 0x33, 0x4d, 0xba, 0x65, 0x4e, 0x12, 0x08, 0xb8, + 0x19, 0x44, 0xc4, 0x73, 0xcd, 0x5e, 0x63, 0xa5, 0x8e, 0x9c, 0xb7, 0x5c, 0xc4, 0x81, 0x51, 0x37, + 0x28, 0xfd, 0x0a, 0x70, 0xd8, 0x96, 0xb7, 0xce, 0x6f, 0x1c, 0xe4, 0xc8, 0x6a, 0x3d, 0x4e, 0x40, + 0x2d, 0x22, 0xf7, 0xc0, 0xcf, 0xdb, 0xbe, 0x91, 0x7a, 0x18, 0x8f, 0x1a, 0xa0, 0x58, 0x51, 0x35, + 0x39, 0xea, 0x51, 0x3c, 0x6a, 0x40, 0xfa, 0xcb, 0x81, 0x19, 0xc5, 0xbc, 0xe5, 0xc5, 0xdf, 0xe6, + 0x79, 0x9b, 0xe6, 0xbd, 0x86, 0xa0, 0x46, 0xc9, 0x0a, 0x26, 0x59, 0xec, 0xee, 0x79, 0xcb, 0xad, + 0xfd, 0xfb, 0x99, 0x79, 0x98, 0x7d, 0xb1, 0xfc, 0xc7, 0x46, 0xf2, 0x35, 0xbd, 0x2e, 0x53, 0x9d, + 0xd7, 0x28, 0x04, 0x2b, 0x8d, 0xad, 0x21, 0x1d, 0x60, 0xf2, 0x1e, 0x16, 0xa3, 0x47, 0x64, 0x07, + 0xbc, 0x6f, 0xb8, 0xb6, 0x03, 0xaa, 0xa3, 0x6a, 0xf7, 0x8a, 0x5d, 0xf6, 0xa8, 0x67, 0x0b, 0xa9, + 0x01, 0xef, 0xdc, 0xb7, 0x4e, 0xfa, 0x04, 0xb6, 0x4f, 0x39, 0xcb, 0x71, 0x30, 0x28, 0x02, 0xb7, + 0x2a, 0xec, 0x53, 0xb7, 0x2a, 0xd2, 0x97, 0xb0, 0xb0, 0xf7, 0x36, 0x15, 0x0f, 0xc1, 0x17, 0x1d, + 0x6b, 0x54, 0xd0, 0x54, 0xdf, 0x7e, 0x76, 0xd2, 0xb1, 0x86, 0x1a, 0x2e, 0xfd, 0xe1, 0xc2, 0x54, + 0x61, 0xf5, 0x83, 0x52, 0x3d, 0xb3, 0x4a, 0x06, 0x58, 0x71, 0x77, 0x10, 0x57, 0x9e, 0x77, 0x8c, + 0xa3, 0x35, 0x37, 0xa4, 0x16, 0x11, 0x02, 0xd3, 0x86, 0xd5, 0xc6, 0xdc, 0x90, 0xea, 0xf3, 0x66, + 0xde, 0xfc, 0x71, 0xde, 0x12, 0x08, 0x8a, 0x9e, 0x33, 0x59, 0xb5, 0x8d, 0xcd, 0xca, 0x35, 0x26, + 0xab, 0x0d, 0xa3, 0xe7, 0xba, 0xe1, 0xbb, 0xba, 0xe1, 0x7f, 0xda, 0xfc, 0x18, 0xa6, 0x72, 0xdd, + 0xa1, 0x0e, 0x51, 0xb4, 0x1f, 0xea, 0xe2, 0xd3, 0x75, 0x87, 0x54, 0xd3, 0xff, 0xe5, 0xf5, 0xf3, + 0xa7, 0x10, 0x0c, 0x72, 0x64, 0x0b, 0xe6, 0x9f, 0x8f, 0x3e, 0x1c, 0x9f, 0x1d, 0x1d, 0xec, 0x4c, + 0xc8, 0x36, 0x04, 0xc7, 0x67, 0xa7, 0x06, 0x39, 0xfb, 0x3f, 0x1d, 0xf0, 0x0f, 0xd4, 0x62, 0x20, + 0xbb, 0xe0, 0x1d, 0xb6, 0x25, 0xd9, 0xca, 0x6e, 0x12, 0x9c, 0xcc, 0x6d, 0x50, 0xd2, 0xc9, 0x2b, + 0x87, 0xbc, 0x80, 0x99, 0x59, 0x04, 0x24, 0xca, 0x46, 0xcb, 0x23, 0xb9, 0x93, 0x8d, 0x37, 0x44, + 0x3a, 0x21, 0x4b, 0xf0, 0xf5, 0x07, 0x4e, 0x16, 0xd9, 0xe6, 0x4e, 0x48, 0xa2, 0x6c, 0xf4, 0xdd, + 0x9b, 0x4a, 0xfd, 0xa7, 0x93, 0x45, 0xb6, 0x19, 0x8e, 0x24, 0xca, 0x46, 0x59, 0x48, 0x27, 0xe7, + 0x33, 0xbd, 0xbb, 0xde, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x42, 0x7f, 0x05, 0xde, 0x04, + 0x00, 0x00, } -var fileDescriptor_dea322649cde1ef2 = []byte{ - // 595 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0x5b, 0x6e, 0xd3, 0x40, - 0x14, 0x8d, 0x63, 0x3b, 0x71, 0x6e, 0x1e, 0x54, 0xc3, 0x43, 0x56, 0x78, 0xca, 0x12, 0x52, 0x78, - 0x39, 0x10, 0x7e, 0x10, 0xfc, 0xa1, 0x22, 0x81, 0x04, 0xad, 0x34, 0x4d, 0x17, 0x30, 0xb5, 0x47, - 0xa9, 0xa1, 0xf6, 0x98, 0x99, 0x71, 0xa5, 0xac, 0x85, 0x15, 0xf0, 0xc7, 0x66, 0xd8, 0x0f, 0xf3, - 0x72, 0x1a, 0x0b, 0xa1, 0x7e, 0xf0, 0x77, 0xcf, 0xf5, 0x99, 0x33, 0xf7, 0x9e, 0x9c, 0x0c, 0xa4, - 0x65, 0x91, 0x71, 0xb6, 0xdc, 0xb0, 0x17, 0xb6, 0xc8, 0xe9, 0x59, 0xb3, 0x59, 0x0a, 0xca, 0x2f, - 0x8b, 0x8c, 0x2e, 0x6b, 0xce, 0xa4, 0xeb, 0xa5, 0xa6, 0x4e, 0x9e, 0xc0, 0xf4, 0x23, 0x25, 0x17, - 0xf2, 0x1c, 0xd3, 0xef, 0x0d, 0x15, 0x12, 0xc5, 0x30, 0x74, 0xec, 0xd8, 0x7b, 0xe4, 0x2d, 0x46, - 0xb8, 0x85, 0xc9, 0x02, 0x66, 0x2d, 0x55, 0xd4, 0xac, 0x12, 0x14, 0xdd, 0x81, 0x81, 0x90, 0x44, - 0x36, 0xc2, 0x51, 0x1d, 0x52, 0xcc, 0xc9, 0x89, 0xaa, 0xc4, 0xf5, 0x9a, 0xbf, 0x3d, 0x98, 0x3a, - 0xaa, 0xd3, 0xbc, 0x07, 0x23, 0x59, 0x94, 0xea, 0x14, 0x29, 0x6b, 0xc3, 0x0e, 0xf0, 0x55, 0xc3, - 0x28, 0x49, 0xc2, 0x25, 0xcd, 0xe3, 0xbe, 0xf9, 0xd6, 0x42, 0x3d, 0x4b, 0x53, 0x6b, 0x62, 0xec, - 0x9b, 0x0f, 0x0e, 0xe9, 0x7e, 0x49, 0x4b, 0xc6, 0xb7, 0x71, 0x60, 0xfb, 0x16, 0x69, 0x25, 0x79, - 0xce, 0x29, 0xc9, 0x45, 0x1c, 0x5a, 0x25, 0x07, 0xd1, 0x0c, 0xfa, 0x9b, 0x2c, 0x1e, 0x98, 0xa6, - 0xaa, 0xd0, 0x1c, 0x22, 0x6e, 0x17, 0x11, 0xf1, 0xd0, 0x74, 0x77, 0x58, 0xab, 0x53, 0xce, 0x19, - 0x17, 0x71, 0x64, 0xd5, 0x2d, 0x4a, 0xbe, 0x02, 0x7c, 0x66, 0x9b, 0x6b, 0xf7, 0xb7, 0x0e, 0xaa, - 0x6b, 0x4b, 0xb3, 0x4e, 0x84, 0x1d, 0x42, 0xb7, 0x20, 0xcc, 0x58, 0x53, 0x49, 0xb3, 0x8c, 0x8f, - 0x2d, 0xd0, 0x5d, 0x51, 0x54, 0x4a, 0x25, 0xb0, 0x5d, 0x03, 0x92, 0x5f, 0x1e, 0x0c, 0x30, 0xcd, - 0x18, 0xcf, 0xff, 0x36, 0xcf, 0xdf, 0x37, 0xef, 0x15, 0x44, 0x25, 0x95, 0x24, 0x27, 0x92, 0xa8, - 0xeb, 0xfc, 0xc5, 0x78, 0x75, 0x3b, 0xb5, 0x07, 0xd3, 0x2f, 0xae, 0xff, 0xa1, 0x92, 0x7c, 0x8b, - 0x77, 0x34, 0x3d, 0xb9, 0x3a, 0x2d, 0xc8, 0xc6, 0xda, 0xaa, 0x26, 0x77, 0x70, 0xfe, 0x0e, 0xa6, - 0x9d, 0x43, 0xe8, 0x00, 0xfc, 0x6f, 0x74, 0xeb, 0x16, 0xd4, 0xa5, 0x1e, 0xf7, 0x92, 0x5c, 0x34, - 0xd4, 0xec, 0x36, 0xc2, 0x16, 0xbc, 0xed, 0xbf, 0xf1, 0x92, 0x07, 0x30, 0x59, 0x73, 0x92, 0xd1, - 0xd6, 0x20, 0x65, 0x79, 0x91, 0xbb, 0xa3, 0xaa, 0x4a, 0x9e, 0xc3, 0xd4, 0x7d, 0x77, 0xa9, 0xb8, - 0xab, 0x36, 0xaf, 0x49, 0xa5, 0x83, 0xa6, 0xe7, 0x0e, 0xd3, 0x13, 0x85, 0xb0, 0xed, 0x25, 0x3f, - 0xfa, 0x10, 0x68, 0xac, 0x2f, 0x94, 0xfa, 0x98, 0x53, 0xb2, 0xc0, 0x89, 0xf7, 0x5b, 0x71, 0xed, - 0x79, 0x4d, 0x38, 0x75, 0xe6, 0xaa, 0xd4, 0x5a, 0x84, 0x10, 0x04, 0x15, 0x29, 0xad, 0xb9, 0x23, - 0x6c, 0xea, 0xfd, 0xbc, 0x85, 0xdd, 0xbc, 0xa9, 0x54, 0xe4, 0x0d, 0x27, 0xb2, 0x60, 0x95, 0xcb, - 0xca, 0x0e, 0xa3, 0xe5, 0x9e, 0xd1, 0x43, 0x33, 0xf0, 0x4d, 0x33, 0xf0, 0x3f, 0x6d, 0xbe, 0x0f, - 0x81, 0xdc, 0xd6, 0xd4, 0x84, 0x68, 0xb6, 0x1a, 0x19, 0xf2, 0x5a, 0x35, 0xb0, 0x69, 0xff, 0x97, - 0xd7, 0x4f, 0x1f, 0x43, 0xd4, 0xca, 0xa1, 0x31, 0x0c, 0x3f, 0x1d, 0xbd, 0x3f, 0x3e, 0x3d, 0x3a, - 0x3c, 0xe8, 0xa1, 0x09, 0x44, 0xc7, 0xa7, 0x6b, 0x8b, 0xbc, 0xd5, 0x4f, 0x0f, 0xc2, 0x43, 0xfd, - 0x30, 0xa0, 0x87, 0xe0, 0xab, 0xec, 0xa2, 0x71, 0x7a, 0x95, 0xe0, 0xf9, 0xd0, 0x05, 0x25, 0xe9, - 0xbd, 0xf4, 0xd0, 0x33, 0x18, 0xd8, 0x87, 0x00, 0xcd, 0xd2, 0xce, 0xe3, 0x31, 0xbf, 0x91, 0x76, - 0x5f, 0x88, 0xa4, 0x87, 0x16, 0x10, 0x9a, 0x3f, 0x38, 0x9a, 0xa6, 0xfb, 0x6f, 0xc2, 0x7c, 0x96, - 0x76, 0xfe, 0xf7, 0x96, 0x69, 0x7e, 0x74, 0xc5, 0xdc, 0x0f, 0x87, 0x62, 0x76, 0xb2, 0x90, 0xf4, - 0xce, 0x06, 0xe6, 0xed, 0x7a, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xab, 0x72, 0x03, 0xed, - 0x04, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// DebugClient is the client API for Debug service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type DebugClient interface { + Log(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (Debug_LogClient, error) + Health(ctx context.Context, in *HealthRequest, opts ...grpc.CallOption) (*HealthResponse, error) + Stats(ctx context.Context, in *StatsRequest, opts ...grpc.CallOption) (*StatsResponse, error) + Trace(ctx context.Context, in *TraceRequest, opts ...grpc.CallOption) (*TraceResponse, error) +} + +type debugClient struct { + cc *grpc.ClientConn +} + +func NewDebugClient(cc *grpc.ClientConn) DebugClient { + return &debugClient{cc} +} + +func (c *debugClient) Log(ctx context.Context, in *LogRequest, opts ...grpc.CallOption) (Debug_LogClient, error) { + stream, err := c.cc.NewStream(ctx, &_Debug_serviceDesc.Streams[0], "/Debug/Log", opts...) + if err != nil { + return nil, err + } + x := &debugLogClient{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 Debug_LogClient interface { + Recv() (*Record, error) + grpc.ClientStream +} + +type debugLogClient struct { + grpc.ClientStream +} + +func (x *debugLogClient) Recv() (*Record, error) { + m := new(Record) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *debugClient) Health(ctx context.Context, in *HealthRequest, opts ...grpc.CallOption) (*HealthResponse, error) { + out := new(HealthResponse) + err := c.cc.Invoke(ctx, "/Debug/Health", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *debugClient) Stats(ctx context.Context, in *StatsRequest, opts ...grpc.CallOption) (*StatsResponse, error) { + out := new(StatsResponse) + err := c.cc.Invoke(ctx, "/Debug/Stats", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *debugClient) Trace(ctx context.Context, in *TraceRequest, opts ...grpc.CallOption) (*TraceResponse, error) { + out := new(TraceResponse) + err := c.cc.Invoke(ctx, "/Debug/Trace", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// DebugServer is the server API for Debug service. +type DebugServer interface { + Log(*LogRequest, Debug_LogServer) error + Health(context.Context, *HealthRequest) (*HealthResponse, error) + Stats(context.Context, *StatsRequest) (*StatsResponse, error) + Trace(context.Context, *TraceRequest) (*TraceResponse, error) +} + +// UnimplementedDebugServer can be embedded to have forward compatible implementations. +type UnimplementedDebugServer struct { +} + +func (*UnimplementedDebugServer) Log(req *LogRequest, srv Debug_LogServer) error { + return status.Errorf(codes.Unimplemented, "method Log not implemented") +} +func (*UnimplementedDebugServer) Health(ctx context.Context, req *HealthRequest) (*HealthResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Health not implemented") +} +func (*UnimplementedDebugServer) Stats(ctx context.Context, req *StatsRequest) (*StatsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Stats not implemented") +} +func (*UnimplementedDebugServer) Trace(ctx context.Context, req *TraceRequest) (*TraceResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Trace not implemented") +} + +func RegisterDebugServer(s *grpc.Server, srv DebugServer) { + s.RegisterService(&_Debug_serviceDesc, srv) +} + +func _Debug_Log_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(LogRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(DebugServer).Log(m, &debugLogServer{stream}) +} + +type Debug_LogServer interface { + Send(*Record) error + grpc.ServerStream +} + +type debugLogServer struct { + grpc.ServerStream +} + +func (x *debugLogServer) Send(m *Record) error { + return x.ServerStream.SendMsg(m) +} + +func _Debug_Health_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(HealthRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DebugServer).Health(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Debug/Health", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DebugServer).Health(ctx, req.(*HealthRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Debug_Stats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StatsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DebugServer).Stats(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Debug/Stats", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DebugServer).Stats(ctx, req.(*StatsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Debug_Trace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TraceRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DebugServer).Trace(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Debug/Trace", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DebugServer).Trace(ctx, req.(*TraceRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Debug_serviceDesc = grpc.ServiceDesc{ + ServiceName: "Debug", + HandlerType: (*DebugServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Health", + Handler: _Debug_Health_Handler, + }, + { + MethodName: "Stats", + Handler: _Debug_Stats_Handler, + }, + { + MethodName: "Trace", + Handler: _Debug_Trace_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Log", + Handler: _Debug_Log_Handler, + ServerStreams: true, + }, + }, + Metadata: "debug/service/proto/debug.proto", } diff --git a/debug/service/proto/debug.pb.micro.go b/debug/service/proto/debug.pb.micro.go index 0692209c..9747f3c2 100644 --- a/debug/service/proto/debug.pb.micro.go +++ b/debug/service/proto/debug.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: micro/go-micro/debug/service/proto/debug.proto +// source: debug/service/proto/debug.proto package debug diff --git a/errors/errors.pb.go b/errors/errors.pb.go index f749993d..90fda81a 100644 --- a/errors/errors.pb.go +++ b/errors/errors.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: errors.proto +// source: errors/errors.proto package errors @@ -34,7 +34,7 @@ func (m *Error) Reset() { *m = Error{} } func (m *Error) String() string { return proto.CompactTextString(m) } func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_24fe73c7f0ddb19c, []int{0} + return fileDescriptor_85c4eef3398a32b2, []int{0} } func (m *Error) XXX_Unmarshal(b []byte) error { @@ -87,16 +87,16 @@ func init() { proto.RegisterType((*Error)(nil), "errors.Error") } -func init() { proto.RegisterFile("errors.proto", fileDescriptor_24fe73c7f0ddb19c) } +func init() { proto.RegisterFile("errors/errors.proto", fileDescriptor_85c4eef3398a32b2) } -var fileDescriptor_24fe73c7f0ddb19c = []byte{ - // 116 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0x2d, 0x2a, 0xca, - 0x2f, 0x2a, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xa2, 0xb9, 0x58, - 0x5d, 0x41, 0x2c, 0x21, 0x3e, 0x2e, 0xa6, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, - 0xa6, 0xcc, 0x14, 0x21, 0x21, 0x2e, 0x96, 0xe4, 0xfc, 0x94, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, - 0xd6, 0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x25, 0xb5, 0x24, 0x31, 0x33, 0x47, 0x82, 0x19, - 0xac, 0x0e, 0xca, 0x03, 0x89, 0x17, 0x97, 0x24, 0x96, 0x94, 0x16, 0x4b, 0xb0, 0x40, 0xc4, 0x21, - 0xbc, 0x24, 0x36, 0xb0, 0x5d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xef, 0xe7, 0x5d, 0xd3, - 0x7b, 0x00, 0x00, 0x00, +var fileDescriptor_85c4eef3398a32b2 = []byte{ + // 118 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0x2d, 0x2a, 0xca, + 0x2f, 0x2a, 0xd6, 0x87, 0x50, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x6c, 0x10, 0x9e, 0x52, + 0x34, 0x17, 0xab, 0x2b, 0x88, 0x25, 0xc4, 0xc7, 0xc5, 0x94, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, + 0xc1, 0x19, 0xc4, 0x94, 0x99, 0x22, 0x24, 0xc4, 0xc5, 0x92, 0x9c, 0x9f, 0x92, 0x2a, 0xc1, 0xa4, + 0xc0, 0xa8, 0xc1, 0x1a, 0x04, 0x66, 0x0b, 0x89, 0x71, 0xb1, 0xa5, 0xa4, 0x96, 0x24, 0x66, 0xe6, + 0x48, 0x30, 0x83, 0xd5, 0x41, 0x79, 0x20, 0xf1, 0xe2, 0x92, 0xc4, 0x92, 0xd2, 0x62, 0x09, 0x16, + 0x88, 0x38, 0x84, 0x97, 0xc4, 0x06, 0xb6, 0xcb, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xca, 0xc3, + 0xcb, 0x29, 0x82, 0x00, 0x00, 0x00, } diff --git a/errors/errors.pb.micro.go b/errors/errors.pb.micro.go new file mode 100644 index 00000000..7a26efe7 --- /dev/null +++ b/errors/errors.pb.micro.go @@ -0,0 +1,21 @@ +// Code generated by protoc-gen-micro. DO NOT EDIT. +// source: errors/errors.proto + +package errors + +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package diff --git a/generate.go b/generate.go new file mode 100644 index 00000000..26d7e9f2 --- /dev/null +++ b/generate.go @@ -0,0 +1,3 @@ +package micro + +//go:generate ./.github/generate.sh diff --git a/go.mod b/go.mod index a0ce00d1..02f6f3dc 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.3.2 + github.com/google/go-cmp v0.4.0 // indirect github.com/google/uuid v1.1.1 github.com/gorilla/handlers v1.4.2 github.com/gorilla/websocket v1.4.1 diff --git a/go.sum b/go.sum index 07d12b66..57ad009a 100644 --- a/go.sum +++ b/go.sum @@ -191,6 +191,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -588,6 +590,8 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 h1:RIIXAeV6GvDBuADKumTODat golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= diff --git a/network/service/proto/network.pb.go b/network/service/proto/network.pb.go index 6dded795..553d74e6 100644 --- a/network/service/proto/network.pb.go +++ b/network/service/proto/network.pb.go @@ -1,12 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: network.proto +// source: network/service/proto/network.proto package go_micro_network import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" proto1 "github.com/micro/go-micro/v2/router/service/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -37,7 +41,7 @@ func (m *Query) Reset() { *m = Query{} } func (m *Query) String() string { return proto.CompactTextString(m) } func (*Query) ProtoMessage() {} func (*Query) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{0} + return fileDescriptor_1aab434177f140e0, []int{0} } func (m *Query) XXX_Unmarshal(b []byte) error { @@ -104,7 +108,7 @@ func (m *ConnectRequest) Reset() { *m = ConnectRequest{} } func (m *ConnectRequest) String() string { return proto.CompactTextString(m) } func (*ConnectRequest) ProtoMessage() {} func (*ConnectRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{1} + return fileDescriptor_1aab434177f140e0, []int{1} } func (m *ConnectRequest) XXX_Unmarshal(b []byte) error { @@ -142,7 +146,7 @@ func (m *ConnectResponse) Reset() { *m = ConnectResponse{} } func (m *ConnectResponse) String() string { return proto.CompactTextString(m) } func (*ConnectResponse) ProtoMessage() {} func (*ConnectResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{2} + return fileDescriptor_1aab434177f140e0, []int{2} } func (m *ConnectResponse) XXX_Unmarshal(b []byte) error { @@ -176,7 +180,7 @@ func (m *NodesRequest) Reset() { *m = NodesRequest{} } func (m *NodesRequest) String() string { return proto.CompactTextString(m) } func (*NodesRequest) ProtoMessage() {} func (*NodesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{3} + return fileDescriptor_1aab434177f140e0, []int{3} } func (m *NodesRequest) XXX_Unmarshal(b []byte) error { @@ -217,7 +221,7 @@ func (m *NodesResponse) Reset() { *m = NodesResponse{} } func (m *NodesResponse) String() string { return proto.CompactTextString(m) } func (*NodesResponse) ProtoMessage() {} func (*NodesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{4} + return fileDescriptor_1aab434177f140e0, []int{4} } func (m *NodesResponse) XXX_Unmarshal(b []byte) error { @@ -257,7 +261,7 @@ func (m *GraphRequest) Reset() { *m = GraphRequest{} } func (m *GraphRequest) String() string { return proto.CompactTextString(m) } func (*GraphRequest) ProtoMessage() {} func (*GraphRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{5} + return fileDescriptor_1aab434177f140e0, []int{5} } func (m *GraphRequest) XXX_Unmarshal(b []byte) error { @@ -296,7 +300,7 @@ func (m *GraphResponse) Reset() { *m = GraphResponse{} } func (m *GraphResponse) String() string { return proto.CompactTextString(m) } func (*GraphResponse) ProtoMessage() {} func (*GraphResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{6} + return fileDescriptor_1aab434177f140e0, []int{6} } func (m *GraphResponse) XXX_Unmarshal(b []byte) error { @@ -336,7 +340,7 @@ func (m *RoutesRequest) Reset() { *m = RoutesRequest{} } func (m *RoutesRequest) String() string { return proto.CompactTextString(m) } func (*RoutesRequest) ProtoMessage() {} func (*RoutesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{7} + return fileDescriptor_1aab434177f140e0, []int{7} } func (m *RoutesRequest) XXX_Unmarshal(b []byte) error { @@ -375,7 +379,7 @@ func (m *RoutesResponse) Reset() { *m = RoutesResponse{} } func (m *RoutesResponse) String() string { return proto.CompactTextString(m) } func (*RoutesResponse) ProtoMessage() {} func (*RoutesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{8} + return fileDescriptor_1aab434177f140e0, []int{8} } func (m *RoutesResponse) XXX_Unmarshal(b []byte) error { @@ -413,7 +417,7 @@ func (m *ServicesRequest) Reset() { *m = ServicesRequest{} } func (m *ServicesRequest) String() string { return proto.CompactTextString(m) } func (*ServicesRequest) ProtoMessage() {} func (*ServicesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{9} + return fileDescriptor_1aab434177f140e0, []int{9} } func (m *ServicesRequest) XXX_Unmarshal(b []byte) error { @@ -445,7 +449,7 @@ func (m *ServicesResponse) Reset() { *m = ServicesResponse{} } func (m *ServicesResponse) String() string { return proto.CompactTextString(m) } func (*ServicesResponse) ProtoMessage() {} func (*ServicesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{10} + return fileDescriptor_1aab434177f140e0, []int{10} } func (m *ServicesResponse) XXX_Unmarshal(b []byte) error { @@ -483,7 +487,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{11} + return fileDescriptor_1aab434177f140e0, []int{11} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { @@ -515,7 +519,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{12} + return fileDescriptor_1aab434177f140e0, []int{12} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { @@ -556,7 +560,7 @@ func (m *Error) Reset() { *m = Error{} } func (m *Error) String() string { return proto.CompactTextString(m) } func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{13} + return fileDescriptor_1aab434177f140e0, []int{13} } func (m *Error) XXX_Unmarshal(b []byte) error { @@ -603,7 +607,7 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{14} + return fileDescriptor_1aab434177f140e0, []int{14} } func (m *Status) XXX_Unmarshal(b []byte) error { @@ -652,7 +656,7 @@ func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{15} + return fileDescriptor_1aab434177f140e0, []int{15} } func (m *Node) XXX_Unmarshal(b []byte) error { @@ -721,7 +725,7 @@ func (m *Connect) Reset() { *m = Connect{} } func (m *Connect) String() string { return proto.CompactTextString(m) } func (*Connect) ProtoMessage() {} func (*Connect) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{16} + return fileDescriptor_1aab434177f140e0, []int{16} } func (m *Connect) XXX_Unmarshal(b []byte) error { @@ -762,7 +766,7 @@ func (m *Close) Reset() { *m = Close{} } func (m *Close) String() string { return proto.CompactTextString(m) } func (*Close) ProtoMessage() {} func (*Close) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{17} + return fileDescriptor_1aab434177f140e0, []int{17} } func (m *Close) XXX_Unmarshal(b []byte) error { @@ -805,7 +809,7 @@ func (m *Peer) Reset() { *m = Peer{} } func (m *Peer) String() string { return proto.CompactTextString(m) } func (*Peer) ProtoMessage() {} func (*Peer) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{18} + return fileDescriptor_1aab434177f140e0, []int{18} } func (m *Peer) XXX_Unmarshal(b []byte) error { @@ -855,7 +859,7 @@ func (m *Sync) Reset() { *m = Sync{} } func (m *Sync) String() string { return proto.CompactTextString(m) } func (*Sync) ProtoMessage() {} func (*Sync) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{19} + return fileDescriptor_1aab434177f140e0, []int{19} } func (m *Sync) XXX_Unmarshal(b []byte) error { @@ -914,51 +918,324 @@ func init() { proto.RegisterType((*Sync)(nil), "go.micro.network.Sync") } -func init() { proto.RegisterFile("network.proto", fileDescriptor_8571034d60397816) } - -var fileDescriptor_8571034d60397816 = []byte{ - // 678 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x4e, 0xdb, 0x30, - 0x14, 0xa6, 0x6d, 0x52, 0xe0, 0x8c, 0x14, 0x66, 0x4d, 0x2c, 0xca, 0xc5, 0xe8, 0x2c, 0x2e, 0xd0, - 0x34, 0xd2, 0x09, 0x34, 0x6d, 0x1a, 0x1a, 0x42, 0x43, 0x68, 0xd2, 0x24, 0x10, 0x4b, 0x5f, 0x60, - 0x21, 0xb1, 0x4a, 0x05, 0x8d, 0x8b, 0xe3, 0x80, 0xfa, 0x04, 0x7b, 0xd3, 0xbd, 0xc4, 0x6e, 0x26, - 0xdb, 0x27, 0x21, 0xa1, 0x49, 0x57, 0xee, 0x72, 0xec, 0xef, 0x3b, 0xc7, 0xe7, 0xef, 0x0b, 0x38, - 0x09, 0x93, 0x0f, 0x5c, 0xdc, 0xf8, 0x53, 0xc1, 0x25, 0x27, 0x5b, 0x23, 0xee, 0x4f, 0xc6, 0x91, - 0xe0, 0x3e, 0x9e, 0x7b, 0x47, 0xa3, 0xb1, 0xbc, 0xce, 0xae, 0xfc, 0x88, 0x4f, 0x06, 0xfa, 0x66, - 0x30, 0xe2, 0xfb, 0xe6, 0x43, 0xf0, 0x4c, 0x32, 0x31, 0x48, 0x99, 0xb8, 0x1f, 0x47, 0x6c, 0xa0, - 0x3d, 0xe0, 0xa1, 0x71, 0x47, 0x7f, 0xb7, 0xc0, 0xfe, 0x99, 0x31, 0x31, 0x23, 0x2e, 0xac, 0x22, - 0xce, 0x6d, 0xf5, 0x5b, 0x7b, 0xeb, 0x41, 0x6e, 0xaa, 0x9b, 0x30, 0x8e, 0x05, 0x4b, 0x53, 0xb7, - 0x6d, 0x6e, 0xd0, 0x54, 0x37, 0xa3, 0x50, 0xb2, 0x87, 0x70, 0xe6, 0x76, 0xcc, 0x0d, 0x9a, 0x64, - 0x1b, 0xba, 0x26, 0x8e, 0x6b, 0xe9, 0x0b, 0xb4, 0x14, 0x03, 0xdf, 0xed, 0xda, 0x86, 0x81, 0x26, - 0x3d, 0x86, 0xde, 0x29, 0x4f, 0x12, 0x16, 0xc9, 0x80, 0xdd, 0x65, 0x2c, 0x95, 0xe4, 0x3d, 0xd8, - 0x09, 0x8f, 0x59, 0xea, 0xb6, 0xfa, 0x9d, 0xbd, 0x17, 0x07, 0xdb, 0xfe, 0xd3, 0xd4, 0xfd, 0x0b, - 0x1e, 0xb3, 0xc0, 0x80, 0xe8, 0x4b, 0xd8, 0x2c, 0xf8, 0xe9, 0x94, 0x27, 0x29, 0xa3, 0xbb, 0xb0, - 0xa1, 0x10, 0x69, 0xee, 0xf0, 0x15, 0xd8, 0x31, 0x9b, 0xca, 0x6b, 0x9d, 0xa0, 0x13, 0x18, 0x83, - 0x7e, 0x05, 0x07, 0x51, 0x86, 0xf6, 0xcc, 0xb8, 0xbb, 0xb0, 0xf1, 0x5d, 0x84, 0xd3, 0xeb, 0xc5, - 0x41, 0x8e, 0xc0, 0x41, 0x14, 0x06, 0x79, 0x07, 0x96, 0xe0, 0x5c, 0x6a, 0x54, 0x6d, 0x8c, 0x4b, - 0xc6, 0x44, 0xa0, 0x31, 0xf4, 0x18, 0x9c, 0x40, 0x95, 0xaf, 0x48, 0x64, 0x1f, 0xec, 0x3b, 0xd5, - 0x34, 0x64, 0xbf, 0x9e, 0x67, 0xeb, 0x9e, 0x06, 0x06, 0x45, 0x4f, 0xa0, 0x97, 0xf3, 0x31, 0xba, - 0x8f, 0xed, 0xa9, 0xc9, 0x11, 0xc7, 0x43, 0x13, 0xb0, 0x6d, 0xba, 0xb8, 0x43, 0x33, 0x0d, 0xf9, - 0x1b, 0xa8, 0x0f, 0x5b, 0x8f, 0x47, 0xe8, 0xd6, 0x83, 0x35, 0x1c, 0x1a, 0xe3, 0x78, 0x3d, 0x28, - 0x6c, 0xba, 0x09, 0xce, 0x50, 0x86, 0x32, 0x2b, 0x1c, 0x7c, 0x83, 0x5e, 0x7e, 0x80, 0xf4, 0x0f, - 0xd0, 0x4d, 0xf5, 0x09, 0xe6, 0xe5, 0xce, 0xe7, 0x85, 0x0c, 0xc4, 0xd1, 0x01, 0xd8, 0x67, 0x42, - 0x70, 0xa1, 0xaa, 0x1e, 0xf1, 0x2c, 0x91, 0x79, 0xd5, 0xb5, 0x41, 0xb6, 0xa0, 0x33, 0x49, 0x47, - 0x38, 0xb5, 0xea, 0x93, 0x7e, 0x82, 0xae, 0x71, 0xa1, 0x6a, 0xc8, 0x14, 0xb5, 0xb9, 0x86, 0xda, - 0x73, 0x60, 0x50, 0xf4, 0x6f, 0x0b, 0x2c, 0xd5, 0x76, 0xd2, 0x83, 0xf6, 0x38, 0xc6, 0x15, 0x69, - 0x8f, 0xe3, 0xc5, 0xdb, 0x91, 0xcf, 0x7a, 0xa7, 0x32, 0xeb, 0xe4, 0x04, 0xd6, 0x26, 0x4c, 0x86, - 0x71, 0x28, 0x43, 0xd7, 0xd2, 0x0d, 0xd8, 0xad, 0x1f, 0x32, 0xff, 0x1c, 0x61, 0x67, 0x89, 0x14, - 0xb3, 0xa0, 0x60, 0x95, 0x4a, 0x65, 0x2f, 0x57, 0x2a, 0xef, 0x08, 0x9c, 0x8a, 0x33, 0x55, 0x9c, - 0x1b, 0x36, 0xc3, 0x4c, 0xd4, 0xa7, 0x2a, 0xe2, 0x7d, 0x78, 0x9b, 0x31, 0x4c, 0xc4, 0x18, 0x5f, - 0xda, 0x9f, 0x5b, 0xf4, 0x23, 0xac, 0xe2, 0x72, 0xa9, 0xc1, 0x55, 0x83, 0xdf, 0x3c, 0xb8, 0x7a, - 0x39, 0x34, 0x86, 0x1e, 0x82, 0x7d, 0x7a, 0xcb, 0xcd, 0xb4, 0x2f, 0x4d, 0xfa, 0x05, 0x96, 0x9a, - 0xfd, 0xe7, 0x70, 0xd4, 0xca, 0x4e, 0x19, 0x13, 0xaa, 0x05, 0x9d, 0x05, 0xeb, 0x64, 0x40, 0xf4, - 0x0a, 0xac, 0xe1, 0x2c, 0x89, 0x54, 0x04, 0x75, 0xf0, 0xbf, 0x1d, 0x54, 0x98, 0xd2, 0xc6, 0xb4, - 0x97, 0xd9, 0x98, 0x83, 0x3f, 0x1d, 0x58, 0xbd, 0xc0, 0x76, 0x5f, 0x3e, 0x56, 0xaf, 0x3f, 0x1f, - 0xa4, 0xaa, 0x7a, 0xde, 0xdb, 0x05, 0x08, 0xd4, 0xb5, 0x15, 0xf2, 0x03, 0x6c, 0x2d, 0x27, 0xe4, - 0xcd, 0x3c, 0xba, 0xac, 0x46, 0xde, 0x4e, 0xe3, 0x7d, 0xd9, 0x97, 0xd6, 0xbf, 0x3a, 0x5f, 0x65, - 0xf9, 0xac, 0xf3, 0x55, 0x11, 0x4e, 0xba, 0x42, 0xce, 0xa1, 0x6b, 0x94, 0x86, 0xd4, 0x80, 0x2b, - 0x1a, 0xe6, 0xf5, 0x9b, 0x01, 0x85, 0xbb, 0x21, 0xac, 0xe5, 0x1a, 0x43, 0x6a, 0xea, 0xf2, 0x44, - 0x92, 0x3c, 0xba, 0x08, 0x52, 0x7e, 0x23, 0x4a, 0xc0, 0x4e, 0xe3, 0xd2, 0x34, 0xbf, 0xb1, 0x2a, - 0x59, 0x74, 0xe5, 0xaa, 0xab, 0x7f, 0xa4, 0x87, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x45, - 0xe6, 0xf4, 0xa8, 0x07, 0x00, 0x00, +func init() { + proto.RegisterFile("network/service/proto/network.proto", fileDescriptor_1aab434177f140e0) +} + +var fileDescriptor_1aab434177f140e0 = []byte{ + // 667 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x4e, 0xdb, 0x4c, + 0x10, 0xc5, 0xb1, 0x1d, 0x60, 0x3e, 0x1c, 0xf8, 0x56, 0x15, 0xb5, 0x7c, 0x51, 0xc2, 0x96, 0x0b, + 0x54, 0xb5, 0x4e, 0x05, 0xaa, 0x5a, 0x15, 0x15, 0xa1, 0x22, 0x54, 0xa9, 0x12, 0x88, 0x3a, 0x2f, + 0x50, 0x13, 0xaf, 0x20, 0x02, 0xbc, 0x61, 0xbd, 0x06, 0xe5, 0x09, 0xfa, 0xa6, 0x7d, 0x89, 0xde, + 0x54, 0xbb, 0x3b, 0x36, 0x36, 0xb1, 0xd3, 0x70, 0x97, 0x99, 0x3d, 0x67, 0xc6, 0xf3, 0x77, 0x02, + 0xaf, 0x53, 0x26, 0x1f, 0xb8, 0xb8, 0x1e, 0x64, 0x4c, 0xdc, 0x8f, 0x47, 0x6c, 0x30, 0x11, 0x5c, + 0xf2, 0x01, 0x7a, 0x43, 0x6d, 0x91, 0x8d, 0x4b, 0x1e, 0xde, 0x8e, 0x47, 0x82, 0x87, 0xe8, 0x0f, + 0xb6, 0x05, 0xcf, 0x25, 0x13, 0x4f, 0x58, 0xc6, 0x69, 0x48, 0xf4, 0x97, 0x05, 0xee, 0x8f, 0x9c, + 0x89, 0x29, 0xf1, 0x61, 0x19, 0x71, 0xbe, 0xd5, 0xb7, 0x76, 0x57, 0xa3, 0xc2, 0x54, 0x2f, 0x71, + 0x92, 0x08, 0x96, 0x65, 0x7e, 0xc7, 0xbc, 0xa0, 0xa9, 0x5e, 0x2e, 0x63, 0xc9, 0x1e, 0xe2, 0xa9, + 0x6f, 0x9b, 0x17, 0x34, 0xc9, 0x26, 0x74, 0x4d, 0x1e, 0xdf, 0xd1, 0x0f, 0x68, 0x29, 0x06, 0x7e, + 0x9d, 0xef, 0x1a, 0x06, 0x9a, 0xf4, 0x10, 0x7a, 0xc7, 0x3c, 0x4d, 0xd9, 0x48, 0x46, 0xec, 0x2e, + 0x67, 0x99, 0x24, 0x6f, 0xc1, 0x4d, 0x79, 0xc2, 0x32, 0xdf, 0xea, 0xdb, 0xbb, 0xff, 0xed, 0x6d, + 0x86, 0x4f, 0x0b, 0x0c, 0xcf, 0x78, 0xc2, 0x22, 0x03, 0xa2, 0xff, 0xc3, 0x7a, 0xc9, 0xcf, 0x26, + 0x3c, 0xcd, 0x18, 0xdd, 0x81, 0x35, 0x85, 0xc8, 0x8a, 0x80, 0x2f, 0xc0, 0x4d, 0xd8, 0x44, 0x5e, + 0xe9, 0x02, 0xbd, 0xc8, 0x18, 0xf4, 0x0b, 0x78, 0x88, 0x32, 0xb4, 0x67, 0xe6, 0xdd, 0x81, 0xb5, + 0x6f, 0x22, 0x9e, 0x5c, 0xcd, 0x4f, 0x72, 0x00, 0x1e, 0xa2, 0x30, 0xc9, 0x1b, 0x70, 0x04, 0xe7, + 0x52, 0xa3, 0x1a, 0x73, 0x9c, 0x33, 0x26, 0x22, 0x8d, 0xa1, 0x87, 0xe0, 0x45, 0xaa, 0x7d, 0x65, + 0x21, 0xef, 0xc0, 0xbd, 0x53, 0x43, 0x43, 0xf6, 0xcb, 0x59, 0xb6, 0x9e, 0x69, 0x64, 0x50, 0xf4, + 0x08, 0x7a, 0x05, 0x1f, 0xb3, 0x87, 0x38, 0x9e, 0x86, 0x1a, 0x71, 0x3d, 0x34, 0x01, 0xc7, 0xa6, + 0x9b, 0x3b, 0x34, 0xdb, 0x50, 0x7c, 0x03, 0x0d, 0x61, 0xe3, 0xd1, 0x85, 0x61, 0x03, 0x58, 0xc1, + 0xa5, 0x31, 0x81, 0x57, 0xa3, 0xd2, 0xa6, 0xeb, 0xe0, 0x0d, 0x65, 0x2c, 0xf3, 0x32, 0xc0, 0x57, + 0xe8, 0x15, 0x0e, 0xa4, 0xbf, 0x87, 0x6e, 0xa6, 0x3d, 0x58, 0x97, 0x3f, 0x5b, 0x17, 0x32, 0x10, + 0x47, 0x07, 0xe0, 0x9e, 0x08, 0xc1, 0x85, 0xea, 0xfa, 0x88, 0xe7, 0xa9, 0x2c, 0xba, 0xae, 0x0d, + 0xb2, 0x01, 0xf6, 0x6d, 0x76, 0x89, 0x5b, 0xab, 0x7e, 0xd2, 0x8f, 0xd0, 0x35, 0x21, 0x54, 0x0f, + 0x99, 0xa2, 0xb6, 0xf7, 0x50, 0x47, 0x8e, 0x0c, 0x8a, 0xfe, 0xb1, 0xc0, 0x51, 0x63, 0x27, 0x3d, + 0xe8, 0x8c, 0x13, 0x3c, 0x91, 0xce, 0x38, 0x99, 0x7f, 0x1d, 0xc5, 0xae, 0xdb, 0xb5, 0x5d, 0x27, + 0x47, 0xb0, 0x72, 0xcb, 0x64, 0x9c, 0xc4, 0x32, 0xf6, 0x1d, 0x3d, 0x80, 0x9d, 0xe6, 0x25, 0x0b, + 0x4f, 0x11, 0x76, 0x92, 0x4a, 0x31, 0x8d, 0x4a, 0x56, 0xa5, 0x55, 0xee, 0x62, 0xad, 0x0a, 0x0e, + 0xc0, 0xab, 0x05, 0x53, 0xcd, 0xb9, 0x66, 0x53, 0xac, 0x44, 0xfd, 0x54, 0x4d, 0xbc, 0x8f, 0x6f, + 0x72, 0x86, 0x85, 0x18, 0xe3, 0x73, 0xe7, 0x93, 0x45, 0x3f, 0xc0, 0x32, 0x1e, 0x97, 0x5a, 0x5c, + 0xb5, 0xf8, 0xed, 0x8b, 0xab, 0x8f, 0x43, 0x63, 0xe8, 0x3e, 0xb8, 0xc7, 0x37, 0xdc, 0x6c, 0xfb, + 0xc2, 0xa4, 0x9f, 0xe0, 0xa8, 0xdd, 0x7f, 0x0e, 0x47, 0x9d, 0xec, 0x84, 0x31, 0xa1, 0x46, 0x60, + 0xcf, 0x39, 0x27, 0x03, 0xa2, 0x17, 0xe0, 0x0c, 0xa7, 0xe9, 0x48, 0x65, 0x50, 0x8e, 0x7f, 0xdd, + 0xa0, 0xc2, 0x54, 0x2e, 0xa6, 0xb3, 0xc8, 0xc5, 0xec, 0xfd, 0xb6, 0x61, 0xf9, 0x0c, 0xc7, 0x7d, + 0xfe, 0xd8, 0xbd, 0xfe, 0x6c, 0x92, 0xba, 0xea, 0x05, 0xdb, 0x73, 0x10, 0xa8, 0x6b, 0x4b, 0xe4, + 0x3b, 0xb8, 0x5a, 0x4e, 0xc8, 0xab, 0x59, 0x74, 0x55, 0x8d, 0x82, 0xad, 0xd6, 0xf7, 0x6a, 0x2c, + 0xad, 0x7f, 0x4d, 0xb1, 0xaa, 0xf2, 0xd9, 0x14, 0xab, 0x26, 0x9c, 0x74, 0x89, 0x9c, 0x42, 0xd7, + 0x28, 0x0d, 0x69, 0x00, 0xd7, 0x34, 0x2c, 0xe8, 0xb7, 0x03, 0xca, 0x70, 0x43, 0x58, 0x29, 0x34, + 0x86, 0x34, 0xf4, 0xe5, 0x89, 0x24, 0x05, 0x74, 0x1e, 0xa4, 0xfa, 0x8d, 0x28, 0x01, 0x5b, 0xad, + 0x47, 0xd3, 0xfe, 0x8d, 0x75, 0xc9, 0xa2, 0x4b, 0x17, 0x5d, 0xfd, 0x47, 0xba, 0xff, 0x37, 0x00, + 0x00, 0xff, 0xff, 0x13, 0x9f, 0x0c, 0xc2, 0xa4, 0x07, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// NetworkClient is the client API for Network service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type NetworkClient interface { + // Connect to the network + Connect(ctx context.Context, in *ConnectRequest, opts ...grpc.CallOption) (*ConnectResponse, error) + // Returns the entire network graph + Graph(ctx context.Context, in *GraphRequest, opts ...grpc.CallOption) (*GraphResponse, error) + // Returns a list of known nodes in the network + Nodes(ctx context.Context, in *NodesRequest, opts ...grpc.CallOption) (*NodesResponse, error) + // Returns a list of known routes in the network + Routes(ctx context.Context, in *RoutesRequest, opts ...grpc.CallOption) (*RoutesResponse, error) + // Returns a list of known services based on routes + Services(ctx context.Context, in *ServicesRequest, opts ...grpc.CallOption) (*ServicesResponse, error) + // Status returns network status + Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) +} + +type networkClient struct { + cc *grpc.ClientConn +} + +func NewNetworkClient(cc *grpc.ClientConn) NetworkClient { + return &networkClient{cc} +} + +func (c *networkClient) Connect(ctx context.Context, in *ConnectRequest, opts ...grpc.CallOption) (*ConnectResponse, error) { + out := new(ConnectResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Connect", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *networkClient) Graph(ctx context.Context, in *GraphRequest, opts ...grpc.CallOption) (*GraphResponse, error) { + out := new(GraphResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Graph", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *networkClient) Nodes(ctx context.Context, in *NodesRequest, opts ...grpc.CallOption) (*NodesResponse, error) { + out := new(NodesResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Nodes", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *networkClient) Routes(ctx context.Context, in *RoutesRequest, opts ...grpc.CallOption) (*RoutesResponse, error) { + out := new(RoutesResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Routes", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *networkClient) Services(ctx context.Context, in *ServicesRequest, opts ...grpc.CallOption) (*ServicesResponse, error) { + out := new(ServicesResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Services", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *networkClient) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) { + out := new(StatusResponse) + err := c.cc.Invoke(ctx, "/go.micro.network.Network/Status", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// NetworkServer is the server API for Network service. +type NetworkServer interface { + // Connect to the network + Connect(context.Context, *ConnectRequest) (*ConnectResponse, error) + // Returns the entire network graph + Graph(context.Context, *GraphRequest) (*GraphResponse, error) + // Returns a list of known nodes in the network + Nodes(context.Context, *NodesRequest) (*NodesResponse, error) + // Returns a list of known routes in the network + Routes(context.Context, *RoutesRequest) (*RoutesResponse, error) + // Returns a list of known services based on routes + Services(context.Context, *ServicesRequest) (*ServicesResponse, error) + // Status returns network status + Status(context.Context, *StatusRequest) (*StatusResponse, error) +} + +// UnimplementedNetworkServer can be embedded to have forward compatible implementations. +type UnimplementedNetworkServer struct { +} + +func (*UnimplementedNetworkServer) Connect(ctx context.Context, req *ConnectRequest) (*ConnectResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Connect not implemented") +} +func (*UnimplementedNetworkServer) Graph(ctx context.Context, req *GraphRequest) (*GraphResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Graph not implemented") +} +func (*UnimplementedNetworkServer) Nodes(ctx context.Context, req *NodesRequest) (*NodesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Nodes not implemented") +} +func (*UnimplementedNetworkServer) Routes(ctx context.Context, req *RoutesRequest) (*RoutesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Routes not implemented") +} +func (*UnimplementedNetworkServer) Services(ctx context.Context, req *ServicesRequest) (*ServicesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Services not implemented") +} +func (*UnimplementedNetworkServer) Status(ctx context.Context, req *StatusRequest) (*StatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Status not implemented") +} + +func RegisterNetworkServer(s *grpc.Server, srv NetworkServer) { + s.RegisterService(&_Network_serviceDesc, srv) +} + +func _Network_Connect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ConnectRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Connect(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Connect", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Connect(ctx, req.(*ConnectRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Network_Graph_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GraphRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Graph(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Graph", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Graph(ctx, req.(*GraphRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Network_Nodes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(NodesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Nodes(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Nodes", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Nodes(ctx, req.(*NodesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Network_Routes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RoutesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Routes(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Routes", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Routes(ctx, req.(*RoutesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Network_Services_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ServicesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Services(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Services", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Services(ctx, req.(*ServicesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Network_Status_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NetworkServer).Status(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.network.Network/Status", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NetworkServer).Status(ctx, req.(*StatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Network_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.network.Network", + HandlerType: (*NetworkServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Connect", + Handler: _Network_Connect_Handler, + }, + { + MethodName: "Graph", + Handler: _Network_Graph_Handler, + }, + { + MethodName: "Nodes", + Handler: _Network_Nodes_Handler, + }, + { + MethodName: "Routes", + Handler: _Network_Routes_Handler, + }, + { + MethodName: "Services", + Handler: _Network_Services_Handler, + }, + { + MethodName: "Status", + Handler: _Network_Status_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "network/service/proto/network.proto", } diff --git a/network/service/proto/network.pb.micro.go b/network/service/proto/network.pb.micro.go index 4fbda43d..8b5ab957 100644 --- a/network/service/proto/network.pb.micro.go +++ b/network/service/proto/network.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: network.proto +// source: network/service/proto/network.proto package go_micro_network @@ -55,12 +55,6 @@ type networkService struct { } func NewNetworkService(name string, c client.Client) NetworkService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.network" - } return &networkService{ c: c, name: name, diff --git a/network/service/proto/network.proto b/network/service/proto/network.proto index f2bbdb9e..5822d48d 100644 --- a/network/service/proto/network.proto +++ b/network/service/proto/network.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package go.micro.network; -import "github.com/micro/go-micro/router/service/proto/router.proto"; +import "router/service/proto/router.proto"; // Network service is usesd to gain visibility into networks service Network { diff --git a/registry/service/proto/registry.pb.go b/registry/service/proto/registry.pb.go index 9383e99a..fe8063e6 100644 --- a/registry/service/proto/registry.pb.go +++ b/registry/service/proto/registry.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: micro/go-micro/registry/service/proto/registry.proto +// source: registry/service/proto/registry.proto package go_micro_registry import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -46,7 +50,7 @@ func (x EventType) String() string { } func (EventType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{0} + return fileDescriptor_3f5817c11f323eb6, []int{0} } // Service represents a go-micro service @@ -66,7 +70,7 @@ func (m *Service) Reset() { *m = Service{} } func (m *Service) String() string { return proto.CompactTextString(m) } func (*Service) ProtoMessage() {} func (*Service) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{0} + return fileDescriptor_3f5817c11f323eb6, []int{0} } func (m *Service) XXX_Unmarshal(b []byte) error { @@ -144,7 +148,7 @@ func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{1} + return fileDescriptor_3f5817c11f323eb6, []int{1} } func (m *Node) XXX_Unmarshal(b []byte) error { @@ -208,7 +212,7 @@ func (m *Endpoint) Reset() { *m = Endpoint{} } func (m *Endpoint) String() string { return proto.CompactTextString(m) } func (*Endpoint) ProtoMessage() {} func (*Endpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{2} + return fileDescriptor_3f5817c11f323eb6, []int{2} } func (m *Endpoint) XXX_Unmarshal(b []byte) error { @@ -271,7 +275,7 @@ func (m *Value) Reset() { *m = Value{} } func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{3} + return fileDescriptor_3f5817c11f323eb6, []int{3} } func (m *Value) XXX_Unmarshal(b []byte) error { @@ -325,7 +329,7 @@ func (m *Options) Reset() { *m = Options{} } func (m *Options) String() string { return proto.CompactTextString(m) } func (*Options) ProtoMessage() {} func (*Options) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{4} + return fileDescriptor_3f5817c11f323eb6, []int{4} } func (m *Options) XXX_Unmarshal(b []byte) error { @@ -367,7 +371,7 @@ func (m *Result) Reset() { *m = Result{} } func (m *Result) String() string { return proto.CompactTextString(m) } func (*Result) ProtoMessage() {} func (*Result) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{5} + return fileDescriptor_3f5817c11f323eb6, []int{5} } func (m *Result) XXX_Unmarshal(b []byte) error { @@ -419,7 +423,7 @@ func (m *EmptyResponse) Reset() { *m = EmptyResponse{} } func (m *EmptyResponse) String() string { return proto.CompactTextString(m) } func (*EmptyResponse) ProtoMessage() {} func (*EmptyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{6} + return fileDescriptor_3f5817c11f323eb6, []int{6} } func (m *EmptyResponse) XXX_Unmarshal(b []byte) error { @@ -451,7 +455,7 @@ func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{7} + return fileDescriptor_3f5817c11f323eb6, []int{7} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { @@ -490,7 +494,7 @@ func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{8} + return fileDescriptor_3f5817c11f323eb6, []int{8} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { @@ -528,7 +532,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{9} + return fileDescriptor_3f5817c11f323eb6, []int{9} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -560,7 +564,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{10} + return fileDescriptor_3f5817c11f323eb6, []int{10} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -600,7 +604,7 @@ func (m *WatchRequest) Reset() { *m = WatchRequest{} } func (m *WatchRequest) String() string { return proto.CompactTextString(m) } func (*WatchRequest) ProtoMessage() {} func (*WatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{11} + return fileDescriptor_3f5817c11f323eb6, []int{11} } func (m *WatchRequest) XXX_Unmarshal(b []byte) error { @@ -647,7 +651,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_2f73432195c6499a, []int{12} + return fileDescriptor_3f5817c11f323eb6, []int{12} } func (m *Event) XXX_Unmarshal(b []byte) error { @@ -717,52 +721,304 @@ func init() { } func init() { - proto.RegisterFile("micro/go-micro/registry/service/proto/registry.proto", fileDescriptor_2f73432195c6499a) + proto.RegisterFile("registry/service/proto/registry.proto", fileDescriptor_3f5817c11f323eb6) } -var fileDescriptor_2f73432195c6499a = []byte{ - // 681 bytes of a gzipped FileDescriptorProto +var fileDescriptor_3f5817c11f323eb6 = []byte{ + // 675 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x6e, 0xd3, 0x4c, - 0x10, 0x8d, 0xed, 0xfc, 0x4e, 0xda, 0x7e, 0xfd, 0x46, 0x08, 0x8c, 0x5b, 0x20, 0xb2, 0x04, 0x0a, - 0x48, 0x4d, 0xaa, 0x50, 0x21, 0x7e, 0xae, 0x10, 0x0d, 0x95, 0x50, 0x0b, 0x62, 0xf9, 0xbb, 0x36, + 0x10, 0x8d, 0xed, 0xfc, 0x4e, 0xda, 0x7e, 0xfd, 0x46, 0x08, 0x8c, 0x5b, 0x20, 0xb2, 0x54, 0x14, + 0x90, 0x48, 0xaa, 0x50, 0x21, 0x7e, 0xae, 0x10, 0x0d, 0x95, 0x50, 0x0b, 0x62, 0xf9, 0xbb, 0x36, 0xf1, 0xa8, 0x58, 0x24, 0xb6, 0xd9, 0xdd, 0x46, 0xca, 0x3b, 0x20, 0xf1, 0x04, 0xbc, 0x0d, 0x4f, - 0xc1, 0xd3, 0xa0, 0x5d, 0xaf, 0x93, 0x54, 0xdd, 0x04, 0xa4, 0xc2, 0xdd, 0xcc, 0xee, 0x39, 0xb3, - 0xb3, 0x67, 0xce, 0xda, 0x70, 0x30, 0x49, 0x46, 0x3c, 0xeb, 0x9f, 0x66, 0x7b, 0x45, 0xc0, 0xe9, - 0x34, 0x11, 0x92, 0xcf, 0xfa, 0x82, 0xf8, 0x34, 0x19, 0x51, 0x3f, 0xe7, 0x99, 0x5c, 0x2c, 0xf7, - 0x74, 0x8a, 0xff, 0x9f, 0x66, 0x3d, 0x8d, 0xef, 0x95, 0x1b, 0xe1, 0x4f, 0x17, 0x1a, 0x6f, 0x0a, - 0x0e, 0x22, 0x54, 0xd3, 0x68, 0x42, 0xbe, 0xd3, 0x71, 0xba, 0x2d, 0xa6, 0x63, 0xf4, 0xa1, 0x31, - 0x25, 0x2e, 0x92, 0x2c, 0xf5, 0x5d, 0xbd, 0x5c, 0xa6, 0x78, 0x08, 0xcd, 0x09, 0xc9, 0x28, 0x8e, - 0x64, 0xe4, 0x7b, 0x1d, 0xaf, 0xdb, 0x1e, 0x74, 0x7b, 0x17, 0xea, 0xf7, 0x4c, 0xed, 0xde, 0x89, - 0x81, 0x0e, 0x53, 0xc9, 0x67, 0x6c, 0xce, 0xc4, 0x47, 0xd0, 0xa2, 0x34, 0xce, 0xb3, 0x24, 0x95, - 0xc2, 0xaf, 0xea, 0x32, 0x3b, 0x96, 0x32, 0x43, 0x83, 0x61, 0x0b, 0x34, 0xee, 0x41, 0x2d, 0xcd, - 0x62, 0x12, 0x7e, 0x4d, 0xd3, 0xae, 0x59, 0x68, 0x2f, 0xb3, 0x98, 0x58, 0x81, 0xc2, 0x03, 0x68, - 0x64, 0xb9, 0x4c, 0xb2, 0x54, 0xf8, 0xf5, 0x8e, 0xd3, 0x6d, 0x0f, 0x02, 0x0b, 0xe1, 0x55, 0x81, - 0x60, 0x25, 0x34, 0x78, 0x02, 0x9b, 0xe7, 0x5a, 0xc7, 0x6d, 0xf0, 0x3e, 0xd3, 0xcc, 0x68, 0xa4, - 0x42, 0xbc, 0x02, 0xb5, 0x69, 0x34, 0x3e, 0x23, 0x23, 0x50, 0x91, 0x3c, 0x76, 0x1f, 0x3a, 0xe1, - 0x0f, 0x07, 0xaa, 0xaa, 0x05, 0xdc, 0x02, 0x37, 0x89, 0x0d, 0xc7, 0x4d, 0x62, 0xa5, 0x6a, 0x14, - 0xc7, 0x9c, 0x84, 0x28, 0x55, 0x35, 0xa9, 0x9a, 0x41, 0x9e, 0x71, 0xe9, 0x7b, 0x1d, 0xa7, 0xeb, - 0x31, 0x1d, 0xe3, 0xd3, 0x25, 0xa5, 0x0b, 0x89, 0x6e, 0xaf, 0xb8, 0xeb, 0x2a, 0x99, 0x2f, 0x77, - 0x8d, 0xaf, 0x2e, 0x34, 0xcb, 0x01, 0x58, 0x4d, 0x32, 0x80, 0x06, 0xa7, 0x2f, 0x67, 0x24, 0xa4, - 0x26, 0xb7, 0x07, 0xbe, 0xa5, 0xbf, 0xf7, 0xaa, 0x1e, 0x2b, 0x81, 0x78, 0x00, 0x4d, 0x4e, 0x22, - 0xcf, 0x52, 0x41, 0xfa, 0xb2, 0xeb, 0x48, 0x73, 0x24, 0x0e, 0x2f, 0x48, 0x71, 0x77, 0x8d, 0x5b, - 0xfe, 0x8d, 0x1c, 0x11, 0xd4, 0x74, 0x5b, 0x56, 0x29, 0x10, 0xaa, 0x72, 0x96, 0x97, 0x2c, 0x1d, - 0xe3, 0x3e, 0xd4, 0x35, 0x5b, 0x98, 0x77, 0xb2, 0xfa, 0xa2, 0x06, 0x17, 0xee, 0x40, 0xc3, 0x38, - 0x51, 0x75, 0x26, 0xe5, 0x58, 0x9f, 0xe1, 0x31, 0x15, 0x86, 0x12, 0xea, 0x8c, 0xc4, 0xd9, 0x58, - 0xe2, 0x55, 0xa8, 0x47, 0x23, 0x05, 0x33, 0x2d, 0x98, 0x4c, 0x59, 0xdd, 0x7c, 0x07, 0xcc, 0x3c, - 0x82, 0xd5, 0x2f, 0x93, 0x95, 0x50, 0xdc, 0x85, 0x96, 0x4c, 0x26, 0x24, 0x64, 0x34, 0xc9, 0x8d, - 0xff, 0x16, 0x0b, 0xe1, 0x7f, 0xb0, 0x39, 0x9c, 0xe4, 0x72, 0xc6, 0xcc, 0x28, 0xc2, 0x3b, 0x00, - 0x47, 0x24, 0x99, 0x19, 0xa7, 0xbf, 0x38, 0xb2, 0xe8, 0xa5, 0x4c, 0xc3, 0x21, 0xb4, 0x35, 0xce, - 0x4c, 0xf0, 0x01, 0x34, 0xcd, 0x8e, 0xf0, 0x1d, 0x2d, 0xc7, 0xba, 0xe6, 0xe6, 0xd8, 0x70, 0x13, - 0xda, 0xc7, 0x89, 0x28, 0xcf, 0x0b, 0x9f, 0xc3, 0x46, 0x91, 0x5e, 0xb2, 0x6c, 0x17, 0x36, 0x3e, - 0x44, 0x72, 0xf4, 0xe9, 0xf7, 0xf7, 0xf8, 0xee, 0x40, 0x6d, 0x38, 0xa5, 0x54, 0x5e, 0x78, 0xcd, - 0xfb, 0x4b, 0x33, 0xdf, 0x1a, 0xec, 0xda, 0x0c, 0xa9, 0x78, 0x6f, 0x67, 0x39, 0x19, 0x47, 0xac, - 0x95, 0x7a, 0x79, 0x7c, 0xd5, 0x3f, 0x1e, 0xdf, 0xbd, 0x3e, 0xb4, 0xe6, 0xc7, 0x20, 0x40, 0xfd, - 0x19, 0xa7, 0x48, 0xd2, 0x76, 0x45, 0xc5, 0x87, 0x34, 0x26, 0x49, 0xdb, 0x8e, 0x8a, 0xdf, 0xe5, - 0xb1, 0x5a, 0x77, 0x07, 0xdf, 0x3c, 0x68, 0x32, 0x53, 0x0e, 0x4f, 0xf4, 0x34, 0xcb, 0x3f, 0xc1, - 0x0d, 0xcb, 0x81, 0x8b, 0x61, 0x07, 0x37, 0x57, 0x6d, 0x1b, 0x6b, 0x54, 0xf0, 0x45, 0x59, 0x9a, - 0x38, 0xae, 0xe9, 0x3e, 0xe8, 0xd8, 0xc4, 0x3a, 0x67, 0xb3, 0x0a, 0x1e, 0x03, 0x1c, 0x12, 0xff, - 0x5b, 0xd5, 0x5e, 0x17, 0xc6, 0x31, 0x14, 0x81, 0xb6, 0xbb, 0x2c, 0x19, 0x2d, 0xb8, 0xb5, 0x72, - 0x7f, 0x5e, 0xf2, 0x08, 0x6a, 0xda, 0x43, 0x68, 0xc3, 0x2e, 0xbb, 0x2b, 0xb8, 0x6e, 0x01, 0x14, - 0x6f, 0x39, 0xac, 0xec, 0x3b, 0x1f, 0xeb, 0xfa, 0x37, 0x7d, 0xff, 0x57, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x69, 0x33, 0x08, 0xdb, 0xde, 0x07, 0x00, 0x00, + 0xc1, 0xd3, 0xa0, 0x5d, 0xef, 0x26, 0xa9, 0xea, 0x04, 0xa4, 0xc2, 0xdd, 0xcc, 0xee, 0x39, 0xb3, + 0xb3, 0x67, 0xce, 0xda, 0xb0, 0xc7, 0xe9, 0x34, 0x11, 0x92, 0xcf, 0xfa, 0x82, 0xf8, 0x34, 0x19, + 0x51, 0x3f, 0xe7, 0x99, 0xcc, 0xfa, 0x76, 0xb9, 0xa7, 0x53, 0xfc, 0xff, 0x34, 0xeb, 0x4d, 0x92, + 0x11, 0xcf, 0x7a, 0x76, 0x23, 0xfc, 0xe9, 0x42, 0xe3, 0x4d, 0xc1, 0x41, 0x84, 0x6a, 0x1a, 0x4d, + 0xc8, 0x77, 0x3a, 0x4e, 0xb7, 0xc5, 0x74, 0x8c, 0x3e, 0x34, 0xa6, 0xc4, 0x45, 0x92, 0xa5, 0xbe, + 0xab, 0x97, 0x6d, 0x8a, 0x87, 0xd0, 0x9c, 0x90, 0x8c, 0xe2, 0x48, 0x46, 0xbe, 0xd7, 0xf1, 0xba, + 0xed, 0x41, 0xb7, 0x77, 0xa1, 0x7e, 0xcf, 0xd4, 0xee, 0x9d, 0x18, 0xe8, 0x30, 0x95, 0x7c, 0xc6, + 0xe6, 0x4c, 0x7c, 0x04, 0x2d, 0x4a, 0xe3, 0x3c, 0x4b, 0x52, 0x29, 0xfc, 0xaa, 0x2e, 0xb3, 0x53, + 0x52, 0x66, 0x68, 0x30, 0x6c, 0x81, 0xc6, 0x7b, 0x50, 0x4b, 0xb3, 0x98, 0x84, 0x5f, 0xd3, 0xb4, + 0x6b, 0x25, 0xb4, 0x97, 0x59, 0x4c, 0xac, 0x40, 0xe1, 0x01, 0x34, 0xb2, 0x5c, 0x26, 0x59, 0x2a, + 0xfc, 0x7a, 0xc7, 0xe9, 0xb6, 0x07, 0x41, 0x09, 0xe1, 0x55, 0x81, 0x60, 0x16, 0x1a, 0x3c, 0x81, + 0xcd, 0x73, 0xad, 0xe3, 0x36, 0x78, 0x9f, 0x69, 0x66, 0x34, 0x52, 0x21, 0x5e, 0x81, 0xda, 0x34, + 0x1a, 0x9f, 0x91, 0x11, 0xa8, 0x48, 0x1e, 0xbb, 0x0f, 0x9d, 0xf0, 0x87, 0x03, 0x55, 0xd5, 0x02, + 0x6e, 0x81, 0x9b, 0xc4, 0x86, 0xe3, 0x26, 0xb1, 0x52, 0x35, 0x8a, 0x63, 0x4e, 0x42, 0x58, 0x55, + 0x4d, 0xaa, 0x66, 0x90, 0x67, 0x5c, 0xfa, 0x5e, 0xc7, 0xe9, 0x7a, 0x4c, 0xc7, 0xf8, 0x74, 0x49, + 0xe9, 0x42, 0xa2, 0xbd, 0x15, 0x77, 0x5d, 0x25, 0xf3, 0xe5, 0xae, 0xf1, 0xd5, 0x85, 0xa6, 0x1d, + 0x40, 0xa9, 0x49, 0x06, 0xd0, 0xe0, 0xf4, 0xe5, 0x8c, 0x84, 0xd4, 0xe4, 0xf6, 0xc0, 0x2f, 0xe9, + 0xef, 0xbd, 0xaa, 0xc7, 0x2c, 0x10, 0x0f, 0xa0, 0xc9, 0x49, 0xe4, 0x59, 0x2a, 0x48, 0x5f, 0x76, + 0x1d, 0x69, 0x8e, 0xc4, 0xe1, 0x05, 0x29, 0xee, 0xac, 0x71, 0xcb, 0xbf, 0x91, 0x23, 0x82, 0x9a, + 0x6e, 0xab, 0x54, 0x0a, 0x84, 0xaa, 0x9c, 0xe5, 0x96, 0xa5, 0x63, 0xdc, 0x87, 0xba, 0x66, 0x0b, + 0xf3, 0x4e, 0x56, 0x5f, 0xd4, 0xe0, 0xc2, 0x1d, 0x68, 0x18, 0x27, 0xaa, 0xce, 0xa4, 0x1c, 0xeb, + 0x33, 0x3c, 0xa6, 0xc2, 0x50, 0x42, 0x9d, 0x91, 0x38, 0x1b, 0x4b, 0xbc, 0x0a, 0xf5, 0x68, 0xa4, + 0x60, 0xa6, 0x05, 0x93, 0x29, 0xab, 0x9b, 0xef, 0x80, 0x99, 0x47, 0xb0, 0xfa, 0x65, 0x32, 0x0b, + 0xc5, 0x5d, 0x68, 0xc9, 0x64, 0x42, 0x42, 0x46, 0x93, 0xdc, 0xf8, 0x6f, 0xb1, 0x10, 0xfe, 0x07, + 0x9b, 0xc3, 0x49, 0x2e, 0x67, 0xcc, 0x8c, 0x22, 0xbc, 0x0d, 0x70, 0x44, 0x92, 0x99, 0x71, 0xfa, + 0x8b, 0x23, 0x8b, 0x5e, 0x6c, 0x1a, 0x0e, 0xa1, 0xad, 0x71, 0x66, 0x82, 0x0f, 0xa0, 0x69, 0x76, + 0x84, 0xef, 0x68, 0x39, 0xd6, 0x35, 0x37, 0xc7, 0x86, 0x9b, 0xd0, 0x3e, 0x4e, 0x84, 0x3d, 0x2f, + 0x7c, 0x0e, 0x1b, 0x45, 0x7a, 0xc9, 0xb2, 0x5d, 0xd8, 0xf8, 0x10, 0xc9, 0xd1, 0xa7, 0xdf, 0xdf, + 0xe3, 0xbb, 0x03, 0xb5, 0xe1, 0x94, 0x52, 0x79, 0xe1, 0x35, 0xef, 0x2f, 0xcd, 0x7c, 0x6b, 0xb0, + 0x5b, 0x66, 0x48, 0xc5, 0x7b, 0x3b, 0xcb, 0xc9, 0x38, 0x62, 0xad, 0xd4, 0xcb, 0xe3, 0xab, 0xfe, + 0xf1, 0xf8, 0xee, 0xf6, 0xa1, 0x35, 0x3f, 0x06, 0x01, 0xea, 0xcf, 0x38, 0x45, 0x92, 0xb6, 0x2b, + 0x2a, 0x3e, 0xa4, 0x31, 0x49, 0xda, 0x76, 0x54, 0xfc, 0x2e, 0x8f, 0xd5, 0xba, 0x3b, 0xf8, 0xe6, + 0x41, 0x93, 0x99, 0x72, 0x78, 0xa2, 0xa7, 0x69, 0xff, 0x04, 0x37, 0x4a, 0x0e, 0x5c, 0x0c, 0x3b, + 0xb8, 0xb9, 0x6a, 0xdb, 0x58, 0xa3, 0x82, 0x2f, 0x6c, 0x69, 0xe2, 0xb8, 0xa6, 0xfb, 0xa0, 0x53, + 0x26, 0xd6, 0x39, 0x9b, 0x55, 0xf0, 0x18, 0xe0, 0x90, 0xf8, 0xdf, 0xaa, 0xf6, 0xba, 0x30, 0x8e, + 0xa1, 0x08, 0x2c, 0xbb, 0xcb, 0x92, 0xd1, 0x82, 0x5b, 0x2b, 0xf7, 0xe7, 0x25, 0x8f, 0xa0, 0xa6, + 0x3d, 0x84, 0x65, 0xd8, 0x65, 0x77, 0x05, 0xd7, 0x4b, 0x00, 0xc5, 0x5b, 0x0e, 0x2b, 0xfb, 0xce, + 0xc7, 0xba, 0xfe, 0x4d, 0xdf, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xc6, 0xa5, 0x5a, 0xc9, 0xcf, + 0x07, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// RegistryClient is the client API for Registry service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type RegistryClient interface { + GetService(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) + Register(ctx context.Context, in *Service, opts ...grpc.CallOption) (*EmptyResponse, error) + Deregister(ctx context.Context, in *Service, opts ...grpc.CallOption) (*EmptyResponse, error) + ListServices(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) + Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Registry_WatchClient, error) +} + +type registryClient struct { + cc *grpc.ClientConn +} + +func NewRegistryClient(cc *grpc.ClientConn) RegistryClient { + return ®istryClient{cc} +} + +func (c *registryClient) GetService(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) { + out := new(GetResponse) + err := c.cc.Invoke(ctx, "/go.micro.registry.Registry/GetService", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *registryClient) Register(ctx context.Context, in *Service, opts ...grpc.CallOption) (*EmptyResponse, error) { + out := new(EmptyResponse) + err := c.cc.Invoke(ctx, "/go.micro.registry.Registry/Register", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *registryClient) Deregister(ctx context.Context, in *Service, opts ...grpc.CallOption) (*EmptyResponse, error) { + out := new(EmptyResponse) + err := c.cc.Invoke(ctx, "/go.micro.registry.Registry/Deregister", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *registryClient) ListServices(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/go.micro.registry.Registry/ListServices", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *registryClient) Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Registry_WatchClient, error) { + stream, err := c.cc.NewStream(ctx, &_Registry_serviceDesc.Streams[0], "/go.micro.registry.Registry/Watch", opts...) + if err != nil { + return nil, err + } + x := ®istryWatchClient{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 Registry_WatchClient interface { + Recv() (*Result, error) + grpc.ClientStream +} + +type registryWatchClient struct { + grpc.ClientStream +} + +func (x *registryWatchClient) Recv() (*Result, error) { + m := new(Result) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// RegistryServer is the server API for Registry service. +type RegistryServer interface { + GetService(context.Context, *GetRequest) (*GetResponse, error) + Register(context.Context, *Service) (*EmptyResponse, error) + Deregister(context.Context, *Service) (*EmptyResponse, error) + ListServices(context.Context, *ListRequest) (*ListResponse, error) + Watch(*WatchRequest, Registry_WatchServer) error +} + +// UnimplementedRegistryServer can be embedded to have forward compatible implementations. +type UnimplementedRegistryServer struct { +} + +func (*UnimplementedRegistryServer) GetService(ctx context.Context, req *GetRequest) (*GetResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetService not implemented") +} +func (*UnimplementedRegistryServer) Register(ctx context.Context, req *Service) (*EmptyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Register not implemented") +} +func (*UnimplementedRegistryServer) Deregister(ctx context.Context, req *Service) (*EmptyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deregister not implemented") +} +func (*UnimplementedRegistryServer) ListServices(ctx context.Context, req *ListRequest) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListServices not implemented") +} +func (*UnimplementedRegistryServer) Watch(req *WatchRequest, srv Registry_WatchServer) error { + return status.Errorf(codes.Unimplemented, "method Watch not implemented") +} + +func RegisterRegistryServer(s *grpc.Server, srv RegistryServer) { + s.RegisterService(&_Registry_serviceDesc, srv) +} + +func _Registry_GetService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RegistryServer).GetService(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.registry.Registry/GetService", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RegistryServer).GetService(ctx, req.(*GetRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Registry_Register_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Service) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RegistryServer).Register(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.registry.Registry/Register", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RegistryServer).Register(ctx, req.(*Service)) + } + return interceptor(ctx, in, info, handler) +} + +func _Registry_Deregister_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Service) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RegistryServer).Deregister(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.registry.Registry/Deregister", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RegistryServer).Deregister(ctx, req.(*Service)) + } + return interceptor(ctx, in, info, handler) +} + +func _Registry_ListServices_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RegistryServer).ListServices(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.registry.Registry/ListServices", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RegistryServer).ListServices(ctx, req.(*ListRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Registry_Watch_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(WatchRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(RegistryServer).Watch(m, ®istryWatchServer{stream}) +} + +type Registry_WatchServer interface { + Send(*Result) error + grpc.ServerStream +} + +type registryWatchServer struct { + grpc.ServerStream +} + +func (x *registryWatchServer) Send(m *Result) error { + return x.ServerStream.SendMsg(m) +} + +var _Registry_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.registry.Registry", + HandlerType: (*RegistryServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetService", + Handler: _Registry_GetService_Handler, + }, + { + MethodName: "Register", + Handler: _Registry_Register_Handler, + }, + { + MethodName: "Deregister", + Handler: _Registry_Deregister_Handler, + }, + { + MethodName: "ListServices", + Handler: _Registry_ListServices_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Watch", + Handler: _Registry_Watch_Handler, + ServerStreams: true, + }, + }, + Metadata: "registry/service/proto/registry.proto", } diff --git a/registry/service/proto/registry.pb.micro.go b/registry/service/proto/registry.pb.micro.go index 7317a4eb..96af6f7e 100644 --- a/registry/service/proto/registry.pb.micro.go +++ b/registry/service/proto/registry.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: micro/go-micro/registry/service/proto/registry.proto +// source: registry/service/proto/registry.proto package go_micro_registry @@ -47,12 +47,6 @@ type registryService struct { } func NewRegistryService(name string, c client.Client) RegistryService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.registry" - } return ®istryService{ c: c, name: name, @@ -112,6 +106,7 @@ func (c *registryService) Watch(ctx context.Context, in *WatchRequest, opts ...c } type Registry_WatchService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -126,6 +121,10 @@ func (x *registryServiceWatch) Close() error { return x.stream.Close() } +func (x *registryServiceWatch) Context() context.Context { + return x.stream.Context() +} + func (x *registryServiceWatch) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -197,6 +196,7 @@ func (h *registryHandler) Watch(ctx context.Context, stream server.Stream) error } type Registry_WatchStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -211,6 +211,10 @@ func (x *registryWatchStream) Close() error { return x.stream.Close() } +func (x *registryWatchStream) Context() context.Context { + return x.stream.Context() +} + func (x *registryWatchStream) SendMsg(m interface{}) error { return x.stream.Send(m) } diff --git a/router/service/proto/router.pb.go b/router/service/proto/router.pb.go index 153e9530..46e48715 100644 --- a/router/service/proto/router.pb.go +++ b/router/service/proto/router.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: micro/go-micro/router/service/proto/router.proto +// source: router/service/proto/router.proto -package go_micro_router +package router import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -43,7 +47,7 @@ func (x AdvertType) String() string { } func (AdvertType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{0} + return fileDescriptor_3123ad01af3cc940, []int{0} } // EventType defines the type of event @@ -72,7 +76,7 @@ func (x EventType) String() string { } func (EventType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{1} + return fileDescriptor_3123ad01af3cc940, []int{1} } // Empty request @@ -86,7 +90,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{0} + return fileDescriptor_3123ad01af3cc940, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -118,7 +122,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{1} + return fileDescriptor_3123ad01af3cc940, []int{1} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -151,7 +155,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{2} + return fileDescriptor_3123ad01af3cc940, []int{2} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -191,7 +195,7 @@ func (m *LookupRequest) Reset() { *m = LookupRequest{} } func (m *LookupRequest) String() string { return proto.CompactTextString(m) } func (*LookupRequest) ProtoMessage() {} func (*LookupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{3} + return fileDescriptor_3123ad01af3cc940, []int{3} } func (m *LookupRequest) XXX_Unmarshal(b []byte) error { @@ -231,7 +235,7 @@ func (m *LookupResponse) Reset() { *m = LookupResponse{} } func (m *LookupResponse) String() string { return proto.CompactTextString(m) } func (*LookupResponse) ProtoMessage() {} func (*LookupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{4} + return fileDescriptor_3123ad01af3cc940, []int{4} } func (m *LookupResponse) XXX_Unmarshal(b []byte) error { @@ -271,7 +275,7 @@ func (m *QueryRequest) Reset() { *m = QueryRequest{} } func (m *QueryRequest) String() string { return proto.CompactTextString(m) } func (*QueryRequest) ProtoMessage() {} func (*QueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{5} + return fileDescriptor_3123ad01af3cc940, []int{5} } func (m *QueryRequest) XXX_Unmarshal(b []byte) error { @@ -311,7 +315,7 @@ func (m *QueryResponse) Reset() { *m = QueryResponse{} } func (m *QueryResponse) String() string { return proto.CompactTextString(m) } func (*QueryResponse) ProtoMessage() {} func (*QueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{6} + return fileDescriptor_3123ad01af3cc940, []int{6} } func (m *QueryResponse) XXX_Unmarshal(b []byte) error { @@ -350,7 +354,7 @@ func (m *WatchRequest) Reset() { *m = WatchRequest{} } func (m *WatchRequest) String() string { return proto.CompactTextString(m) } func (*WatchRequest) ProtoMessage() {} func (*WatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{7} + return fileDescriptor_3123ad01af3cc940, []int{7} } func (m *WatchRequest) XXX_Unmarshal(b []byte) error { @@ -392,7 +396,7 @@ func (m *Advert) Reset() { *m = Advert{} } func (m *Advert) String() string { return proto.CompactTextString(m) } func (*Advert) ProtoMessage() {} func (*Advert) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{8} + return fileDescriptor_3123ad01af3cc940, []int{8} } func (m *Advert) XXX_Unmarshal(b []byte) error { @@ -459,7 +463,7 @@ func (m *ProcessResponse) Reset() { *m = ProcessResponse{} } func (m *ProcessResponse) String() string { return proto.CompactTextString(m) } func (*ProcessResponse) ProtoMessage() {} func (*ProcessResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{9} + return fileDescriptor_3123ad01af3cc940, []int{9} } func (m *ProcessResponse) XXX_Unmarshal(b []byte) error { @@ -491,7 +495,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{10} + return fileDescriptor_3123ad01af3cc940, []int{10} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { @@ -523,7 +527,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{11} + return fileDescriptor_3123ad01af3cc940, []int{11} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -555,7 +559,7 @@ func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } func (m *UpdateResponse) String() string { return proto.CompactTextString(m) } func (*UpdateResponse) ProtoMessage() {} func (*UpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{12} + return fileDescriptor_3123ad01af3cc940, []int{12} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { @@ -595,7 +599,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{13} + return fileDescriptor_3123ad01af3cc940, []int{13} } func (m *Event) XXX_Unmarshal(b []byte) error { @@ -661,7 +665,7 @@ func (m *Query) Reset() { *m = Query{} } func (m *Query) String() string { return proto.CompactTextString(m) } func (*Query) ProtoMessage() {} func (*Query) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{14} + return fileDescriptor_3123ad01af3cc940, []int{14} } func (m *Query) XXX_Unmarshal(b []byte) error { @@ -728,7 +732,7 @@ func (m *Route) Reset() { *m = Route{} } func (m *Route) String() string { return proto.CompactTextString(m) } func (*Route) ProtoMessage() {} func (*Route) Descriptor() ([]byte, []int) { - return fileDescriptor_c2b04f200fb3e806, []int{15} + return fileDescriptor_3123ad01af3cc940, []int{15} } func (m *Route) XXX_Unmarshal(b []byte) error { @@ -819,51 +823,510 @@ func init() { proto.RegisterType((*Route)(nil), "go.micro.router.Route") } -func init() { - proto.RegisterFile("micro/go-micro/router/service/proto/router.proto", fileDescriptor_c2b04f200fb3e806) +func init() { proto.RegisterFile("router/service/proto/router.proto", fileDescriptor_3123ad01af3cc940) } + +var fileDescriptor_3123ad01af3cc940 = []byte{ + // 673 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x6e, 0xdb, 0x38, + 0x10, 0x96, 0x6c, 0x4b, 0x5e, 0xcd, 0x3a, 0x8e, 0x96, 0x87, 0xac, 0xe0, 0xdd, 0xa4, 0xae, 0x4e, + 0x41, 0x90, 0x4a, 0x85, 0x7b, 0x29, 0xfa, 0x9f, 0xa4, 0x2d, 0x0a, 0x34, 0x87, 0x56, 0x48, 0x50, + 0xa0, 0x37, 0x45, 0x1e, 0x38, 0x42, 0x6c, 0x51, 0x21, 0x69, 0x07, 0x7e, 0x8e, 0x3e, 0x43, 0x0f, + 0x3d, 0xf7, 0x91, 0xfa, 0x22, 0x85, 0x48, 0x2a, 0xb1, 0x2d, 0x2b, 0x68, 0x72, 0x12, 0xe7, 0xef, + 0x9b, 0xe1, 0xcc, 0x7c, 0x22, 0x3c, 0x64, 0x74, 0x2a, 0x90, 0x85, 0x1c, 0xd9, 0x2c, 0x4d, 0x30, + 0xcc, 0x19, 0x15, 0x34, 0x54, 0xca, 0x40, 0x0a, 0x64, 0x73, 0x44, 0x83, 0x49, 0x9a, 0x30, 0x1a, + 0x28, 0xb5, 0xef, 0x40, 0x3b, 0xc2, 0xcb, 0x29, 0x72, 0xe1, 0x03, 0xfc, 0x15, 0x21, 0xcf, 0x69, + 0xc6, 0xd1, 0x7f, 0x05, 0x9d, 0xe3, 0x94, 0x8b, 0x52, 0x26, 0x01, 0xd8, 0x32, 0x80, 0x7b, 0x66, + 0xbf, 0xb9, 0xfb, 0xf7, 0x60, 0x2b, 0x58, 0x01, 0x0a, 0xa2, 0xe2, 0x13, 0x69, 0x2f, 0xff, 0x25, + 0x6c, 0x1c, 0x53, 0x7a, 0x31, 0xcd, 0x35, 0x38, 0xd9, 0x07, 0xeb, 0x72, 0x8a, 0x6c, 0xee, 0x99, + 0x7d, 0x73, 0x6d, 0xfc, 0xe7, 0xc2, 0x1a, 0x29, 0x27, 0xff, 0x0d, 0x74, 0xcb, 0xf0, 0x7b, 0x16, + 0xf0, 0x02, 0x3a, 0x0a, 0xf1, 0x5e, 0xf9, 0x5f, 0xc3, 0x86, 0x8e, 0xbe, 0x67, 0xfa, 0x2e, 0x74, + 0xbe, 0xc4, 0x22, 0x39, 0x2f, 0x7b, 0xfb, 0xc3, 0x04, 0xfb, 0x60, 0x38, 0x43, 0x26, 0x48, 0x17, + 0x1a, 0xe9, 0x50, 0x96, 0xe1, 0x44, 0x8d, 0x74, 0x48, 0x42, 0x68, 0x89, 0x79, 0x8e, 0x5e, 0xa3, + 0x6f, 0xee, 0x76, 0x07, 0xff, 0x55, 0x80, 0x55, 0xd8, 0xc9, 0x3c, 0xc7, 0x48, 0x3a, 0x92, 0xff, + 0xc1, 0x11, 0xe9, 0x04, 0xb9, 0x88, 0x27, 0xb9, 0xd7, 0xec, 0x9b, 0xbb, 0xcd, 0xe8, 0x46, 0x41, + 0x5c, 0x68, 0x0a, 0x31, 0xf6, 0x5a, 0x52, 0x5f, 0x1c, 0x8b, 0xda, 0x71, 0x86, 0x99, 0xe0, 0x9e, + 0x55, 0x53, 0xfb, 0xbb, 0xc2, 0x1c, 0x69, 0x2f, 0xff, 0x1f, 0xd8, 0xfc, 0xc4, 0x68, 0x82, 0x9c, + 0x5f, 0xaf, 0x83, 0x0b, 0xdd, 0x23, 0x86, 0xb1, 0xc0, 0x45, 0xcd, 0x5b, 0x1c, 0xe3, 0xb2, 0xe6, + 0x34, 0x1f, 0x2e, 0xfa, 0x7c, 0x33, 0xc1, 0x92, 0xd0, 0x95, 0x3b, 0x07, 0x4b, 0x77, 0xee, 0xad, + 0x2f, 0xe8, 0x8f, 0xaf, 0xbc, 0x0f, 0x96, 0x8c, 0x93, 0x97, 0xae, 0x9f, 0x8d, 0x72, 0xf2, 0x4f, + 0xc1, 0x92, 0xb3, 0x25, 0x1e, 0xb4, 0x35, 0x53, 0x74, 0x65, 0xa5, 0x58, 0x58, 0x46, 0xb1, 0xc0, + 0xab, 0x78, 0x2e, 0x2b, 0x74, 0xa2, 0x52, 0x2c, 0x2c, 0x19, 0x8a, 0x2b, 0xca, 0x2e, 0x64, 0x19, + 0x4e, 0x54, 0x8a, 0xfe, 0x4f, 0x13, 0x2c, 0x99, 0xe7, 0x76, 0xdc, 0x78, 0x38, 0x64, 0xc8, 0x79, + 0x89, 0xab, 0xc5, 0xc5, 0x8c, 0xcd, 0xda, 0x8c, 0xad, 0xa5, 0x8c, 0x64, 0x4b, 0xef, 0x24, 0xf3, + 0x2c, 0x69, 0xd0, 0x12, 0x21, 0xd0, 0x1a, 0xa7, 0xd9, 0x85, 0x67, 0x4b, 0xad, 0x3c, 0x17, 0xbe, + 0x13, 0x14, 0x2c, 0x4d, 0xbc, 0xb6, 0xec, 0x9e, 0x96, 0xf6, 0x06, 0x00, 0x37, 0xfb, 0x45, 0x08, + 0x74, 0x95, 0x74, 0x90, 0x65, 0x74, 0x9a, 0x25, 0xe8, 0x1a, 0xc4, 0x85, 0x8e, 0xd2, 0xa9, 0xe1, + 0xba, 0xe6, 0x5e, 0x08, 0xce, 0xf5, 0x7c, 0x08, 0x80, 0xad, 0x36, 0xc3, 0x35, 0x8a, 0xb3, 0xda, + 0x09, 0xd7, 0x2c, 0xce, 0x3a, 0xa0, 0x31, 0xf8, 0xde, 0x00, 0x3b, 0x52, 0xb5, 0x7d, 0x04, 0x5b, + 0x11, 0x9b, 0xec, 0x54, 0xa6, 0xb4, 0xf4, 0xc3, 0xe8, 0x3d, 0xa8, 0xb5, 0xeb, 0xed, 0x32, 0xc8, + 0x21, 0x58, 0x92, 0x64, 0x64, 0xbb, 0xe2, 0xbb, 0x48, 0xbe, 0x5e, 0xcd, 0xc2, 0xfb, 0xc6, 0x63, + 0x93, 0x1c, 0x82, 0xa3, 0xae, 0x97, 0x72, 0x24, 0x5e, 0x75, 0x73, 0x34, 0xc4, 0xbf, 0x35, 0xb4, + 0x94, 0x18, 0xef, 0xa1, 0xad, 0x09, 0x43, 0xea, 0xfc, 0x7a, 0xfd, 0x8a, 0x61, 0x95, 0x63, 0xc6, + 0xe0, 0x57, 0x03, 0xac, 0x93, 0xf8, 0x6c, 0x8c, 0xe4, 0xa8, 0xec, 0x2a, 0xa9, 0x59, 0xe6, 0x35, + 0xed, 0x59, 0x21, 0xa8, 0x51, 0x80, 0xa8, 0x71, 0xdc, 0x01, 0x64, 0x85, 0xd3, 0x12, 0x44, 0xcd, + 0xf1, 0x0e, 0x20, 0x2b, 0xbf, 0x01, 0x83, 0x1c, 0x40, 0xab, 0x78, 0x4d, 0x6e, 0xe9, 0x6f, 0x75, + 0x82, 0x8b, 0xcf, 0x8f, 0x6f, 0x90, 0x0f, 0x25, 0x6b, 0xb7, 0x6b, 0xfe, 0xdc, 0x1a, 0x68, 0xa7, + 0xce, 0x5c, 0x22, 0x1d, 0x3e, 0xfb, 0xfa, 0x74, 0x94, 0x8a, 0xf3, 0xe9, 0x59, 0x90, 0xd0, 0x49, + 0x28, 0x5d, 0xc3, 0x11, 0x7d, 0xa4, 0x0e, 0xb3, 0x41, 0xb8, 0xee, 0x11, 0x7d, 0xae, 0x94, 0x67, + 0xb6, 0x94, 0x9e, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x14, 0x01, 0x1d, 0x6a, 0x07, 0x00, + 0x00, } -var fileDescriptor_c2b04f200fb3e806 = []byte{ - // 645 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x4e, 0xdb, 0x40, - 0x10, 0xb6, 0x93, 0xd8, 0xa9, 0xa7, 0x21, 0xb8, 0x73, 0xa0, 0x56, 0x5a, 0x68, 0xe4, 0x13, 0x42, - 0xd4, 0x41, 0xe9, 0xb5, 0x7f, 0x40, 0x5b, 0x55, 0x2a, 0x87, 0xd6, 0x02, 0xf5, 0x6c, 0x92, 0x11, - 0xb5, 0x48, 0x6c, 0xb3, 0xbb, 0x01, 0xe5, 0x39, 0xfa, 0x0c, 0x3d, 0xf4, 0xdc, 0x47, 0xea, 0x8b, - 0x54, 0xfb, 0x63, 0x48, 0x62, 0x8c, 0x0a, 0x27, 0xef, 0xfc, 0x7d, 0x33, 0x3b, 0x33, 0x9f, 0x17, - 0xf6, 0xa6, 0xe9, 0x88, 0xe5, 0x83, 0xb3, 0xfc, 0xa5, 0x3e, 0xb0, 0x7c, 0x26, 0x88, 0x0d, 0x38, - 0xb1, 0xcb, 0x74, 0x44, 0x83, 0x82, 0xe5, 0xa2, 0x54, 0x46, 0x4a, 0xc0, 0xf5, 0xb3, 0x3c, 0x52, - 0xbe, 0x91, 0x56, 0x87, 0x1e, 0xb4, 0x63, 0xba, 0x98, 0x11, 0x17, 0x21, 0xc0, 0xa3, 0x98, 0x78, - 0x91, 0x67, 0x9c, 0xc2, 0xb7, 0xd0, 0x39, 0x4a, 0xb9, 0x28, 0x65, 0x8c, 0xc0, 0x55, 0x01, 0x3c, - 0xb0, 0xfb, 0xcd, 0xed, 0xc7, 0xc3, 0x8d, 0x68, 0x05, 0x28, 0x8a, 0xe5, 0x27, 0x36, 0x5e, 0xe1, - 0x1b, 0x58, 0x3b, 0xca, 0xf3, 0xf3, 0x59, 0x61, 0xc0, 0x71, 0x17, 0x9c, 0x8b, 0x19, 0xb1, 0x79, - 0x60, 0xf7, 0xed, 0x5b, 0xe3, 0xbf, 0x49, 0x6b, 0xac, 0x9d, 0xc2, 0xf7, 0xd0, 0x2d, 0xc3, 0x1f, - 0x58, 0xc0, 0x6b, 0xe8, 0x68, 0xc4, 0x07, 0xe5, 0x7f, 0x07, 0x6b, 0x26, 0xfa, 0x81, 0xe9, 0xbb, - 0xd0, 0xf9, 0x9e, 0x88, 0xd1, 0x8f, 0xb2, 0xb7, 0xbf, 0x6d, 0x70, 0xf7, 0xc7, 0x97, 0xc4, 0x04, - 0x76, 0xa1, 0x91, 0x8e, 0x55, 0x19, 0x5e, 0xdc, 0x48, 0xc7, 0x38, 0x80, 0x96, 0x98, 0x17, 0x14, - 0x34, 0xfa, 0xf6, 0x76, 0x77, 0xf8, 0xac, 0x02, 0xac, 0xc3, 0x8e, 0xe7, 0x05, 0xc5, 0xca, 0x11, - 0x9f, 0x83, 0x27, 0xd2, 0x29, 0x71, 0x91, 0x4c, 0x8b, 0xa0, 0xd9, 0xb7, 0xb7, 0x9b, 0xf1, 0x8d, - 0x02, 0x7d, 0x68, 0x0a, 0x31, 0x09, 0x5a, 0x4a, 0x2f, 0x8f, 0xb2, 0x76, 0xba, 0xa4, 0x4c, 0xf0, - 0xc0, 0xa9, 0xa9, 0xfd, 0xa3, 0x34, 0xc7, 0xc6, 0x2b, 0x7c, 0x02, 0xeb, 0x5f, 0x59, 0x3e, 0x22, - 0xce, 0xaf, 0xd7, 0xc1, 0x87, 0xee, 0x21, 0xa3, 0x44, 0xd0, 0xa2, 0xe6, 0x03, 0x4d, 0x68, 0x59, - 0x73, 0x52, 0x8c, 0x17, 0x7d, 0x7e, 0xda, 0xe0, 0x28, 0xe8, 0xca, 0x9d, 0xa3, 0xa5, 0x3b, 0xf7, - 0x6e, 0x2f, 0xe8, 0xbf, 0xaf, 0xbc, 0x0b, 0x8e, 0x8a, 0x53, 0x97, 0xae, 0x9f, 0x8d, 0x76, 0x0a, - 0x4f, 0xc0, 0x51, 0xb3, 0xc5, 0x00, 0xda, 0x86, 0x29, 0xa6, 0xb2, 0x52, 0x94, 0x96, 0xb3, 0x44, - 0xd0, 0x55, 0x32, 0x57, 0x15, 0x7a, 0x71, 0x29, 0x4a, 0x4b, 0x46, 0xe2, 0x2a, 0x67, 0xe7, 0xaa, - 0x0c, 0x2f, 0x2e, 0xc5, 0xf0, 0x8f, 0x0d, 0x8e, 0xca, 0x73, 0x37, 0x6e, 0x32, 0x1e, 0x33, 0xe2, - 0xbc, 0xc4, 0x35, 0xe2, 0x62, 0xc6, 0x66, 0x6d, 0xc6, 0xd6, 0x52, 0x46, 0xdc, 0x30, 0x3b, 0xc9, - 0x02, 0x47, 0x19, 0x8c, 0x84, 0x08, 0xad, 0x49, 0x9a, 0x9d, 0x07, 0xae, 0xd2, 0xaa, 0xb3, 0xf4, - 0x9d, 0x92, 0x60, 0xe9, 0x28, 0x68, 0xab, 0xee, 0x19, 0x69, 0x67, 0x08, 0x70, 0xb3, 0x5f, 0x88, - 0xd0, 0xd5, 0xd2, 0x7e, 0x96, 0xe5, 0xb3, 0x6c, 0x44, 0xbe, 0x85, 0x3e, 0x74, 0xb4, 0x4e, 0x0f, - 0xd7, 0xb7, 0x77, 0x06, 0xe0, 0x5d, 0xcf, 0x07, 0x01, 0x5c, 0xbd, 0x19, 0xbe, 0x25, 0xcf, 0x7a, - 0x27, 0x7c, 0x5b, 0x9e, 0x4d, 0x40, 0x63, 0xf8, 0xab, 0x01, 0x6e, 0xac, 0x6b, 0xfb, 0x02, 0xae, - 0x26, 0x36, 0x6e, 0x55, 0xa6, 0xb4, 0xf4, 0xc3, 0xe8, 0xbd, 0xa8, 0xb5, 0x9b, 0xed, 0xb2, 0xf0, - 0x00, 0x1c, 0x45, 0x32, 0xdc, 0xac, 0xf8, 0x2e, 0x92, 0xaf, 0x57, 0xb3, 0xf0, 0xa1, 0xb5, 0x67, - 0xe3, 0x01, 0x78, 0xfa, 0x7a, 0x29, 0x27, 0x0c, 0xaa, 0x9b, 0x63, 0x20, 0x9e, 0xd6, 0xd0, 0x52, - 0x61, 0x7c, 0x82, 0xb6, 0x21, 0x0c, 0xd6, 0xf9, 0xf5, 0xfa, 0x15, 0xc3, 0x2a, 0xc7, 0xac, 0xe1, - 0xdf, 0x06, 0x38, 0xc7, 0xc9, 0xe9, 0x84, 0xf0, 0xb0, 0xec, 0x2a, 0xd6, 0x2c, 0xf3, 0x2d, 0xed, - 0x59, 0x21, 0xa8, 0x25, 0x41, 0xf4, 0x38, 0xee, 0x01, 0xb2, 0xc2, 0x69, 0x05, 0xa2, 0xe7, 0x78, - 0x0f, 0x90, 0x95, 0xdf, 0x80, 0x85, 0xfb, 0xd0, 0x92, 0xaf, 0xc9, 0x1d, 0xfd, 0xad, 0x4e, 0x70, - 0xf1, 0xf9, 0x09, 0x2d, 0xfc, 0x5c, 0xb2, 0x76, 0xb3, 0xe6, 0xcf, 0x6d, 0x80, 0xb6, 0xea, 0xcc, - 0x25, 0xd2, 0xa9, 0xab, 0x5e, 0xc2, 0x57, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x08, 0x7e, - 0xf4, 0x3d, 0x07, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// RouterClient is the client API for Router service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type RouterClient interface { + Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error) + Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Router_WatchClient, error) + Advertise(ctx context.Context, in *Request, opts ...grpc.CallOption) (Router_AdvertiseClient, error) + Process(ctx context.Context, in *Advert, opts ...grpc.CallOption) (*ProcessResponse, error) +} + +type routerClient struct { + cc *grpc.ClientConn +} + +func NewRouterClient(cc *grpc.ClientConn) RouterClient { + return &routerClient{cc} +} + +func (c *routerClient) Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error) { + out := new(LookupResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Router/Lookup", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *routerClient) Watch(ctx context.Context, in *WatchRequest, opts ...grpc.CallOption) (Router_WatchClient, error) { + stream, err := c.cc.NewStream(ctx, &_Router_serviceDesc.Streams[0], "/go.micro.router.Router/Watch", opts...) + if err != nil { + return nil, err + } + x := &routerWatchClient{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 Router_WatchClient interface { + Recv() (*Event, error) + grpc.ClientStream +} + +type routerWatchClient struct { + grpc.ClientStream +} + +func (x *routerWatchClient) Recv() (*Event, error) { + m := new(Event) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *routerClient) Advertise(ctx context.Context, in *Request, opts ...grpc.CallOption) (Router_AdvertiseClient, error) { + stream, err := c.cc.NewStream(ctx, &_Router_serviceDesc.Streams[1], "/go.micro.router.Router/Advertise", opts...) + if err != nil { + return nil, err + } + x := &routerAdvertiseClient{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 Router_AdvertiseClient interface { + Recv() (*Advert, error) + grpc.ClientStream +} + +type routerAdvertiseClient struct { + grpc.ClientStream +} + +func (x *routerAdvertiseClient) Recv() (*Advert, error) { + m := new(Advert) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +func (c *routerClient) Process(ctx context.Context, in *Advert, opts ...grpc.CallOption) (*ProcessResponse, error) { + out := new(ProcessResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Router/Process", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// RouterServer is the server API for Router service. +type RouterServer interface { + Lookup(context.Context, *LookupRequest) (*LookupResponse, error) + Watch(*WatchRequest, Router_WatchServer) error + Advertise(*Request, Router_AdvertiseServer) error + Process(context.Context, *Advert) (*ProcessResponse, error) +} + +// UnimplementedRouterServer can be embedded to have forward compatible implementations. +type UnimplementedRouterServer struct { +} + +func (*UnimplementedRouterServer) Lookup(ctx context.Context, req *LookupRequest) (*LookupResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Lookup not implemented") +} +func (*UnimplementedRouterServer) Watch(req *WatchRequest, srv Router_WatchServer) error { + return status.Errorf(codes.Unimplemented, "method Watch not implemented") +} +func (*UnimplementedRouterServer) Advertise(req *Request, srv Router_AdvertiseServer) error { + return status.Errorf(codes.Unimplemented, "method Advertise not implemented") +} +func (*UnimplementedRouterServer) Process(ctx context.Context, req *Advert) (*ProcessResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Process not implemented") +} + +func RegisterRouterServer(s *grpc.Server, srv RouterServer) { + s.RegisterService(&_Router_serviceDesc, srv) +} + +func _Router_Lookup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(LookupRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RouterServer).Lookup(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Router/Lookup", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RouterServer).Lookup(ctx, req.(*LookupRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Router_Watch_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(WatchRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(RouterServer).Watch(m, &routerWatchServer{stream}) +} + +type Router_WatchServer interface { + Send(*Event) error + grpc.ServerStream +} + +type routerWatchServer struct { + grpc.ServerStream +} + +func (x *routerWatchServer) Send(m *Event) error { + return x.ServerStream.SendMsg(m) +} + +func _Router_Advertise_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(Request) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(RouterServer).Advertise(m, &routerAdvertiseServer{stream}) +} + +type Router_AdvertiseServer interface { + Send(*Advert) error + grpc.ServerStream +} + +type routerAdvertiseServer struct { + grpc.ServerStream +} + +func (x *routerAdvertiseServer) Send(m *Advert) error { + return x.ServerStream.SendMsg(m) +} + +func _Router_Process_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Advert) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RouterServer).Process(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Router/Process", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RouterServer).Process(ctx, req.(*Advert)) + } + return interceptor(ctx, in, info, handler) +} + +var _Router_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.router.Router", + HandlerType: (*RouterServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Lookup", + Handler: _Router_Lookup_Handler, + }, + { + MethodName: "Process", + Handler: _Router_Process_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "Watch", + Handler: _Router_Watch_Handler, + ServerStreams: true, + }, + { + StreamName: "Advertise", + Handler: _Router_Advertise_Handler, + ServerStreams: true, + }, + }, + Metadata: "router/service/proto/router.proto", +} + +// TableClient is the client API for Table service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type TableClient interface { + Create(ctx context.Context, in *Route, opts ...grpc.CallOption) (*CreateResponse, error) + Delete(ctx context.Context, in *Route, opts ...grpc.CallOption) (*DeleteResponse, error) + Update(ctx context.Context, in *Route, opts ...grpc.CallOption) (*UpdateResponse, error) + List(ctx context.Context, in *Request, opts ...grpc.CallOption) (*ListResponse, error) + Query(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResponse, error) +} + +type tableClient struct { + cc *grpc.ClientConn +} + +func NewTableClient(cc *grpc.ClientConn) TableClient { + return &tableClient{cc} +} + +func (c *tableClient) Create(ctx context.Context, in *Route, opts ...grpc.CallOption) (*CreateResponse, error) { + out := new(CreateResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Table/Create", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *tableClient) Delete(ctx context.Context, in *Route, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Table/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *tableClient) Update(ctx context.Context, in *Route, opts ...grpc.CallOption) (*UpdateResponse, error) { + out := new(UpdateResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Table/Update", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *tableClient) List(ctx context.Context, in *Request, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Table/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *tableClient) Query(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResponse, error) { + out := new(QueryResponse) + err := c.cc.Invoke(ctx, "/go.micro.router.Table/Query", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// TableServer is the server API for Table service. +type TableServer interface { + Create(context.Context, *Route) (*CreateResponse, error) + Delete(context.Context, *Route) (*DeleteResponse, error) + Update(context.Context, *Route) (*UpdateResponse, error) + List(context.Context, *Request) (*ListResponse, error) + Query(context.Context, *QueryRequest) (*QueryResponse, error) +} + +// UnimplementedTableServer can be embedded to have forward compatible implementations. +type UnimplementedTableServer struct { +} + +func (*UnimplementedTableServer) Create(ctx context.Context, req *Route) (*CreateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") +} +func (*UnimplementedTableServer) Delete(ctx context.Context, req *Route) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} +func (*UnimplementedTableServer) Update(ctx context.Context, req *Route) (*UpdateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Update not implemented") +} +func (*UnimplementedTableServer) List(ctx context.Context, req *Request) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} +func (*UnimplementedTableServer) Query(ctx context.Context, req *QueryRequest) (*QueryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Query not implemented") +} + +func RegisterTableServer(s *grpc.Server, srv TableServer) { + s.RegisterService(&_Table_serviceDesc, srv) +} + +func _Table_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Route) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TableServer).Create(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Table/Create", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TableServer).Create(ctx, req.(*Route)) + } + return interceptor(ctx, in, info, handler) +} + +func _Table_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Route) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TableServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Table/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TableServer).Delete(ctx, req.(*Route)) + } + return interceptor(ctx, in, info, handler) +} + +func _Table_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Route) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TableServer).Update(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Table/Update", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TableServer).Update(ctx, req.(*Route)) + } + return interceptor(ctx, in, info, handler) +} + +func _Table_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(Request) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TableServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Table/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TableServer).List(ctx, req.(*Request)) + } + return interceptor(ctx, in, info, handler) +} + +func _Table_Query_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TableServer).Query(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.router.Table/Query", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TableServer).Query(ctx, req.(*QueryRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Table_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.router.Table", + HandlerType: (*TableServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Create", + Handler: _Table_Create_Handler, + }, + { + MethodName: "Delete", + Handler: _Table_Delete_Handler, + }, + { + MethodName: "Update", + Handler: _Table_Update_Handler, + }, + { + MethodName: "List", + Handler: _Table_List_Handler, + }, + { + MethodName: "Query", + Handler: _Table_Query_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "router/service/proto/router.proto", } diff --git a/router/service/proto/router.pb.micro.go b/router/service/proto/router.pb.micro.go index 5bc8c690..d554458a 100644 --- a/router/service/proto/router.pb.micro.go +++ b/router/service/proto/router.pb.micro.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: micro/go-micro/router/service/proto/router.proto +// source: router/service/proto/router.proto -package go_micro_router +package router import ( fmt "fmt" @@ -46,12 +46,6 @@ type routerService struct { } func NewRouterService(name string, c client.Client) RouterService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.router" - } return &routerService{ c: c, name: name, @@ -81,6 +75,7 @@ func (c *routerService) Watch(ctx context.Context, in *WatchRequest, opts ...cli } type Router_WatchService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -95,6 +90,10 @@ func (x *routerServiceWatch) Close() error { return x.stream.Close() } +func (x *routerServiceWatch) Context() context.Context { + return x.stream.Context() +} + func (x *routerServiceWatch) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -125,6 +124,7 @@ func (c *routerService) Advertise(ctx context.Context, in *Request, opts ...clie } type Router_AdvertiseService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -139,6 +139,10 @@ func (x *routerServiceAdvertise) Close() error { return x.stream.Close() } +func (x *routerServiceAdvertise) Context() context.Context { + return x.stream.Context() +} + func (x *routerServiceAdvertise) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -206,6 +210,7 @@ func (h *routerHandler) Watch(ctx context.Context, stream server.Stream) error { } type Router_WatchStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -220,6 +225,10 @@ func (x *routerWatchStream) Close() error { return x.stream.Close() } +func (x *routerWatchStream) Context() context.Context { + return x.stream.Context() +} + func (x *routerWatchStream) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -241,6 +250,7 @@ func (h *routerHandler) Advertise(ctx context.Context, stream server.Stream) err } type Router_AdvertiseStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -255,6 +265,10 @@ func (x *routerAdvertiseStream) Close() error { return x.stream.Close() } +func (x *routerAdvertiseStream) Context() context.Context { + return x.stream.Context() +} + func (x *routerAdvertiseStream) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -287,12 +301,6 @@ type tableService struct { } func NewTableService(name string, c client.Client) TableService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.router" - } return &tableService{ c: c, name: name, diff --git a/router/service/proto/router.proto b/router/service/proto/router.proto index a0926762..22dcf595 100644 --- a/router/service/proto/router.proto +++ b/router/service/proto/router.proto @@ -2,20 +2,21 @@ syntax = "proto3"; package go.micro.router; +option go_package = "github.com/micro/go-micro/v2/router/service/proto;router"; // Router service is used by the proxy to lookup routes service Router { - rpc Lookup(LookupRequest) returns (LookupResponse) {}; - rpc Watch(WatchRequest) returns (stream Event) {}; - rpc Advertise(Request) returns (stream Advert) {}; - rpc Process(Advert) returns (ProcessResponse) {}; + rpc Lookup(LookupRequest) returns (LookupResponse) {}; + rpc Watch(WatchRequest) returns (stream Event) {}; + rpc Advertise(Request) returns (stream Advert) {}; + rpc Process(Advert) returns (ProcessResponse) {}; } service Table { - rpc Create(Route) returns (CreateResponse) {}; - rpc Delete(Route) returns (DeleteResponse) {}; - rpc Update(Route) returns (UpdateResponse) {}; - rpc List(Request) returns (ListResponse) {}; - rpc Query(QueryRequest) returns (QueryResponse) {}; + rpc Create(Route) returns (CreateResponse) {}; + rpc Delete(Route) returns (DeleteResponse) {}; + rpc Update(Route) returns (UpdateResponse) {}; + rpc List(Request) returns (ListResponse) {}; + rpc Query(QueryRequest) returns (QueryResponse) {}; } // Empty request @@ -26,27 +27,27 @@ message Response {} // ListResponse is returned by List message ListResponse { - repeated Route routes = 1; + repeated Route routes = 1; } // LookupRequest is made to Lookup message LookupRequest { - Query query = 1; + Query query = 1; } // LookupResponse is returned by Lookup message LookupResponse { - repeated Route routes = 1; + repeated Route routes = 1; } // QueryRequest queries Table for Routes message QueryRequest{ - Query query = 1; + Query query = 1; } // QueryResponse is returned by Query message QueryResponse { - repeated Route routes = 1; + repeated Route routes = 1; } // WatchRequest is made to Watch Router @@ -54,22 +55,22 @@ message WatchRequest {} // AdvertType defines the type of advert enum AdvertType { - AdvertAnnounce = 0; - AdvertUpdate = 1; + AdvertAnnounce = 0; + AdvertUpdate = 1; } // Advert is router advertsement streamed by Watch message Advert { - // id of the advertising router - string id = 1; - // type of advertisement - AdvertType type = 2; - // unix timestamp of the advertisement - int64 timestamp = 3; - // TTL of the Advert - int64 ttl = 4; - // events is a list of advertised events - repeated Event events = 5; + // id of the advertising router + string id = 1; + // type of advertisement + AdvertType type = 2; + // unix timestamp of the advertisement + int64 timestamp = 3; + // TTL of the Advert + int64 ttl = 4; + // events is a list of advertised events + repeated Event events = 5; } // ProcessResponse is returned by Process @@ -86,47 +87,47 @@ message UpdateResponse {} // EventType defines the type of event enum EventType { - Create = 0; - Delete = 1; - Update = 2; + Create = 0; + Delete = 1; + Update = 2; } // Event is routing table event message Event { - // the unique event id - string id = 1; - // type of event - EventType type = 2; - // unix timestamp of event - int64 timestamp = 3; - // service route - Route route = 4; + // the unique event id + string id = 1; + // type of event + EventType type = 2; + // unix timestamp of event + int64 timestamp = 3; + // service route + Route route = 4; } // Query is passed in a LookupRequest message Query { - // service to lookup - string service = 1; - // gateway to lookup - string gateway = 2; - // network to lookup - string network = 3; + // service to lookup + string service = 1; + // gateway to lookup + string gateway = 2; + // network to lookup + string network = 3; } // Route is a service route message Route { - // service for the route - string service = 1; - // the address that advertise this route - string address = 2; - // gateway as the next hop - string gateway = 3; - // the network for this destination - string network = 4; - // router if the router id - string router = 5; - // the network link - string link = 6; - // the metric / score of this route - int64 metric = 7; + // service for the route + string service = 1; + // the address that advertise this route + string address = 2; + // gateway as the next hop + string gateway = 3; + // the network for this destination + string network = 4; + // router if the router id + string router = 5; + // the network link + string link = 6; + // the metric / score of this route + int64 metric = 7; } diff --git a/runtime/service/proto/runtime.pb.go b/runtime/service/proto/runtime.pb.go index 4d8df642..f51d25dc 100644 --- a/runtime/service/proto/runtime.pb.go +++ b/runtime/service/proto/runtime.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/runtime/service/proto/runtime.proto +// source: runtime/service/proto/runtime.proto package go_micro_runtime import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -38,7 +42,7 @@ func (m *Service) Reset() { *m = Service{} } func (m *Service) String() string { return proto.CompactTextString(m) } func (*Service) ProtoMessage() {} func (*Service) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{0} + return fileDescriptor_2434d8152598889b, []int{0} } func (m *Service) XXX_Unmarshal(b []byte) error { @@ -101,7 +105,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{1} + return fileDescriptor_2434d8152598889b, []int{1} } func (m *Event) XXX_Unmarshal(b []byte) error { @@ -172,7 +176,7 @@ func (m *CreateOptions) Reset() { *m = CreateOptions{} } func (m *CreateOptions) String() string { return proto.CompactTextString(m) } func (*CreateOptions) ProtoMessage() {} func (*CreateOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{2} + return fileDescriptor_2434d8152598889b, []int{2} } func (m *CreateOptions) XXX_Unmarshal(b []byte) error { @@ -247,7 +251,7 @@ func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{3} + return fileDescriptor_2434d8152598889b, []int{3} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { @@ -292,7 +296,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{4} + return fileDescriptor_2434d8152598889b, []int{4} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { @@ -329,7 +333,7 @@ func (m *ReadOptions) Reset() { *m = ReadOptions{} } func (m *ReadOptions) String() string { return proto.CompactTextString(m) } func (*ReadOptions) ProtoMessage() {} func (*ReadOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{5} + return fileDescriptor_2434d8152598889b, []int{5} } func (m *ReadOptions) XXX_Unmarshal(b []byte) error { @@ -382,7 +386,7 @@ func (m *ReadRequest) Reset() { *m = ReadRequest{} } func (m *ReadRequest) String() string { return proto.CompactTextString(m) } func (*ReadRequest) ProtoMessage() {} func (*ReadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{6} + return fileDescriptor_2434d8152598889b, []int{6} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { @@ -421,7 +425,7 @@ func (m *ReadResponse) Reset() { *m = ReadResponse{} } func (m *ReadResponse) String() string { return proto.CompactTextString(m) } func (*ReadResponse) ProtoMessage() {} func (*ReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{7} + return fileDescriptor_2434d8152598889b, []int{7} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { @@ -460,7 +464,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{8} + return fileDescriptor_2434d8152598889b, []int{8} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { @@ -498,7 +502,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{9} + return fileDescriptor_2434d8152598889b, []int{9} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -530,7 +534,7 @@ func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } func (m *UpdateRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRequest) ProtoMessage() {} func (*UpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{10} + return fileDescriptor_2434d8152598889b, []int{10} } func (m *UpdateRequest) XXX_Unmarshal(b []byte) error { @@ -568,7 +572,7 @@ func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } func (m *UpdateResponse) String() string { return proto.CompactTextString(m) } func (*UpdateResponse) ProtoMessage() {} func (*UpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{11} + return fileDescriptor_2434d8152598889b, []int{11} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { @@ -599,7 +603,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{12} + return fileDescriptor_2434d8152598889b, []int{12} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -631,7 +635,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_976fccef828ab1f0, []int{13} + return fileDescriptor_2434d8152598889b, []int{13} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -678,45 +682,268 @@ func init() { } func init() { - proto.RegisterFile("github.com/micro/go-micro/runtime/service/proto/runtime.proto", fileDescriptor_976fccef828ab1f0) + proto.RegisterFile("runtime/service/proto/runtime.proto", fileDescriptor_2434d8152598889b) } -var fileDescriptor_976fccef828ab1f0 = []byte{ - // 563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4b, 0x6f, 0xd3, 0x40, - 0x10, 0xae, 0xe3, 0x3c, 0xda, 0x09, 0x41, 0xd1, 0xaa, 0x42, 0xa6, 0xe2, 0x11, 0xf9, 0x42, 0x2f, - 0x38, 0x52, 0x2a, 0xc4, 0x4b, 0x9c, 0x9a, 0xc0, 0x85, 0x08, 0xc9, 0xa8, 0x3f, 0x60, 0x9b, 0x8c, - 0x82, 0x45, 0xd7, 0x6b, 0xbc, 0xeb, 0x48, 0x39, 0x71, 0xe5, 0xca, 0x4f, 0xe3, 0x1f, 0xa1, 0x7d, - 0xd9, 0x4e, 0x6a, 0xf7, 0x92, 0xdb, 0xcc, 0xec, 0xec, 0xb7, 0xdf, 0xc3, 0x32, 0x7c, 0xda, 0x24, - 0xf2, 0x47, 0x71, 0x1b, 0xad, 0x38, 0x9b, 0xb2, 0x64, 0x95, 0xf3, 0xe9, 0x86, 0xbf, 0x36, 0x45, - 0x5e, 0xa4, 0x32, 0x61, 0x38, 0x15, 0x98, 0x6f, 0x93, 0x15, 0x4e, 0xb3, 0x9c, 0xcb, 0x72, 0x1a, - 0xe9, 0x8e, 0x8c, 0x37, 0x3c, 0xd2, 0xdb, 0x91, 0x9d, 0x87, 0xff, 0x3c, 0x18, 0x7c, 0x37, 0x37, - 0x08, 0x81, 0x6e, 0x4a, 0x19, 0x06, 0xde, 0xc4, 0xbb, 0x3c, 0x8b, 0x75, 0x4d, 0x02, 0x18, 0x6c, - 0x31, 0x17, 0x09, 0x4f, 0x83, 0x8e, 0x1e, 0xbb, 0x96, 0x3c, 0x81, 0xbe, 0xe0, 0x45, 0xbe, 0xc2, - 0xc0, 0xd7, 0x07, 0xb6, 0x23, 0xd7, 0x70, 0xca, 0x50, 0xd2, 0x35, 0x95, 0x34, 0xe8, 0x4e, 0xfc, - 0xcb, 0xe1, 0xec, 0x55, 0x74, 0xf8, 0x6c, 0x64, 0x9f, 0x8c, 0x96, 0x76, 0x73, 0x91, 0xca, 0x7c, - 0x17, 0x97, 0x17, 0x2f, 0x3e, 0xc2, 0x68, 0xef, 0x88, 0x8c, 0xc1, 0xff, 0x89, 0x3b, 0x4b, 0x4d, - 0x95, 0xe4, 0x1c, 0x7a, 0x5b, 0x7a, 0x57, 0xa0, 0xe5, 0x65, 0x9a, 0x0f, 0x9d, 0x77, 0x5e, 0xc8, - 0xa0, 0xb7, 0xd8, 0x62, 0x2a, 0x95, 0x20, 0xb9, 0xcb, 0x4a, 0x41, 0xaa, 0x26, 0xcf, 0xe0, 0x4c, - 0x31, 0x10, 0x92, 0xb2, 0x4c, 0x5f, 0xf5, 0xe3, 0x6a, 0xa0, 0xe4, 0x5a, 0xff, 0xac, 0x2a, 0xd7, - 0xd6, 0x8d, 0xe8, 0xee, 0x19, 0x11, 0xfe, 0xf5, 0x60, 0x74, 0x9d, 0x23, 0x95, 0xf8, 0x2d, 0x93, - 0x09, 0x4f, 0x85, 0xda, 0x5d, 0x71, 0xc6, 0x68, 0xba, 0x0e, 0xbc, 0x89, 0xaf, 0x76, 0x6d, 0xab, - 0x18, 0xd1, 0x7c, 0x23, 0x82, 0x8e, 0x1e, 0xeb, 0x5a, 0x49, 0xc3, 0x74, 0x1b, 0xf8, 0x7a, 0xa4, - 0x4a, 0x65, 0x2d, 0x2f, 0x64, 0x56, 0x48, 0xfb, 0x94, 0xed, 0x4a, 0x3d, 0xbd, 0x9a, 0x9e, 0x73, - 0xe8, 0x25, 0x8c, 0x6e, 0x30, 0xe8, 0x1b, 0x1b, 0x74, 0x13, 0xfe, 0x76, 0x94, 0x62, 0xfc, 0x55, - 0xa0, 0x90, 0xe4, 0xaa, 0x12, 0xa6, 0xdc, 0x18, 0xce, 0x9e, 0xb6, 0x86, 0x52, 0x69, 0x7e, 0x0f, - 0x03, 0x6e, 0x24, 0x69, 0xa7, 0x86, 0xb3, 0x97, 0xf7, 0x2f, 0xed, 0x29, 0x8f, 0xdd, 0x7e, 0x38, - 0x86, 0xc7, 0x8e, 0x80, 0xc8, 0x78, 0x2a, 0x30, 0xbc, 0x81, 0x61, 0x8c, 0x74, 0x5d, 0xf3, 0xa8, - 0x4e, 0xa8, 0xd9, 0xe9, 0x83, 0x4f, 0xce, 0xe9, 0xf7, 0x2b, 0xfd, 0xe1, 0x67, 0x03, 0xeb, 0x74, - 0xbe, 0xad, 0x28, 0x1b, 0x9d, 0xcf, 0xef, 0x53, 0xae, 0xd1, 0xa8, 0x08, 0x2f, 0xe0, 0x91, 0xc1, - 0x31, 0x74, 0xc9, 0x1b, 0x38, 0xb5, 0x84, 0x84, 0x0e, 0xf1, 0x41, 0xc7, 0xca, 0xd5, 0x70, 0x0e, - 0xa3, 0x39, 0xde, 0xe1, 0x71, 0xc6, 0x2b, 0xf7, 0x1c, 0x8a, 0x75, 0x6f, 0x0e, 0xa3, 0x9b, 0x6c, - 0x4d, 0x8f, 0xc7, 0x75, 0x28, 0x16, 0x77, 0x04, 0xc3, 0xaf, 0x89, 0x90, 0x16, 0x55, 0xb9, 0x60, - 0xda, 0xa3, 0x5c, 0x98, 0xfd, 0xf1, 0x61, 0x10, 0x9b, 0x53, 0xb2, 0x84, 0xbe, 0xf9, 0x12, 0x48, - 0xeb, 0xd7, 0x63, 0x5f, 0xbf, 0x98, 0xb4, 0x2f, 0x58, 0xba, 0x27, 0xe4, 0x0b, 0x74, 0x55, 0x4e, - 0xa4, 0x25, 0x57, 0x07, 0xf5, 0xa2, 0xed, 0xb8, 0x04, 0x5a, 0x42, 0xdf, 0x78, 0xdc, 0xc4, 0x6b, - 0x2f, 0xc3, 0x26, 0x5e, 0x07, 0xf1, 0x68, 0x38, 0x63, 0x6d, 0x13, 0xdc, 0x5e, 0x74, 0x4d, 0x70, - 0x07, 0xa9, 0x68, 0x99, 0x2a, 0x88, 0x26, 0x99, 0xb5, 0xbc, 0x9a, 0x64, 0xd6, 0xf3, 0x0b, 0x4f, - 0x6e, 0xfb, 0xfa, 0xcf, 0x7f, 0xf5, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x14, 0xdd, 0xee, 0x9f, 0x3a, - 0x06, 0x00, 0x00, +var fileDescriptor_2434d8152598889b = []byte{ + // 548 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x49, 0x6f, 0xd3, 0x40, + 0x14, 0xae, 0xe3, 0x2c, 0xed, 0x0b, 0x46, 0xd1, 0xa8, 0x42, 0xa6, 0x62, 0x89, 0xcc, 0x81, 0x9e, + 0x1c, 0x29, 0x15, 0x62, 0x3b, 0x36, 0x81, 0x0b, 0x11, 0x92, 0x51, 0x7f, 0xc0, 0x90, 0x3c, 0x45, + 0x16, 0xb5, 0xc7, 0x78, 0xc6, 0x96, 0x72, 0xe2, 0xca, 0x95, 0x9f, 0xc6, 0x3f, 0x42, 0xb3, 0x79, + 0x49, 0x6d, 0x2e, 0xb9, 0xbd, 0xf7, 0xe6, 0xcd, 0x37, 0xdf, 0x62, 0x19, 0x5e, 0xe5, 0x45, 0x2a, + 0xe2, 0x04, 0x17, 0x1c, 0xf3, 0x32, 0xde, 0xe2, 0x22, 0xcb, 0x99, 0x60, 0x0b, 0x33, 0x0d, 0x55, + 0x47, 0x66, 0x7b, 0x16, 0x26, 0xf1, 0x36, 0x67, 0xa1, 0x99, 0x07, 0x7f, 0x1d, 0x98, 0x7c, 0xd3, + 0x37, 0x08, 0x81, 0x61, 0x4a, 0x13, 0xf4, 0x9d, 0xb9, 0x73, 0x7d, 0x11, 0xa9, 0x9a, 0xf8, 0x30, + 0x29, 0x31, 0xe7, 0x31, 0x4b, 0xfd, 0x81, 0x1a, 0xdb, 0x96, 0x3c, 0x81, 0x31, 0x67, 0x45, 0xbe, + 0x45, 0xdf, 0x55, 0x07, 0xa6, 0x23, 0xb7, 0x70, 0x9e, 0xa0, 0xa0, 0x3b, 0x2a, 0xa8, 0x3f, 0x9c, + 0xbb, 0xd7, 0xd3, 0xe5, 0xeb, 0xf0, 0xf8, 0xd9, 0xd0, 0x3c, 0x19, 0x6e, 0xcc, 0xe6, 0x3a, 0x15, + 0xf9, 0x21, 0xaa, 0x2e, 0x5e, 0x7d, 0x04, 0xaf, 0x75, 0x44, 0x66, 0xe0, 0xfe, 0xc0, 0x83, 0xa1, + 0x26, 0x4b, 0x72, 0x09, 0xa3, 0x92, 0xde, 0x17, 0x68, 0x78, 0xe9, 0xe6, 0xc3, 0xe0, 0x9d, 0x13, + 0x24, 0x30, 0x5a, 0x97, 0x98, 0x0a, 0x29, 0x48, 0x1c, 0xb2, 0x4a, 0x90, 0xac, 0xc9, 0x33, 0xb8, + 0x90, 0x0c, 0xb8, 0xa0, 0x49, 0xa6, 0xae, 0xba, 0x51, 0x3d, 0x90, 0x72, 0x8d, 0x7f, 0x46, 0x95, + 0x6d, 0x9b, 0x46, 0x0c, 0x5b, 0x46, 0x04, 0x7f, 0x1c, 0xf0, 0x6e, 0x73, 0xa4, 0x02, 0xbf, 0x66, + 0x22, 0x66, 0x29, 0x97, 0xbb, 0x5b, 0x96, 0x24, 0x34, 0xdd, 0xf9, 0xce, 0xdc, 0x95, 0xbb, 0xa6, + 0x95, 0x8c, 0x68, 0xbe, 0xe7, 0xfe, 0x40, 0x8d, 0x55, 0x2d, 0xa5, 0x61, 0x5a, 0xfa, 0xae, 0x1a, + 0xc9, 0x52, 0x5a, 0xcb, 0x0a, 0x91, 0x15, 0xc2, 0x3c, 0x65, 0xba, 0x4a, 0xcf, 0xa8, 0xa1, 0xe7, + 0x12, 0x46, 0x71, 0x42, 0xf7, 0xe8, 0x8f, 0xb5, 0x0d, 0xaa, 0x09, 0x7e, 0x59, 0x4a, 0x11, 0xfe, + 0x2c, 0x90, 0x0b, 0x72, 0x53, 0x0b, 0x93, 0x6e, 0x4c, 0x97, 0x4f, 0x7b, 0x43, 0xa9, 0x35, 0xbf, + 0x87, 0x09, 0xd3, 0x92, 0x94, 0x53, 0xd3, 0xe5, 0xcb, 0x87, 0x97, 0x5a, 0xca, 0x23, 0xbb, 0x1f, + 0xcc, 0xe0, 0xb1, 0x25, 0xc0, 0x33, 0x96, 0x72, 0x0c, 0xee, 0x60, 0x1a, 0x21, 0xdd, 0x35, 0x3c, + 0x6a, 0x12, 0xea, 0x76, 0xfa, 0xe8, 0x93, 0xb3, 0xfa, 0xdd, 0x5a, 0x7f, 0xf0, 0x49, 0xc3, 0x5a, + 0x9d, 0x6f, 0x6b, 0xca, 0x5a, 0xe7, 0xf3, 0x87, 0x94, 0x1b, 0x34, 0x6a, 0xc2, 0x6b, 0x78, 0xa4, + 0x71, 0x34, 0x5d, 0xf2, 0x06, 0xce, 0x0d, 0x21, 0xae, 0x42, 0xfc, 0xaf, 0x63, 0xd5, 0x6a, 0xb0, + 0x02, 0x6f, 0x85, 0xf7, 0x78, 0x9a, 0xf1, 0xd2, 0x3d, 0x8b, 0x62, 0xdc, 0x5b, 0x81, 0x77, 0x97, + 0xed, 0xe8, 0xe9, 0xb8, 0x16, 0xc5, 0xe0, 0x7a, 0x30, 0xfd, 0x12, 0x73, 0x61, 0x50, 0xa5, 0x0b, + 0xba, 0x3d, 0xc9, 0x85, 0xe5, 0x6f, 0x17, 0x26, 0x91, 0x3e, 0x25, 0x1b, 0x18, 0xeb, 0x2f, 0x81, + 0xf4, 0x7e, 0x3d, 0xe6, 0xf5, 0xab, 0x79, 0xff, 0x82, 0xa1, 0x7b, 0x46, 0x3e, 0xc3, 0x50, 0xe6, + 0x44, 0x7a, 0x72, 0xb5, 0x50, 0x2f, 0xfa, 0x8e, 0x2b, 0xa0, 0x0d, 0x8c, 0xb5, 0xc7, 0x5d, 0xbc, + 0x5a, 0x19, 0x76, 0xf1, 0x3a, 0x8a, 0x47, 0xc1, 0x69, 0x6b, 0xbb, 0xe0, 0x5a, 0xd1, 0x75, 0xc1, + 0x1d, 0xa5, 0xa2, 0x64, 0xca, 0x20, 0xba, 0x64, 0x36, 0xf2, 0xea, 0x92, 0xd9, 0xcc, 0x2f, 0x38, + 0xfb, 0x3e, 0x56, 0x7f, 0xfe, 0x9b, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x01, 0xa4, 0x43, + 0x20, 0x06, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// RuntimeClient is the client API for Runtime service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type RuntimeClient interface { + Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) + Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) + List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) +} + +type runtimeClient struct { + cc *grpc.ClientConn +} + +func NewRuntimeClient(cc *grpc.ClientConn) RuntimeClient { + return &runtimeClient{cc} +} + +func (c *runtimeClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { + out := new(CreateResponse) + err := c.cc.Invoke(ctx, "/go.micro.runtime.Runtime/Create", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *runtimeClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) { + out := new(ReadResponse) + err := c.cc.Invoke(ctx, "/go.micro.runtime.Runtime/Read", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *runtimeClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/go.micro.runtime.Runtime/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *runtimeClient) Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) { + out := new(UpdateResponse) + err := c.cc.Invoke(ctx, "/go.micro.runtime.Runtime/Update", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *runtimeClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/go.micro.runtime.Runtime/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// RuntimeServer is the server API for Runtime service. +type RuntimeServer interface { + Create(context.Context, *CreateRequest) (*CreateResponse, error) + Read(context.Context, *ReadRequest) (*ReadResponse, error) + Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) + Update(context.Context, *UpdateRequest) (*UpdateResponse, error) + List(context.Context, *ListRequest) (*ListResponse, error) +} + +// UnimplementedRuntimeServer can be embedded to have forward compatible implementations. +type UnimplementedRuntimeServer struct { +} + +func (*UnimplementedRuntimeServer) Create(ctx context.Context, req *CreateRequest) (*CreateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") +} +func (*UnimplementedRuntimeServer) Read(ctx context.Context, req *ReadRequest) (*ReadResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Read not implemented") +} +func (*UnimplementedRuntimeServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} +func (*UnimplementedRuntimeServer) Update(ctx context.Context, req *UpdateRequest) (*UpdateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Update not implemented") +} +func (*UnimplementedRuntimeServer) List(ctx context.Context, req *ListRequest) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} + +func RegisterRuntimeServer(s *grpc.Server, srv RuntimeServer) { + s.RegisterService(&_Runtime_serviceDesc, srv) +} + +func _Runtime_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RuntimeServer).Create(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.runtime.Runtime/Create", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RuntimeServer).Create(ctx, req.(*CreateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Runtime_Read_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReadRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RuntimeServer).Read(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.runtime.Runtime/Read", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RuntimeServer).Read(ctx, req.(*ReadRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Runtime_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RuntimeServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.runtime.Runtime/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RuntimeServer).Delete(ctx, req.(*DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Runtime_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RuntimeServer).Update(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.runtime.Runtime/Update", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RuntimeServer).Update(ctx, req.(*UpdateRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Runtime_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RuntimeServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.runtime.Runtime/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RuntimeServer).List(ctx, req.(*ListRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Runtime_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.runtime.Runtime", + HandlerType: (*RuntimeServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Create", + Handler: _Runtime_Create_Handler, + }, + { + MethodName: "Read", + Handler: _Runtime_Read_Handler, + }, + { + MethodName: "Delete", + Handler: _Runtime_Delete_Handler, + }, + { + MethodName: "Update", + Handler: _Runtime_Update_Handler, + }, + { + MethodName: "List", + Handler: _Runtime_List_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "runtime/service/proto/runtime.proto", } diff --git a/runtime/service/proto/runtime.pb.micro.go b/runtime/service/proto/runtime.pb.micro.go index ddcba829..12b6691b 100644 --- a/runtime/service/proto/runtime.pb.micro.go +++ b/runtime/service/proto/runtime.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/runtime/service/proto/runtime.proto +// source: runtime/service/proto/runtime.proto package go_micro_runtime diff --git a/server/grpc/proto/test.pb.go b/server/grpc/proto/test.pb.go index 5a778c9c..9028bc7e 100644 --- a/server/grpc/proto/test.pb.go +++ b/server/grpc/proto/test.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: go-micro/service/grpc/proto/test.proto +// source: server/grpc/proto/test.proto package test @@ -8,6 +8,8 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -33,7 +35,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_a22a4245ce525bcd, []int{0} + return fileDescriptor_bb9c685b7640cf1e, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -72,7 +74,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_a22a4245ce525bcd, []int{1} + return fileDescriptor_bb9c685b7640cf1e, []int{1} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -105,21 +107,19 @@ func init() { proto.RegisterType((*Response)(nil), "Response") } -func init() { - proto.RegisterFile("go-micro/service/grpc/proto/test.proto", fileDescriptor_a22a4245ce525bcd) -} +func init() { proto.RegisterFile("server/grpc/proto/test.proto", fileDescriptor_bb9c685b7640cf1e) } -var fileDescriptor_a22a4245ce525bcd = []byte{ - // 142 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xcf, 0xd7, 0xcd, - 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x4f, 0x2f, 0x2a, - 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x03, 0x33, 0x95, - 0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, - 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x25, 0x19, 0x2e, 0x8e, 0xa0, - 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x01, 0x2e, 0xe6, 0xdc, 0xe2, 0x74, 0xa8, 0x34, - 0x88, 0x69, 0xa4, 0xca, 0xc5, 0x12, 0x02, 0xd2, 0x29, 0xcb, 0xc5, 0xe2, 0x9c, 0x98, 0x93, 0x23, - 0xc4, 0xa1, 0x07, 0x35, 0x4b, 0x8a, 0x53, 0x0f, 0xa6, 0x4d, 0x89, 0x21, 0x89, 0x0d, 0x6c, 0x95, - 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x96, 0x1b, 0x22, 0x44, 0x94, 0x00, 0x00, 0x00, +var fileDescriptor_bb9c685b7640cf1e = []byte{ + // 132 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x2d, 0x2a, + 0x4b, 0x2d, 0xd2, 0x4f, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, 0x49, + 0x2d, 0x2e, 0xd1, 0x03, 0x33, 0x95, 0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, + 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, + 0x6c, 0x25, 0x19, 0x2e, 0x8e, 0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x01, 0x2e, + 0xe6, 0xdc, 0xe2, 0x74, 0xa8, 0x34, 0x88, 0x69, 0xa4, 0xca, 0xc5, 0x12, 0x02, 0xd2, 0x29, 0xcb, + 0xc5, 0xe2, 0x9c, 0x98, 0x93, 0x23, 0xc4, 0xa1, 0x07, 0x35, 0x4b, 0x8a, 0x53, 0x0f, 0xa6, 0x4d, + 0x89, 0x21, 0x89, 0x0d, 0x6c, 0x95, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xc8, 0xea, 0xc1, + 0x8a, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -159,6 +159,14 @@ type TestServer interface { Call(context.Context, *Request) (*Response, error) } +// UnimplementedTestServer can be embedded to have forward compatible implementations. +type UnimplementedTestServer struct { +} + +func (*UnimplementedTestServer) Call(ctx context.Context, req *Request) (*Response, error) { + return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") +} + func RegisterTestServer(s *grpc.Server, srv TestServer) { s.RegisterService(&_Test_serviceDesc, srv) } @@ -191,5 +199,5 @@ var _Test_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "go-micro/service/grpc/proto/test.proto", + Metadata: "server/grpc/proto/test.proto", } diff --git a/server/grpc/proto/test.micro.go b/server/grpc/proto/test.pb.micro.go similarity index 93% rename from server/grpc/proto/test.micro.go rename to server/grpc/proto/test.pb.micro.go index 5cc8a4e0..a06bd3ee 100644 --- a/server/grpc/proto/test.micro.go +++ b/server/grpc/proto/test.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: go-micro/service/grpc/proto/test.proto +// source: server/grpc/proto/test.proto package test @@ -43,12 +43,6 @@ type testService struct { } func NewTestService(name string, c client.Client) TestService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "test" - } return &testService{ c: c, name: name, diff --git a/server/proto/server.pb.go b/server/proto/server.pb.go index d9fd74aa..5813ff28 100644 --- a/server/proto/server.pb.go +++ b/server/proto/server.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/server/proto/server.proto +// source: server/proto/server.proto package go_micro_server import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -33,7 +37,7 @@ func (m *HandleRequest) Reset() { *m = HandleRequest{} } func (m *HandleRequest) String() string { return proto.CompactTextString(m) } func (*HandleRequest) ProtoMessage() {} func (*HandleRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4cb0c66620400ff8, []int{0} + return fileDescriptor_1959cecd4d1121a1, []int{0} } func (m *HandleRequest) XXX_Unmarshal(b []byte) error { @@ -85,7 +89,7 @@ func (m *HandleResponse) Reset() { *m = HandleResponse{} } func (m *HandleResponse) String() string { return proto.CompactTextString(m) } func (*HandleResponse) ProtoMessage() {} func (*HandleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4cb0c66620400ff8, []int{1} + return fileDescriptor_1959cecd4d1121a1, []int{1} } func (m *HandleResponse) XXX_Unmarshal(b []byte) error { @@ -117,7 +121,7 @@ func (m *SubscribeRequest) Reset() { *m = SubscribeRequest{} } func (m *SubscribeRequest) String() string { return proto.CompactTextString(m) } func (*SubscribeRequest) ProtoMessage() {} func (*SubscribeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_4cb0c66620400ff8, []int{2} + return fileDescriptor_1959cecd4d1121a1, []int{2} } func (m *SubscribeRequest) XXX_Unmarshal(b []byte) error { @@ -155,7 +159,7 @@ func (m *SubscribeResponse) Reset() { *m = SubscribeResponse{} } func (m *SubscribeResponse) String() string { return proto.CompactTextString(m) } func (*SubscribeResponse) ProtoMessage() {} func (*SubscribeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_4cb0c66620400ff8, []int{3} + return fileDescriptor_1959cecd4d1121a1, []int{3} } func (m *SubscribeResponse) XXX_Unmarshal(b []byte) error { @@ -183,25 +187,138 @@ func init() { proto.RegisterType((*SubscribeResponse)(nil), "go.micro.server.SubscribeResponse") } -func init() { - proto.RegisterFile("github.com/micro/go-micro/v2/server/proto/server.proto", fileDescriptor_4cb0c66620400ff8) +func init() { proto.RegisterFile("server/proto/server.proto", fileDescriptor_1959cecd4d1121a1) } + +var fileDescriptor_1959cecd4d1121a1 = []byte{ + // 223 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x4e, 0x2d, 0x2a, + 0x4b, 0x2d, 0xd2, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x87, 0x70, 0xf4, 0xc0, 0x1c, 0x21, 0xfe, + 0xf4, 0x7c, 0xbd, 0xdc, 0xcc, 0xe4, 0xa2, 0x7c, 0x3d, 0x88, 0xb0, 0x52, 0x22, 0x17, 0xaf, 0x47, + 0x62, 0x5e, 0x4a, 0x4e, 0x6a, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x90, 0x04, 0x17, 0x3b, + 0x48, 0x2a, 0x33, 0x39, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xc6, 0x15, 0x92, 0xe2, + 0xe2, 0x48, 0xcd, 0x4b, 0x29, 0xc8, 0xcf, 0xcc, 0x2b, 0x91, 0x60, 0x02, 0x4b, 0xc1, 0xf9, 0x20, + 0x39, 0xb0, 0x05, 0xc9, 0xf9, 0x39, 0x12, 0xcc, 0x10, 0x39, 0x18, 0x5f, 0x49, 0x80, 0x8b, 0x0f, + 0x66, 0x45, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x92, 0x06, 0x97, 0x40, 0x70, 0x69, 0x52, 0x71, + 0x72, 0x51, 0x66, 0x12, 0xdc, 0x5e, 0x11, 0x2e, 0xd6, 0x92, 0xfc, 0x82, 0xcc, 0x64, 0xa8, 0xad, + 0x10, 0x8e, 0x92, 0x30, 0x97, 0x20, 0x92, 0x4a, 0x88, 0x76, 0xa3, 0xd5, 0x8c, 0x5c, 0x6c, 0xc1, + 0x60, 0xe7, 0x0b, 0x79, 0x73, 0xb1, 0x41, 0xcc, 0x16, 0x92, 0xd3, 0x43, 0xf3, 0x9a, 0x1e, 0x8a, + 0xbf, 0xa4, 0xe4, 0x71, 0xca, 0x43, 0x1d, 0xc5, 0x20, 0x14, 0xc2, 0xc5, 0x09, 0xb7, 0x4c, 0x48, + 0x11, 0x43, 0x3d, 0xba, 0x93, 0xa5, 0x94, 0xf0, 0x29, 0x81, 0x99, 0x9a, 0xc4, 0x06, 0x0e, 0x08, + 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x3f, 0x79, 0x80, 0x96, 0x01, 0x00, 0x00, } -var fileDescriptor_4cb0c66620400ff8 = []byte{ - // 236 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcd, 0x4e, 0x03, 0x21, - 0x14, 0x85, 0x1d, 0x8d, 0xa3, 0xbd, 0x89, 0x5a, 0xd1, 0x05, 0x99, 0x85, 0x3f, 0xac, 0xba, 0x91, - 0x49, 0xec, 0x4b, 0x98, 0xb8, 0x6b, 0x7d, 0x81, 0x42, 0x6f, 0x46, 0x92, 0x96, 0x8b, 0xc0, 0xf8, - 0x52, 0xbe, 0xa4, 0x29, 0x94, 0x89, 0x8e, 0xb1, 0x3b, 0x3e, 0xce, 0xe1, 0x9e, 0x73, 0x81, 0x79, - 0x67, 0xe2, 0x7b, 0xaf, 0xa4, 0xa6, 0x6d, 0xbb, 0x35, 0xda, 0x53, 0xdb, 0xd1, 0x53, 0x3e, 0x04, - 0xf4, 0x9f, 0xe8, 0x5b, 0xe7, 0x29, 0x16, 0x90, 0x09, 0xd8, 0x55, 0x47, 0x32, 0x79, 0x64, 0xbe, - 0x16, 0x2b, 0xb8, 0x78, 0x59, 0xd9, 0xf5, 0x06, 0x17, 0xf8, 0xd1, 0x63, 0x88, 0x8c, 0xc3, 0xd9, - 0x4e, 0x32, 0x1a, 0x79, 0xf5, 0x50, 0xcd, 0x26, 0x8b, 0x82, 0xac, 0x81, 0x73, 0xb4, 0x6b, 0x47, - 0xc6, 0x46, 0x7e, 0x9c, 0xa4, 0x81, 0x77, 0x5a, 0x0a, 0xd0, 0xb4, 0xe1, 0x27, 0x59, 0x2b, 0x2c, - 0xa6, 0x70, 0x59, 0x22, 0x82, 0x23, 0x1b, 0x50, 0xcc, 0x60, 0xba, 0xec, 0x55, 0xd0, 0xde, 0xa8, - 0x21, 0xf7, 0x16, 0x4e, 0x23, 0x39, 0xa3, 0xf7, 0xa9, 0x19, 0xc4, 0x0d, 0x5c, 0xff, 0x70, 0xe6, - 0xe7, 0xcf, 0x5f, 0x15, 0xd4, 0xcb, 0x54, 0x9f, 0xbd, 0x42, 0x9d, 0x67, 0xb3, 0x3b, 0x39, 0x5a, - 0x4d, 0xfe, 0xda, 0xab, 0xb9, 0xff, 0x57, 0xdf, 0x97, 0x3a, 0x62, 0x6f, 0x30, 0x19, 0xc2, 0xd8, - 0xe3, 0x1f, 0xff, 0xb8, 0x72, 0x23, 0x0e, 0x59, 0xca, 0x54, 0x55, 0xa7, 0x8f, 0x98, 0x7f, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x30, 0xd3, 0x7a, 0x91, 0xb0, 0x01, 0x00, 0x00, +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// ServerClient is the client API for Server service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ServerClient interface { + Handle(ctx context.Context, in *HandleRequest, opts ...grpc.CallOption) (*HandleResponse, error) + Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (*SubscribeResponse, error) +} + +type serverClient struct { + cc *grpc.ClientConn +} + +func NewServerClient(cc *grpc.ClientConn) ServerClient { + return &serverClient{cc} +} + +func (c *serverClient) Handle(ctx context.Context, in *HandleRequest, opts ...grpc.CallOption) (*HandleResponse, error) { + out := new(HandleResponse) + err := c.cc.Invoke(ctx, "/go.micro.server.Server/Handle", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *serverClient) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (*SubscribeResponse, error) { + out := new(SubscribeResponse) + err := c.cc.Invoke(ctx, "/go.micro.server.Server/Subscribe", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ServerServer is the server API for Server service. +type ServerServer interface { + Handle(context.Context, *HandleRequest) (*HandleResponse, error) + Subscribe(context.Context, *SubscribeRequest) (*SubscribeResponse, error) +} + +// UnimplementedServerServer can be embedded to have forward compatible implementations. +type UnimplementedServerServer struct { +} + +func (*UnimplementedServerServer) Handle(ctx context.Context, req *HandleRequest) (*HandleResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Handle not implemented") +} +func (*UnimplementedServerServer) Subscribe(ctx context.Context, req *SubscribeRequest) (*SubscribeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Subscribe not implemented") +} + +func RegisterServerServer(s *grpc.Server, srv ServerServer) { + s.RegisterService(&_Server_serviceDesc, srv) +} + +func _Server_Handle_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(HandleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ServerServer).Handle(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.server.Server/Handle", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ServerServer).Handle(ctx, req.(*HandleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Server_Subscribe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SubscribeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ServerServer).Subscribe(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.server.Server/Subscribe", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ServerServer).Subscribe(ctx, req.(*SubscribeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Server_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.server.Server", + HandlerType: (*ServerServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Handle", + Handler: _Server_Handle_Handler, + }, + { + MethodName: "Subscribe", + Handler: _Server_Subscribe_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "server/proto/server.proto", } diff --git a/server/proto/server.pb.micro.go b/server/proto/server.pb.micro.go index 1c7ebd3d..892ce569 100644 --- a/server/proto/server.pb.micro.go +++ b/server/proto/server.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: github.com/micro/go-micro/v2/server/proto/server.proto +// source: server/proto/server.proto package go_micro_server @@ -44,12 +44,6 @@ type serverService struct { } func NewServerService(name string, c client.Client) ServerService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.server" - } return &serverService{ c: c, name: name, diff --git a/service/grpc/proto/test.pb.go b/service/grpc/proto/test.pb.go index 5a778c9c..7ce3f3c4 100644 --- a/service/grpc/proto/test.pb.go +++ b/service/grpc/proto/test.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: go-micro/service/grpc/proto/test.proto +// source: service/grpc/proto/test.proto package test @@ -8,6 +8,8 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -33,7 +35,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_a22a4245ce525bcd, []int{0} + return fileDescriptor_06b01994cb662112, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -72,7 +74,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_a22a4245ce525bcd, []int{1} + return fileDescriptor_06b01994cb662112, []int{1} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -105,21 +107,19 @@ func init() { proto.RegisterType((*Response)(nil), "Response") } -func init() { - proto.RegisterFile("go-micro/service/grpc/proto/test.proto", fileDescriptor_a22a4245ce525bcd) -} +func init() { proto.RegisterFile("service/grpc/proto/test.proto", fileDescriptor_06b01994cb662112) } -var fileDescriptor_a22a4245ce525bcd = []byte{ - // 142 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xcf, 0xd7, 0xcd, - 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x4f, 0x2f, 0x2a, - 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x03, 0x33, 0x95, - 0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, - 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x25, 0x19, 0x2e, 0x8e, 0xa0, - 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x01, 0x2e, 0xe6, 0xdc, 0xe2, 0x74, 0xa8, 0x34, - 0x88, 0x69, 0xa4, 0xca, 0xc5, 0x12, 0x02, 0xd2, 0x29, 0xcb, 0xc5, 0xe2, 0x9c, 0x98, 0x93, 0x23, - 0xc4, 0xa1, 0x07, 0x35, 0x4b, 0x8a, 0x53, 0x0f, 0xa6, 0x4d, 0x89, 0x21, 0x89, 0x0d, 0x6c, 0x95, - 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x96, 0x1b, 0x22, 0x44, 0x94, 0x00, 0x00, 0x00, +var fileDescriptor_06b01994cb662112 = []byte{ + // 133 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x4e, 0x2d, 0x2a, + 0xcb, 0x4c, 0x4e, 0xd5, 0x4f, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, + 0x49, 0x2d, 0x2e, 0xd1, 0x03, 0x33, 0x95, 0x64, 0xb9, 0xd8, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, + 0x4b, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, + 0xc0, 0x6c, 0x25, 0x19, 0x2e, 0x8e, 0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x21, 0x01, + 0x2e, 0xe6, 0xdc, 0xe2, 0x74, 0xa8, 0x34, 0x88, 0x69, 0xa4, 0xca, 0xc5, 0x12, 0x02, 0xd2, 0x29, + 0xcb, 0xc5, 0xe2, 0x9c, 0x98, 0x93, 0x23, 0xc4, 0xa1, 0x07, 0x35, 0x4b, 0x8a, 0x53, 0x0f, 0xa6, + 0x4d, 0x89, 0x21, 0x89, 0x0d, 0x6c, 0x95, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x7f, 0x80, + 0xd4, 0x8b, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -159,6 +159,14 @@ type TestServer interface { Call(context.Context, *Request) (*Response, error) } +// UnimplementedTestServer can be embedded to have forward compatible implementations. +type UnimplementedTestServer struct { +} + +func (*UnimplementedTestServer) Call(ctx context.Context, req *Request) (*Response, error) { + return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") +} + func RegisterTestServer(s *grpc.Server, srv TestServer) { s.RegisterService(&_Test_serviceDesc, srv) } @@ -191,5 +199,5 @@ var _Test_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "go-micro/service/grpc/proto/test.proto", + Metadata: "service/grpc/proto/test.proto", } diff --git a/service/grpc/proto/test.micro.go b/service/grpc/proto/test.pb.micro.go similarity index 93% rename from service/grpc/proto/test.micro.go rename to service/grpc/proto/test.pb.micro.go index 5cc8a4e0..f4d93011 100644 --- a/service/grpc/proto/test.micro.go +++ b/service/grpc/proto/test.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: go-micro/service/grpc/proto/test.proto +// source: service/grpc/proto/test.proto package test @@ -43,12 +43,6 @@ type testService struct { } func NewTestService(name string, c client.Client) TestService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "test" - } return &testService{ c: c, name: name, diff --git a/store/etcd/config.go b/store/etcd/config.go index f50b7f54..eb79cea1 100644 --- a/store/etcd/config.go +++ b/store/etcd/config.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc" ) -// Implement all the options from https://pkg.go.dev/go.etcd.io/etcd/clientv3?tab=doc#Config +// Implement all the options from https://pkg.go.dev/github.com/coreos/etcd/clientv3?tab=doc#Config // Need to use non basic types in context.WithValue type autoSyncInterval string type dialTimeout string diff --git a/store/service/proto/store.pb.go b/store/service/proto/store.pb.go index b7cd9979..177e664d 100644 --- a/store/service/proto/store.pb.go +++ b/store/service/proto/store.pb.go @@ -1,11 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: store.proto +// source: store/service/proto/store.proto package go_micro_store import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -36,7 +40,7 @@ func (m *Record) Reset() { *m = Record{} } func (m *Record) String() string { return proto.CompactTextString(m) } func (*Record) ProtoMessage() {} func (*Record) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{0} + return fileDescriptor_1ba364858f5c3cdb, []int{0} } func (m *Record) XXX_Unmarshal(b []byte) error { @@ -92,7 +96,7 @@ func (m *ReadOptions) Reset() { *m = ReadOptions{} } func (m *ReadOptions) String() string { return proto.CompactTextString(m) } func (*ReadOptions) ProtoMessage() {} func (*ReadOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{1} + return fileDescriptor_1ba364858f5c3cdb, []int{1} } func (m *ReadOptions) XXX_Unmarshal(b []byte) error { @@ -153,7 +157,7 @@ func (m *ReadRequest) Reset() { *m = ReadRequest{} } func (m *ReadRequest) String() string { return proto.CompactTextString(m) } func (*ReadRequest) ProtoMessage() {} func (*ReadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{2} + return fileDescriptor_1ba364858f5c3cdb, []int{2} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { @@ -199,7 +203,7 @@ func (m *ReadResponse) Reset() { *m = ReadResponse{} } func (m *ReadResponse) String() string { return proto.CompactTextString(m) } func (*ReadResponse) ProtoMessage() {} func (*ReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{3} + return fileDescriptor_1ba364858f5c3cdb, []int{3} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { @@ -241,7 +245,7 @@ func (m *WriteOptions) Reset() { *m = WriteOptions{} } func (m *WriteOptions) String() string { return proto.CompactTextString(m) } func (*WriteOptions) ProtoMessage() {} func (*WriteOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{4} + return fileDescriptor_1ba364858f5c3cdb, []int{4} } func (m *WriteOptions) XXX_Unmarshal(b []byte) error { @@ -288,7 +292,7 @@ func (m *WriteRequest) Reset() { *m = WriteRequest{} } func (m *WriteRequest) String() string { return proto.CompactTextString(m) } func (*WriteRequest) ProtoMessage() {} func (*WriteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{5} + return fileDescriptor_1ba364858f5c3cdb, []int{5} } func (m *WriteRequest) XXX_Unmarshal(b []byte) error { @@ -333,7 +337,7 @@ func (m *WriteResponse) Reset() { *m = WriteResponse{} } func (m *WriteResponse) String() string { return proto.CompactTextString(m) } func (*WriteResponse) ProtoMessage() {} func (*WriteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{6} + return fileDescriptor_1ba364858f5c3cdb, []int{6} } func (m *WriteResponse) XXX_Unmarshal(b []byte) error { @@ -364,7 +368,7 @@ func (m *DeleteOptions) Reset() { *m = DeleteOptions{} } func (m *DeleteOptions) String() string { return proto.CompactTextString(m) } func (*DeleteOptions) ProtoMessage() {} func (*DeleteOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{7} + return fileDescriptor_1ba364858f5c3cdb, []int{7} } func (m *DeleteOptions) XXX_Unmarshal(b []byte) error { @@ -397,7 +401,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{8} + return fileDescriptor_1ba364858f5c3cdb, []int{8} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { @@ -442,7 +446,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{9} + return fileDescriptor_1ba364858f5c3cdb, []int{9} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -477,7 +481,7 @@ func (m *ListOptions) Reset() { *m = ListOptions{} } func (m *ListOptions) String() string { return proto.CompactTextString(m) } func (*ListOptions) ProtoMessage() {} func (*ListOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{10} + return fileDescriptor_1ba364858f5c3cdb, []int{10} } func (m *ListOptions) XXX_Unmarshal(b []byte) error { @@ -537,7 +541,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{11} + return fileDescriptor_1ba364858f5c3cdb, []int{11} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -576,7 +580,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_98bbca36ef968dfc, []int{12} + return fileDescriptor_1ba364858f5c3cdb, []int{12} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -620,37 +624,254 @@ func init() { proto.RegisterType((*ListResponse)(nil), "go.micro.store.ListResponse") } -func init() { proto.RegisterFile("store.proto", fileDescriptor_98bbca36ef968dfc) } +func init() { proto.RegisterFile("store/service/proto/store.proto", fileDescriptor_1ba364858f5c3cdb) } -var fileDescriptor_98bbca36ef968dfc = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5d, 0x6b, 0xd4, 0x40, - 0x14, 0xed, 0x6c, 0xb2, 0x69, 0xf7, 0x26, 0xd6, 0x65, 0x90, 0x12, 0xb4, 0x95, 0x30, 0x4f, 0x79, - 0x0a, 0x65, 0xc5, 0x8f, 0x47, 0xc1, 0x2a, 0x2a, 0x82, 0x30, 0x82, 0x82, 0x6f, 0xb5, 0x9d, 0xc8, - 0x90, 0xb4, 0x13, 0x67, 0x66, 0x4b, 0xf7, 0x0f, 0xf9, 0x3b, 0x65, 0xbe, 0x76, 0xb3, 0x31, 0x79, - 0xe9, 0x5b, 0xee, 0x9d, 0x3b, 0xe7, 0xdc, 0x73, 0xe6, 0x10, 0x48, 0x95, 0x16, 0x92, 0x55, 0x9d, - 0x14, 0x5a, 0xe0, 0xe3, 0xdf, 0xa2, 0xba, 0xe1, 0x57, 0x52, 0x54, 0xb6, 0x4b, 0x3e, 0x42, 0x42, - 0xd9, 0x95, 0x90, 0xd7, 0x78, 0x09, 0x51, 0xc3, 0x36, 0x39, 0x2a, 0x50, 0xb9, 0xa0, 0xe6, 0x13, - 0x3f, 0x81, 0xf9, 0xdd, 0x65, 0xbb, 0x66, 0xf9, 0xac, 0x40, 0x65, 0x46, 0x5d, 0x81, 0x4f, 0x20, - 0x61, 0xf7, 0x1d, 0x97, 0x9b, 0x3c, 0x2a, 0x50, 0x19, 0x51, 0x5f, 0x91, 0x06, 0x52, 0xca, 0x2e, - 0xaf, 0xbf, 0x76, 0x9a, 0x8b, 0x5b, 0x65, 0xc6, 0x3a, 0xc9, 0x6a, 0x7e, 0x6f, 0x11, 0x8f, 0xa8, - 0xaf, 0x4c, 0x5f, 0xad, 0x6b, 0xd3, 0x9f, 0xb9, 0xbe, 0xab, 0x0c, 0x59, 0xcb, 0x6f, 0xb8, 0xb6, - 0xa8, 0x31, 0x75, 0x85, 0x99, 0x16, 0x75, 0xad, 0x98, 0xce, 0x63, 0xdb, 0xf6, 0x15, 0xf9, 0xee, - 0xc8, 0x28, 0xfb, 0xb3, 0x66, 0x4a, 0x8f, 0xec, 0xfe, 0x12, 0x0e, 0x85, 0xdb, 0xc4, 0xf2, 0xa4, - 0xab, 0x67, 0xd5, 0xbe, 0xf2, 0xaa, 0xb7, 0x2c, 0x0d, 0xb3, 0xe4, 0x2d, 0x64, 0x0e, 0x57, 0x75, - 0xe2, 0x56, 0x31, 0x7c, 0x0e, 0x87, 0xd2, 0xda, 0xa3, 0x72, 0x54, 0x44, 0x65, 0xba, 0x3a, 0xf9, - 0x1f, 0xc6, 0x1c, 0xd3, 0x30, 0x46, 0xde, 0x40, 0xf6, 0x43, 0x72, 0xcd, 0x7a, 0x3e, 0x78, 0xbb, - 0x50, 0xdf, 0x2e, 0xb3, 0xb2, 0xd6, 0xad, 0x5d, 0x2e, 0xa2, 0xe6, 0x93, 0xdc, 0xf9, 0x9b, 0x41, - 0x54, 0x05, 0x89, 0x03, 0xb5, 0x37, 0xa7, 0xa9, 0xfd, 0x14, 0x7e, 0x35, 0x94, 0x7c, 0x3a, 0xbc, - 0xd0, 0x5f, 0x6c, 0xa7, 0xf9, 0x31, 0x3c, 0xf2, 0xbc, 0x4e, 0xb4, 0x69, 0x5c, 0xb0, 0x96, 0x6d, - 0x47, 0xc9, 0xcf, 0xd0, 0x98, 0xf6, 0xfb, 0xf5, 0x90, 0xfc, 0x6c, 0x48, 0xbe, 0x07, 0xb9, 0x63, - 0x5f, 0xc2, 0x71, 0xc0, 0xf6, 0xf4, 0x0d, 0xa4, 0x5f, 0xb8, 0xd2, 0xe3, 0x41, 0x5a, 0x4c, 0x04, - 0x69, 0xf1, 0xc0, 0x20, 0x5d, 0x38, 0xb2, 0x20, 0xac, 0x17, 0x1b, 0x34, 0x1e, 0x9b, 0xde, 0x6a, - 0x3b, 0x11, 0x25, 0x64, 0x0e, 0xc5, 0xc7, 0x06, 0x43, 0xdc, 0xb0, 0x8d, 0xb1, 0x22, 0x2a, 0x17, - 0xd4, 0x7e, 0x7f, 0x8e, 0x8f, 0xd0, 0x72, 0xb6, 0xfa, 0x3b, 0x83, 0xf9, 0x37, 0x03, 0x84, 0xdf, - 0x41, 0x6c, 0xa2, 0x86, 0x47, 0x83, 0xe9, 0xf7, 0x79, 0x7a, 0x3a, 0x7e, 0xe8, 0x9d, 0x3a, 0xc0, - 0x1f, 0x60, 0x6e, 0xdf, 0x0e, 0x8f, 0xbf, 0x75, 0x80, 0x39, 0x9b, 0x38, 0xdd, 0xe2, 0x7c, 0x82, - 0xc4, 0xbd, 0x02, 0x9e, 0x78, 0xb7, 0x80, 0xf4, 0x7c, 0xea, 0x78, 0x0b, 0xf5, 0x1e, 0x62, 0xe3, - 0x05, 0x1e, 0x75, 0x6e, 0x52, 0x57, 0xdf, 0x3e, 0x72, 0x70, 0x8e, 0x7e, 0x25, 0xf6, 0x7f, 0xf5, - 0xe2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x11, 0xc3, 0x50, 0xbe, 0x04, 0x00, 0x00, +var fileDescriptor_1ba364858f5c3cdb = []byte{ + // 474 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5d, 0x6f, 0xd3, 0x30, + 0x14, 0x9d, 0x9b, 0x34, 0x5b, 0x6f, 0xcb, 0xa8, 0x2c, 0x34, 0x45, 0xb0, 0x41, 0xe5, 0xa7, 0x3c, + 0xa5, 0x53, 0x11, 0x1f, 0x8f, 0x48, 0x0c, 0x04, 0x08, 0x09, 0xc9, 0x48, 0x20, 0xf1, 0x36, 0xba, + 0x5b, 0x64, 0xb5, 0x9b, 0x83, 0xed, 0x56, 0xeb, 0x1f, 0xe2, 0x77, 0x22, 0x7f, 0xb5, 0x69, 0x48, + 0x5e, 0x78, 0xf3, 0xbd, 0xbe, 0x39, 0xe7, 0x9e, 0xe3, 0xa3, 0xc0, 0x33, 0x6d, 0xa4, 0xc2, 0xa9, + 0x46, 0xb5, 0x11, 0x73, 0x9c, 0x56, 0x4a, 0x1a, 0x39, 0x75, 0xbd, 0xd2, 0x9d, 0xe9, 0xe9, 0x2f, + 0x59, 0xde, 0x8a, 0xb9, 0x92, 0xa5, 0xeb, 0xb2, 0x0f, 0x90, 0x71, 0x9c, 0x4b, 0x75, 0x43, 0xc7, + 0x90, 0x2c, 0x71, 0x9b, 0x93, 0x09, 0x29, 0x06, 0xdc, 0x1e, 0xe9, 0x23, 0xe8, 0x6f, 0xae, 0x57, + 0x6b, 0xcc, 0x7b, 0x13, 0x52, 0x8c, 0xb8, 0x2f, 0xe8, 0x19, 0x64, 0x78, 0x5f, 0x09, 0xb5, 0xcd, + 0x93, 0x09, 0x29, 0x12, 0x1e, 0x2a, 0xb6, 0x84, 0x21, 0xc7, 0xeb, 0x9b, 0x2f, 0x95, 0x11, 0xf2, + 0x4e, 0xdb, 0xb1, 0x4a, 0xe1, 0x42, 0xdc, 0x3b, 0xc4, 0x13, 0x1e, 0x2a, 0xdb, 0xd7, 0xeb, 0x85, + 0xed, 0xf7, 0x7c, 0xdf, 0x57, 0x96, 0x6c, 0x25, 0x6e, 0x85, 0x71, 0xa8, 0x29, 0xf7, 0x85, 0x9d, + 0x96, 0x8b, 0x85, 0x46, 0x93, 0xa7, 0xae, 0x1d, 0x2a, 0xf6, 0xcd, 0x93, 0x71, 0xfc, 0xbd, 0x46, + 0x6d, 0x5a, 0x76, 0x7f, 0x01, 0xc7, 0xd2, 0x6f, 0xe2, 0x78, 0x86, 0xb3, 0x27, 0xe5, 0xa1, 0xf2, + 0xb2, 0xb6, 0x2c, 0x8f, 0xb3, 0xec, 0x0d, 0x8c, 0x3c, 0xae, 0xae, 0xe4, 0x9d, 0x46, 0x7a, 0x09, + 0xc7, 0xca, 0xd9, 0xa3, 0x73, 0x32, 0x49, 0x8a, 0xe1, 0xec, 0xec, 0x5f, 0x18, 0x7b, 0xcd, 0xe3, + 0x18, 0x7b, 0x0d, 0xa3, 0xef, 0x4a, 0x18, 0xac, 0xf9, 0x10, 0xec, 0x22, 0x75, 0xbb, 0xec, 0xca, + 0xc6, 0xac, 0xdc, 0x72, 0x09, 0xb7, 0x47, 0xb6, 0x09, 0x5f, 0x46, 0x51, 0x25, 0x64, 0x1e, 0xd4, + 0x7d, 0xd9, 0x4d, 0x1d, 0xa6, 0xe8, 0xcb, 0xa6, 0xe4, 0xf3, 0xe6, 0x07, 0xf5, 0xc5, 0xf6, 0x9a, + 0x1f, 0xc2, 0x83, 0xc0, 0xeb, 0x45, 0xdb, 0xc6, 0x15, 0xae, 0x70, 0x37, 0xca, 0x7e, 0xc4, 0x46, + 0xb7, 0xdf, 0xaf, 0x9a, 0xe4, 0x17, 0x4d, 0xf2, 0x03, 0xc8, 0x3d, 0xfb, 0x18, 0x4e, 0x23, 0x76, + 0xa0, 0x5f, 0xc2, 0xf0, 0xb3, 0xd0, 0xa6, 0x3d, 0x48, 0x83, 0x8e, 0x20, 0x0d, 0xfe, 0x33, 0x48, + 0x57, 0x9e, 0x2c, 0x0a, 0xab, 0xc5, 0x86, 0xb4, 0xc7, 0xa6, 0xb6, 0xda, 0x5e, 0x44, 0x01, 0x23, + 0x8f, 0x12, 0x62, 0x43, 0x21, 0x5d, 0xe2, 0xd6, 0x5a, 0x91, 0x14, 0x03, 0xee, 0xce, 0x9f, 0xd2, + 0x13, 0x32, 0xee, 0xcd, 0xfe, 0xf4, 0xa0, 0xff, 0xd5, 0x02, 0xd1, 0xb7, 0x90, 0xda, 0xa8, 0xd1, + 0xd6, 0x60, 0x86, 0x7d, 0x1e, 0x9f, 0xb7, 0x5f, 0x06, 0xa7, 0x8e, 0xe8, 0x7b, 0xe8, 0xbb, 0xb7, + 0xa3, 0xed, 0x6f, 0x1d, 0x61, 0x2e, 0x3a, 0x6e, 0x77, 0x38, 0x1f, 0x21, 0xf3, 0xaf, 0x40, 0x3b, + 0xde, 0x2d, 0x22, 0x3d, 0xed, 0xba, 0xde, 0x41, 0xbd, 0x83, 0xd4, 0x7a, 0x41, 0x5b, 0x9d, 0xeb, + 0xd4, 0x55, 0xb7, 0x8f, 0x1d, 0x5d, 0x92, 0x9f, 0x99, 0xfb, 0x5f, 0x3d, 0xff, 0x1b, 0x00, 0x00, + 0xff, 0xff, 0xdd, 0xdb, 0x9c, 0x15, 0xd2, 0x04, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// 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.SupportPackageIsVersion4 + +// StoreClient is the client API for Store service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type StoreClient interface { + Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) + Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (Store_ListClient, error) +} + +type storeClient struct { + cc *grpc.ClientConn +} + +func NewStoreClient(cc *grpc.ClientConn) StoreClient { + return &storeClient{cc} +} + +func (c *storeClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) { + out := new(ReadResponse) + err := c.cc.Invoke(ctx, "/go.micro.store.Store/Read", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error) { + out := new(WriteResponse) + err := c.cc.Invoke(ctx, "/go.micro.store.Store/Write", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/go.micro.store.Store/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (Store_ListClient, error) { + stream, err := c.cc.NewStream(ctx, &_Store_serviceDesc.Streams[0], "/go.micro.store.Store/List", opts...) + if err != nil { + return nil, err + } + x := &storeListClient{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 Store_ListClient interface { + Recv() (*ListResponse, error) + grpc.ClientStream +} + +type storeListClient struct { + grpc.ClientStream +} + +func (x *storeListClient) Recv() (*ListResponse, error) { + m := new(ListResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + +// StoreServer is the server API for Store service. +type StoreServer interface { + Read(context.Context, *ReadRequest) (*ReadResponse, error) + Write(context.Context, *WriteRequest) (*WriteResponse, error) + Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) + List(*ListRequest, Store_ListServer) error +} + +// UnimplementedStoreServer can be embedded to have forward compatible implementations. +type UnimplementedStoreServer struct { +} + +func (*UnimplementedStoreServer) Read(ctx context.Context, req *ReadRequest) (*ReadResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Read not implemented") +} +func (*UnimplementedStoreServer) Write(ctx context.Context, req *WriteRequest) (*WriteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Write not implemented") +} +func (*UnimplementedStoreServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} +func (*UnimplementedStoreServer) List(req *ListRequest, srv Store_ListServer) error { + return status.Errorf(codes.Unimplemented, "method List not implemented") +} + +func RegisterStoreServer(s *grpc.Server, srv StoreServer) { + s.RegisterService(&_Store_serviceDesc, srv) +} + +func _Store_Read_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReadRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).Read(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.store.Store/Read", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).Read(ctx, req.(*ReadRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_Write_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WriteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).Write(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.store.Store/Write", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).Write(ctx, req.(*WriteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/go.micro.store.Store/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).Delete(ctx, req.(*DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_List_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(ListRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(StoreServer).List(m, &storeListServer{stream}) +} + +type Store_ListServer interface { + Send(*ListResponse) error + grpc.ServerStream +} + +type storeListServer struct { + grpc.ServerStream +} + +func (x *storeListServer) Send(m *ListResponse) error { + return x.ServerStream.SendMsg(m) +} + +var _Store_serviceDesc = grpc.ServiceDesc{ + ServiceName: "go.micro.store.Store", + HandlerType: (*StoreServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Read", + Handler: _Store_Read_Handler, + }, + { + MethodName: "Write", + Handler: _Store_Write_Handler, + }, + { + MethodName: "Delete", + Handler: _Store_Delete_Handler, + }, + }, + Streams: []grpc.StreamDesc{ + { + StreamName: "List", + Handler: _Store_List_Handler, + ServerStreams: true, + }, + }, + Metadata: "store/service/proto/store.proto", } diff --git a/store/service/proto/store.pb.micro.go b/store/service/proto/store.pb.micro.go index 321449b5..4cdba07f 100644 --- a/store/service/proto/store.pb.micro.go +++ b/store/service/proto/store.pb.micro.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: store.proto +// source: store/service/proto/store.proto package go_micro_store diff --git a/transport/grpc/proto/transport.pb.go b/transport/grpc/proto/transport.pb.go index a9702987..88abb01a 100644 --- a/transport/grpc/proto/transport.pb.go +++ b/transport/grpc/proto/transport.pb.go @@ -1,13 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: go-micro/transport/grpc/proto/transport.proto +// source: transport/grpc/proto/transport.proto -package go_micro_grpc_transport +package go_micro_transport_grpc import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -34,7 +36,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_29b90b9ccd5e0da5, []int{0} + return fileDescriptor_651718cd7c7ae974, []int{0} } func (m *Message) XXX_Unmarshal(b []byte) error { @@ -70,30 +72,30 @@ func (m *Message) GetBody() []byte { } func init() { - proto.RegisterType((*Message)(nil), "go.micro.grpc.transport.Message") - proto.RegisterMapType((map[string]string)(nil), "go.micro.grpc.transport.Message.HeaderEntry") + proto.RegisterType((*Message)(nil), "go.micro.transport.grpc.Message") + proto.RegisterMapType((map[string]string)(nil), "go.micro.transport.grpc.Message.HeaderEntry") } func init() { - proto.RegisterFile("go-micro/transport/grpc/proto/transport.proto", fileDescriptor_29b90b9ccd5e0da5) + proto.RegisterFile("transport/grpc/proto/transport.proto", fileDescriptor_651718cd7c7ae974) } -var fileDescriptor_29b90b9ccd5e0da5 = []byte{ - // 214 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4d, 0xcf, 0xd7, 0xcd, - 0xcd, 0x4c, 0x2e, 0xca, 0xd7, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0x4f, - 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0x41, 0x12, 0xd4, 0x03, 0xf3, 0x85, 0xc4, 0xd3, - 0xf3, 0xf5, 0xc0, 0xca, 0xf5, 0x40, 0x8a, 0xf4, 0xe0, 0xd2, 0x4a, 0xf3, 0x18, 0xb9, 0xd8, 0x7d, - 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0x5c, 0xb8, 0xd8, 0x32, 0x52, 0x13, 0x53, 0x52, 0x8b, - 0x24, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x74, 0xf4, 0x70, 0xe8, 0xd2, 0x83, 0xea, 0xd0, 0xf3, - 0x00, 0x2b, 0x77, 0xcd, 0x2b, 0x29, 0xaa, 0x0c, 0x82, 0xea, 0x15, 0x12, 0xe2, 0x62, 0x49, 0xca, - 0x4f, 0xa9, 0x94, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x09, 0x02, 0xb3, 0xa5, 0x2c, 0xb9, 0xb8, 0x91, - 0x94, 0x0a, 0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x81, - 0x98, 0x42, 0x22, 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0xa9, 0x60, 0x5d, 0x9c, 0x41, 0x10, 0x8e, - 0x15, 0x93, 0x05, 0xa3, 0x51, 0x3c, 0x17, 0x67, 0x08, 0xcc, 0x5e, 0xa1, 0x20, 0x2e, 0xb6, 0xe0, - 0x92, 0xa2, 0xd4, 0xc4, 0x5c, 0x21, 0x05, 0x42, 0x6e, 0x93, 0x22, 0xa8, 0x42, 0x89, 0x41, 0x83, - 0xd1, 0x80, 0x31, 0x89, 0x0d, 0x1c, 0x42, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0xa1, - 0xa4, 0xcb, 0x52, 0x01, 0x00, 0x00, +var fileDescriptor_651718cd7c7ae974 = []byte{ + // 209 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x29, 0x4a, 0xcc, + 0x2b, 0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0x4f, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, + 0xd7, 0x87, 0x0b, 0xea, 0x81, 0xf9, 0x42, 0xe2, 0xe9, 0xf9, 0x7a, 0xb9, 0x99, 0xc9, 0x45, 0xf9, + 0x7a, 0x08, 0x19, 0x90, 0x72, 0xa5, 0x79, 0x8c, 0x5c, 0xec, 0xbe, 0xa9, 0xc5, 0xc5, 0x89, 0xe9, + 0xa9, 0x42, 0x2e, 0x5c, 0x6c, 0x19, 0xa9, 0x89, 0x29, 0xa9, 0x45, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, + 0xdc, 0x46, 0x3a, 0x7a, 0x38, 0x74, 0xe9, 0x41, 0x75, 0xe8, 0x79, 0x80, 0x95, 0xbb, 0xe6, 0x95, + 0x14, 0x55, 0x06, 0x41, 0xf5, 0x0a, 0x09, 0x71, 0xb1, 0x24, 0xe5, 0xa7, 0x54, 0x4a, 0x30, 0x29, + 0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x52, 0x96, 0x5c, 0xdc, 0x48, 0x4a, 0x85, 0x04, 0xb8, 0x98, + 0xb3, 0x53, 0x2b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x40, 0x4c, 0x21, 0x11, 0x2e, 0xd6, + 0xb2, 0xc4, 0x9c, 0xd2, 0x54, 0xb0, 0x2e, 0xce, 0x20, 0x08, 0xc7, 0x8a, 0xc9, 0x82, 0xd1, 0x28, + 0x9e, 0x8b, 0x33, 0x04, 0x66, 0xb9, 0x50, 0x10, 0x17, 0x5b, 0x70, 0x49, 0x51, 0x6a, 0x62, 0xae, + 0x90, 0x02, 0x21, 0xb7, 0x49, 0x11, 0x54, 0xa1, 0xc4, 0xa0, 0xc1, 0x68, 0xc0, 0x98, 0xc4, 0x06, + 0x0e, 0x21, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xd0, 0x4b, 0x4b, 0x49, 0x01, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -120,7 +122,7 @@ func NewTransportClient(cc *grpc.ClientConn) TransportClient { } func (c *transportClient) Stream(ctx context.Context, opts ...grpc.CallOption) (Transport_StreamClient, error) { - stream, err := c.cc.NewStream(ctx, &_Transport_serviceDesc.Streams[0], "/go.micro.grpc.transport.Transport/Stream", opts...) + stream, err := c.cc.NewStream(ctx, &_Transport_serviceDesc.Streams[0], "/go.micro.transport.grpc.Transport/Stream", opts...) if err != nil { return nil, err } @@ -155,6 +157,14 @@ type TransportServer interface { Stream(Transport_StreamServer) error } +// UnimplementedTransportServer can be embedded to have forward compatible implementations. +type UnimplementedTransportServer struct { +} + +func (*UnimplementedTransportServer) Stream(srv Transport_StreamServer) error { + return status.Errorf(codes.Unimplemented, "method Stream not implemented") +} + func RegisterTransportServer(s *grpc.Server, srv TransportServer) { s.RegisterService(&_Transport_serviceDesc, srv) } @@ -186,7 +196,7 @@ func (x *transportStreamServer) Recv() (*Message, error) { } var _Transport_serviceDesc = grpc.ServiceDesc{ - ServiceName: "go.micro.grpc.transport.Transport", + ServiceName: "go.micro.transport.grpc.Transport", HandlerType: (*TransportServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ @@ -197,5 +207,5 @@ var _Transport_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "go-micro/transport/grpc/proto/transport.proto", + Metadata: "transport/grpc/proto/transport.proto", } diff --git a/transport/grpc/proto/transport.micro.go b/transport/grpc/proto/transport.pb.micro.go similarity index 92% rename from transport/grpc/proto/transport.micro.go rename to transport/grpc/proto/transport.pb.micro.go index 6cb11d4e..d3866eb3 100644 --- a/transport/grpc/proto/transport.micro.go +++ b/transport/grpc/proto/transport.pb.micro.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: go-micro/transport/grpc/proto/transport.proto +// source: transport/grpc/proto/transport.proto -package go_micro_grpc_transport +package go_micro_transport_grpc import ( fmt "fmt" @@ -43,12 +43,6 @@ type transportService struct { } func NewTransportService(name string, c client.Client) TransportService { - if c == nil { - c = client.NewClient() - } - if len(name) == 0 { - name = "go.micro.grpc.transport" - } return &transportService{ c: c, name: name, @@ -65,6 +59,7 @@ func (c *transportService) Stream(ctx context.Context, opts ...client.CallOption } type Transport_StreamService interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -80,6 +75,10 @@ func (x *transportServiceStream) Close() error { return x.stream.Close() } +func (x *transportServiceStream) Context() context.Context { + return x.stream.Context() +} + func (x *transportServiceStream) SendMsg(m interface{}) error { return x.stream.Send(m) } @@ -127,6 +126,7 @@ func (h *transportHandler) Stream(ctx context.Context, stream server.Stream) err } type Transport_StreamStream interface { + Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error Close() error @@ -142,6 +142,10 @@ func (x *transportStreamStream) Close() error { return x.stream.Close() } +func (x *transportStreamStream) Context() context.Context { + return x.stream.Context() +} + func (x *transportStreamStream) SendMsg(m interface{}) error { return x.stream.Send(m) } diff --git a/transport/grpc/proto/transport.proto b/transport/grpc/proto/transport.proto index 3ceb7622..1ec353a8 100644 --- a/transport/grpc/proto/transport.proto +++ b/transport/grpc/proto/transport.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package go.micro.grpc.transport; +package go.micro.transport.grpc; service Transport { rpc Stream(stream Message) returns (stream Message) {}