diff --git a/config/source/service/proto/mucp.pb.go b/config/source/service/proto/service.pb.go similarity index 83% rename from config/source/service/proto/mucp.pb.go rename to config/source/service/proto/service.pb.go index 08024585..85ba138f 100644 --- a/config/source/service/proto/mucp.pb.go +++ b/config/source/service/proto/service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: proto/mucp.proto +// source: proto/service.proto -package mucp +package service import ( fmt "fmt" @@ -35,7 +35,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_942f149553cfb65d, []int{0} + return fileDescriptor_c33392ef2c1961ba, []int{0} } func (m *ChangeSet) XXX_Unmarshal(b []byte) error { @@ -104,7 +104,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_942f149553cfb65d, []int{1} + return fileDescriptor_c33392ef2c1961ba, []int{1} } func (m *Change) XXX_Unmarshal(b []byte) error { @@ -157,7 +157,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_942f149553cfb65d, []int{2} + return fileDescriptor_c33392ef2c1961ba, []int{2} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { @@ -195,7 +195,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_942f149553cfb65d, []int{3} + return fileDescriptor_c33392ef2c1961ba, []int{3} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { @@ -227,7 +227,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_942f149553cfb65d, []int{4} + return fileDescriptor_c33392ef2c1961ba, []int{4} } func (m *UpdateRequest) XXX_Unmarshal(b []byte) error { @@ -265,7 +265,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_942f149553cfb65d, []int{5} + return fileDescriptor_c33392ef2c1961ba, []int{5} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { @@ -297,7 +297,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_942f149553cfb65d, []int{6} + return fileDescriptor_c33392ef2c1961ba, []int{6} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { @@ -335,7 +335,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_942f149553cfb65d, []int{7} + return fileDescriptor_c33392ef2c1961ba, []int{7} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { @@ -366,7 +366,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_942f149553cfb65d, []int{8} + return fileDescriptor_c33392ef2c1961ba, []int{8} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { @@ -388,7 +388,7 @@ func (m *ListRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListRequest proto.InternalMessageInfo type ListResponse struct { - Configs []*Change `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` + Values []*Change `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -398,7 +398,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_942f149553cfb65d, []int{9} + return fileDescriptor_c33392ef2c1961ba, []int{9} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { @@ -419,9 +419,9 @@ func (m *ListResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ListResponse proto.InternalMessageInfo -func (m *ListResponse) GetConfigs() []*Change { +func (m *ListResponse) GetValues() []*Change { if m != nil { - return m.Configs + return m.Values } return nil } @@ -438,7 +438,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_942f149553cfb65d, []int{10} + return fileDescriptor_c33392ef2c1961ba, []int{10} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { @@ -484,7 +484,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_942f149553cfb65d, []int{11} + return fileDescriptor_c33392ef2c1961ba, []int{11} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { @@ -523,7 +523,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_942f149553cfb65d, []int{12} + return fileDescriptor_c33392ef2c1961ba, []int{12} } func (m *WatchRequest) XXX_Unmarshal(b []byte) error { @@ -563,7 +563,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_942f149553cfb65d, []int{13} + return fileDescriptor_c33392ef2c1961ba, []int{13} } func (m *WatchResponse) XXX_Unmarshal(b []byte) error { @@ -615,35 +615,35 @@ func init() { proto.RegisterType((*WatchResponse)(nil), "WatchResponse") } -func init() { proto.RegisterFile("proto/mucp.proto", fileDescriptor_942f149553cfb65d) } +func init() { proto.RegisterFile("proto/service.proto", fileDescriptor_c33392ef2c1961ba) } -var fileDescriptor_942f149553cfb65d = []byte{ - // 429 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdd, 0x8a, 0xd3, 0x40, - 0x14, 0xc7, 0x9b, 0xb6, 0x9b, 0x9a, 0xd3, 0x24, 0x2d, 0xe7, 0x42, 0x42, 0x10, 0x8c, 0x03, 0x42, - 0x51, 0x98, 0x5d, 0xbb, 0x8f, 0xb0, 0xde, 0xe9, 0xd5, 0x2c, 0xa2, 0xb7, 0xe3, 0xf4, 0xec, 0xb6, - 0xac, 0x69, 0x62, 0x66, 0x2a, 0xf8, 0x08, 0xfa, 0xd4, 0x92, 0x99, 0xc9, 0x36, 0xa9, 0xf8, 0xd1, - 0xbb, 0xf3, 0xf9, 0x9f, 0x7f, 0xce, 0x8f, 0xc0, 0xb2, 0x6e, 0x2a, 0x53, 0x5d, 0x96, 0x07, 0x55, - 0x73, 0x1b, 0xb2, 0x1f, 0x01, 0x44, 0x37, 0x5b, 0xb9, 0xbf, 0xa7, 0x5b, 0x32, 0x88, 0x30, 0xdd, - 0x48, 0x23, 0xb3, 0xa0, 0x08, 0x56, 0xb1, 0xb0, 0x31, 0xe6, 0xf0, 0x44, 0x6d, 0x49, 0x3d, 0xe8, - 0x43, 0x99, 0x8d, 0x8b, 0x60, 0x15, 0x89, 0xc7, 0x1c, 0x9f, 0x42, 0x78, 0x57, 0x35, 0xa5, 0x34, - 0xd9, 0xc4, 0x76, 0x7c, 0xd6, 0xd6, 0x75, 0x75, 0x68, 0x14, 0x65, 0x53, 0x57, 0x77, 0x19, 0x3e, - 0x83, 0xc8, 0xec, 0x4a, 0xd2, 0x46, 0x96, 0x75, 0x76, 0x51, 0x04, 0xab, 0x89, 0x38, 0x16, 0xd8, - 0x27, 0x08, 0x9d, 0x15, 0x5c, 0xc2, 0xe4, 0x81, 0xbe, 0x5b, 0x1b, 0x91, 0x68, 0xc3, 0xd6, 0x59, - 0x2d, 0xcd, 0xd6, 0x3b, 0xb0, 0x31, 0xae, 0x20, 0x52, 0x9d, 0x75, 0x6b, 0x60, 0xbe, 0x06, 0xfe, - 0xf8, 0x31, 0xe2, 0xd8, 0x64, 0x57, 0x90, 0xdc, 0x34, 0x24, 0x0d, 0x09, 0xfa, 0x7a, 0x20, 0x6d, - 0xf0, 0x39, 0x84, 0xae, 0x6b, 0xdf, 0x98, 0xaf, 0x67, 0x7e, 0x4f, 0xf8, 0x32, 0x5b, 0x42, 0xda, - 0x6d, 0xe8, 0xba, 0xda, 0x6b, 0x6a, 0x35, 0x3e, 0xd4, 0x9b, 0x33, 0x35, 0xba, 0x8d, 0xa3, 0xc6, - 0x5b, 0xfa, 0x42, 0xe7, 0x69, 0x74, 0x1b, 0x5e, 0x23, 0x81, 0xf9, 0xfb, 0x9d, 0x36, 0x5e, 0x81, - 0xbd, 0x81, 0xd8, 0xa5, 0xae, 0x8d, 0x2f, 0x60, 0xa6, 0xaa, 0xfd, 0xdd, 0xee, 0x5e, 0x67, 0x41, - 0x31, 0xe9, 0x4b, 0x76, 0x75, 0x76, 0x0d, 0x73, 0x41, 0x72, 0xd3, 0x79, 0xf8, 0xaf, 0x63, 0xb3, - 0x4b, 0x88, 0xdd, 0x92, 0x7f, 0xe7, 0x9f, 0xce, 0x0b, 0x88, 0x3f, 0x4a, 0xa3, 0xb6, 0x7f, 0x7c, - 0x86, 0xbd, 0x83, 0xc4, 0x4f, 0x78, 0xcd, 0xdf, 0x9d, 0x0c, 0x10, 0x8f, 0xff, 0x82, 0x78, 0xfd, - 0x73, 0x0c, 0xb3, 0x5b, 0x6a, 0xbe, 0xed, 0x14, 0xe1, 0x6b, 0x08, 0x1d, 0x3c, 0x4c, 0xf9, 0x80, - 0x7b, 0xbe, 0xe0, 0x27, 0x54, 0x47, 0xed, 0xb0, 0xa3, 0x84, 0x29, 0x1f, 0x00, 0xce, 0x17, 0xfc, - 0x04, 0x9f, 0x1d, 0x76, 0x38, 0x30, 0xe5, 0x03, 0x92, 0xf9, 0x82, 0x9f, 0x70, 0x1a, 0xe1, 0x4b, - 0x98, 0xb6, 0x68, 0x30, 0xe6, 0x3d, 0x60, 0x79, 0xc2, 0xfb, 0xbc, 0xdc, 0x58, 0x7b, 0x59, 0x8c, - 0x79, 0x8f, 0x4a, 0x9e, 0xf0, 0xfe, 0xb9, 0xd9, 0x08, 0x5f, 0xc1, 0x85, 0xbd, 0x16, 0x26, 0xbc, - 0x7f, 0xd7, 0x3c, 0xe5, 0x83, 0x23, 0xb2, 0xd1, 0x55, 0xf0, 0x39, 0xb4, 0x3f, 0xf7, 0xf5, 0xaf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x75, 0xb2, 0x55, 0xf0, 0x03, 0x00, 0x00, +var fileDescriptor_c33392ef2c1961ba = []byte{ + // 425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdb, 0x6a, 0xdb, 0x40, + 0x10, 0x86, 0x2d, 0xdb, 0x51, 0xaa, 0xb1, 0x24, 0x87, 0x29, 0x14, 0x21, 0x0a, 0x15, 0x0b, 0x05, + 0xd3, 0xc2, 0x26, 0x38, 0x8f, 0x90, 0xde, 0xb5, 0x57, 0x1b, 0x4a, 0x7b, 0xbb, 0x95, 0xa7, 0xb5, + 0x49, 0x14, 0xa9, 0xda, 0x55, 0xa0, 0x8f, 0xd0, 0x3e, 0x75, 0xd9, 0x83, 0x22, 0xc9, 0xa5, 0x21, + 0xb9, 0xdb, 0x39, 0xfd, 0xf3, 0x7b, 0x3e, 0x0b, 0x5e, 0x36, 0x6d, 0xad, 0xeb, 0x73, 0x45, 0xed, + 0xfd, 0xa1, 0x24, 0x6e, 0x23, 0xf6, 0x3b, 0x80, 0xe8, 0x6a, 0x2f, 0xef, 0x7e, 0xd0, 0x35, 0x69, + 0x44, 0x58, 0xee, 0xa4, 0x96, 0x59, 0x50, 0x04, 0x9b, 0x58, 0xd8, 0x37, 0xe6, 0xf0, 0xa2, 0xdc, + 0x53, 0x79, 0xa3, 0xba, 0x2a, 0x9b, 0x17, 0xc1, 0x26, 0x12, 0x0f, 0x31, 0xbe, 0x82, 0xf0, 0x7b, + 0xdd, 0x56, 0x52, 0x67, 0x0b, 0x5b, 0xf1, 0x91, 0xc9, 0xab, 0xba, 0x6b, 0x4b, 0xca, 0x96, 0x2e, + 0xef, 0x22, 0x7c, 0x0d, 0x91, 0x3e, 0x54, 0xa4, 0xb4, 0xac, 0x9a, 0xec, 0xa4, 0x08, 0x36, 0x0b, + 0x31, 0x24, 0xd8, 0x57, 0x08, 0x9d, 0x15, 0x3c, 0x83, 0xc5, 0x0d, 0xfd, 0xb2, 0x36, 0x22, 0x61, + 0x9e, 0xc6, 0x59, 0x23, 0xf5, 0xde, 0x3b, 0xb0, 0x6f, 0xdc, 0x40, 0x54, 0xf6, 0xd6, 0xad, 0x81, + 0xd5, 0x16, 0xf8, 0xc3, 0x8f, 0x11, 0x43, 0x91, 0x5d, 0x40, 0x72, 0xd5, 0x92, 0xd4, 0x24, 0xe8, + 0x67, 0x47, 0x4a, 0xe3, 0x1b, 0x08, 0x5d, 0xd5, 0xee, 0x58, 0x6d, 0x4f, 0xfd, 0x9c, 0xf0, 0x69, + 0x76, 0x06, 0x69, 0x3f, 0xa1, 0x9a, 0xfa, 0x4e, 0x91, 0xd1, 0xf8, 0xdc, 0xec, 0x9e, 0xa9, 0xd1, + 0x4f, 0x0c, 0x1a, 0x1f, 0xe8, 0x96, 0x9e, 0xa7, 0xd1, 0x4f, 0x78, 0x8d, 0x04, 0x56, 0x9f, 0x0e, + 0x4a, 0x7b, 0x05, 0x76, 0x0e, 0xb1, 0x0b, 0x5d, 0xd9, 0x28, 0xde, 0xcb, 0xdb, 0x8e, 0x54, 0x16, + 0x14, 0x8b, 0x89, 0xa2, 0x4b, 0xb3, 0x4b, 0x58, 0x09, 0x92, 0xbb, 0xde, 0xc1, 0x93, 0x4e, 0x6d, + 0xb6, 0xb8, 0xa1, 0x61, 0xcb, 0xe3, 0xbe, 0x0b, 0x88, 0xbf, 0x48, 0x5d, 0xee, 0xff, 0xbb, 0x86, + 0x7d, 0x84, 0xc4, 0x77, 0x78, 0xcd, 0x7f, 0x9d, 0x4c, 0x00, 0xcf, 0x1f, 0x01, 0xbc, 0xfd, 0x33, + 0x87, 0xd3, 0x6b, 0xf7, 0xc7, 0xc6, 0xf7, 0x10, 0x3a, 0x74, 0x98, 0xf2, 0x09, 0xf5, 0x7c, 0xcd, + 0x8f, 0x98, 0xce, 0x4c, 0xb3, 0x63, 0x84, 0x29, 0x9f, 0xe0, 0xcd, 0xd7, 0xfc, 0x08, 0x9e, 0x6d, + 0x76, 0x30, 0x30, 0xe5, 0x13, 0x8e, 0xf9, 0x9a, 0x1f, 0x51, 0x9a, 0xe1, 0x5b, 0x58, 0x1a, 0x30, + 0x18, 0xf3, 0x11, 0xae, 0x3c, 0xe1, 0x63, 0x5a, 0xae, 0xcd, 0x5c, 0x16, 0x63, 0x3e, 0xa2, 0x92, + 0x27, 0x7c, 0x7c, 0x6e, 0x36, 0xc3, 0x77, 0x70, 0x62, 0xaf, 0x85, 0x09, 0x1f, 0xdf, 0x35, 0x4f, + 0xf9, 0xe4, 0x88, 0x6c, 0x76, 0x11, 0x7c, 0x0b, 0xed, 0xa7, 0x7d, 0xf9, 0x37, 0x00, 0x00, 0xff, + 0xff, 0x85, 0xa3, 0x8e, 0x20, 0xf1, 0x03, 0x00, 0x00, } diff --git a/config/source/service/proto/mucp.pb.micro.go b/config/source/service/proto/service.pb.micro.go similarity index 99% rename from config/source/service/proto/mucp.pb.micro.go rename to config/source/service/proto/service.pb.micro.go index 430b7842..e3847a25 100644 --- a/config/source/service/proto/mucp.pb.micro.go +++ b/config/source/service/proto/service.pb.micro.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: proto/mucp.proto +// source: proto/service.proto -package mucp +package service import ( fmt "fmt" diff --git a/config/source/service/proto/mucp.proto b/config/source/service/proto/service.proto similarity index 57% rename from config/source/service/proto/mucp.proto rename to config/source/service/proto/service.proto index 2e88c7e5..bce92dbe 100644 --- a/config/source/service/proto/mucp.proto +++ b/config/source/service/proto/service.proto @@ -1,18 +1,12 @@ syntax = "proto3"; service Service { - rpc Create (CreateRequest) returns (CreateResponse) { - } - rpc Update (UpdateRequest) returns (UpdateResponse) { - } - rpc Delete (DeleteRequest) returns (DeleteResponse) { - } - rpc List (ListRequest) returns (ListResponse) { - } - rpc Read (ReadRequest) returns (ReadResponse) { - } - rpc Watch (WatchRequest) returns (stream WatchResponse) { - } + rpc Create (CreateRequest) returns (CreateResponse) {} + rpc Update (UpdateRequest) returns (UpdateResponse) {} + rpc Delete (DeleteRequest) returns (DeleteResponse) {} + rpc List (ListRequest) returns (ListResponse) {} + rpc Read (ReadRequest) returns (ReadResponse) {} + rpc Watch (WatchRequest) returns (stream WatchResponse) {} } message ChangeSet { @@ -33,28 +27,24 @@ message CreateRequest { Change change = 1; } -message CreateResponse { -} +message CreateResponse {} message UpdateRequest { Change change = 1; } -message UpdateResponse { -} +message UpdateResponse {} message DeleteRequest { Change change = 1; } -message DeleteResponse { -} +message DeleteResponse {} -message ListRequest { -} +message ListRequest {} message ListResponse { - repeated Change configs = 1; + repeated Change values = 1; } message ReadRequest { diff --git a/config/source/service/mucp.go b/config/source/service/service.go similarity index 91% rename from config/source/service/mucp.go rename to config/source/service/service.go index 3f5ee0fe..9d053126 100644 --- a/config/source/service/mucp.go +++ b/config/source/service/service.go @@ -10,8 +10,8 @@ import ( ) var ( - DefaultServiceName = "go.micro.config" - DefaultClient = client.DefaultClient + DefaultName = "go.micro.config" + DefaultClient = client.DefaultClient ) type service struct { @@ -45,7 +45,7 @@ func (m *service) Write(cs *source.ChangeSet) error { } func (m *service) String() string { - return "mucp" + return "service" } func NewSource(opts ...source.Option) source.Source { @@ -54,7 +54,7 @@ func NewSource(opts ...source.Option) source.Source { o(&options) } - addr := DefaultServiceName + addr := DefaultName if options.Context != nil { a, ok := options.Context.Value(serviceNameKey{}).(string)