watch supports path

config/source/service/options.go

@@ -7,12 +7,32 @@ import (
 )
 
 type serviceNameKey struct{}
+type keyKey struct{}
+type pathKey struct{}
 
-func ServiceName(a string) source.Option {
+func ServiceName(name string) source.Option {
 	return func(o *source.Options) {
 		if o.Context == nil {
 			o.Context = context.Background()
 		}
-		o.Context = context.WithValue(o.Context, serviceNameKey{}, a)
+		o.Context = context.WithValue(o.Context, serviceNameKey{}, name)
+	}
+}
+
+func Key(key string) source.Option {
+	return func(o *source.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, keyKey{}, key)
+	}
+}
+
+func Path(path string) source.Option {
+	return func(o *source.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, pathKey{}, path)
 	}
 }

config/source/service/proto/service.pb.go

@@ -514,6 +514,7 @@ func (m *ReadResponse) GetChange() *Change {
 
 type WatchRequest struct {
 	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Path                 string   `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -551,6 +552,13 @@ func (m *WatchRequest) GetKey() string {
 	return ""
 }
 
+func (m *WatchRequest) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
 type WatchResponse struct {
 	Key                  string     `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	ChangeSet            *ChangeSet `protobuf:"bytes,2,opt,name=changeSet,proto3" json:"changeSet,omitempty"`
@@ -618,32 +626,32 @@ func init() {
 func init() { proto.RegisterFile("proto/service.proto", fileDescriptor_c33392ef2c1961ba) }
 
 var fileDescriptor_c33392ef2c1961ba = []byte{
-	// 425 bytes of a gzipped FileDescriptorProto
+	// 427 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdb, 0x6a, 0xdb, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x6a, 0xdb, 0x40,
-	0x10, 0x86, 0x2d, 0xdb, 0x51, 0xaa, 0xb1, 0x24, 0x87, 0x29, 0x14, 0x21, 0x0a, 0x15, 0x0b, 0x05,
+	0x10, 0xc6, 0x2d, 0xdb, 0x51, 0xaa, 0xb1, 0x24, 0x87, 0x29, 0x14, 0x21, 0x0a, 0x35, 0x0b, 0x05,
-	0xd3, 0xc2, 0x26, 0x38, 0x8f, 0x90, 0xde, 0xb5, 0x57, 0x1b, 0x4a, 0x7b, 0xbb, 0x95, 0xa7, 0xb5,
+	0xd3, 0xc2, 0x26, 0x38, 0x7d, 0x83, 0xf4, 0xd6, 0x9e, 0x36, 0x94, 0xf6, 0xba, 0x95, 0xa7, 0xb5,
-	0x49, 0x14, 0xa9, 0xda, 0x55, 0xa0, 0x8f, 0xd0, 0x3e, 0x75, 0xd9, 0x83, 0x22, 0xc9, 0xa5, 0x21,
+	0x49, 0x14, 0xa9, 0xda, 0x55, 0xa0, 0x8f, 0xd0, 0x3e, 0x75, 0xd9, 0x3f, 0x8a, 0x24, 0x17, 0x4c,
-	0xb9, 0xdb, 0x39, 0xfd, 0xf3, 0x7b, 0x3e, 0x0b, 0x5e, 0x36, 0x6d, 0xad, 0xeb, 0x73, 0x45, 0xed,
+	0x7c, 0xdb, 0x99, 0xd9, 0xf9, 0xe6, 0xd3, 0xfc, 0x56, 0xf0, 0xb2, 0x6e, 0x2a, 0x5d, 0x5d, 0x2a,
-	0xfd, 0xa1, 0x24, 0x6e, 0x23, 0xf6, 0x3b, 0x80, 0xe8, 0x6a, 0x2f, 0xef, 0x7e, 0xd0, 0x35, 0x69,
+	0x6a, 0x1e, 0xf7, 0x05, 0x71, 0x1b, 0xb1, 0x3f, 0x01, 0x44, 0x37, 0x3b, 0xf9, 0xf0, 0x93, 0x6e,
-	0x44, 0x58, 0xee, 0xa4, 0x96, 0x59, 0x50, 0x04, 0x9b, 0x58, 0xd8, 0x37, 0xe6, 0xf0, 0xa2, 0xdc,
+	0x49, 0x23, 0xc2, 0x7c, 0x2b, 0xb5, 0xcc, 0x82, 0x55, 0xb0, 0x8e, 0x85, 0x3d, 0x63, 0x0e, 0x2f,
-	0x53, 0x79, 0xa3, 0xba, 0x2a, 0x9b, 0x17, 0xc1, 0x26, 0x12, 0x0f, 0x31, 0xbe, 0x82, 0xf0, 0x7b,
+	0x8a, 0x1d, 0x15, 0x77, 0xaa, 0x2d, 0xb3, 0xe9, 0x2a, 0x58, 0x47, 0xe2, 0x29, 0xc6, 0x57, 0x10,
-	0xdd, 0x56, 0x52, 0x67, 0x0b, 0x5b, 0xf1, 0x91, 0xc9, 0xab, 0xba, 0x6b, 0x4b, 0xca, 0x96, 0x2e,
+	0xfe, 0xa8, 0x9a, 0x52, 0xea, 0x6c, 0x66, 0x2b, 0x3e, 0x32, 0x79, 0x55, 0xb5, 0x4d, 0x41, 0xd9,
-	0xef, 0x22, 0x7c, 0x0d, 0x91, 0x3e, 0x54, 0xa4, 0xb4, 0xac, 0x9a, 0xec, 0xa4, 0x08, 0x36, 0x0b,
+	0xdc, 0xe5, 0x5d, 0x84, 0xaf, 0x21, 0xd2, 0xfb, 0x92, 0x94, 0x96, 0x65, 0x9d, 0x9d, 0xad, 0x82,
-	0x31, 0x24, 0xd8, 0x57, 0x08, 0x9d, 0x15, 0x3c, 0x83, 0xc5, 0x0d, 0xfd, 0xb2, 0x36, 0x22, 0x61,
+	0xf5, 0x4c, 0xf4, 0x09, 0xf6, 0x0d, 0x42, 0x67, 0x05, 0x2f, 0x60, 0x76, 0x47, 0xbf, 0xad, 0x8d,
-	0x9e, 0xc6, 0x59, 0x23, 0xf5, 0xde, 0x3b, 0xb0, 0x6f, 0xdc, 0x40, 0x54, 0xf6, 0xd6, 0xad, 0x81,
+	0x48, 0x98, 0xa3, 0x71, 0x56, 0x4b, 0xbd, 0xf3, 0x0e, 0xec, 0x19, 0xd7, 0x10, 0x15, 0x9d, 0x75,
-	0xd5, 0x16, 0xf8, 0xc3, 0x8f, 0x11, 0x43, 0x91, 0x5d, 0x40, 0x72, 0xd5, 0x92, 0xd4, 0x24, 0xe8,
+	0x6b, 0x60, 0xb1, 0x01, 0xfe, 0xf4, 0x31, 0xa2, 0x2f, 0xb2, 0x2b, 0x48, 0x6e, 0x1a, 0x92, 0x9a,
-	0x67, 0x47, 0x4a, 0xe3, 0x1b, 0x08, 0x5d, 0xd5, 0xee, 0x58, 0x6d, 0x4f, 0xfd, 0x9c, 0xf0, 0x69,
+	0x04, 0xfd, 0x6a, 0x49, 0x69, 0x7c, 0x03, 0xa1, 0xab, 0xda, 0x19, 0x8b, 0xcd, 0xb9, 0xef, 0x13,
-	0x76, 0x06, 0x69, 0x3f, 0xa1, 0x9a, 0xfa, 0x4e, 0x91, 0xd1, 0xf8, 0xdc, 0xec, 0x9e, 0xa9, 0xd1,
+	0x3e, 0xcd, 0x2e, 0x20, 0xed, 0x3a, 0x54, 0x5d, 0x3d, 0x28, 0x32, 0x1a, 0x5f, 0xea, 0xed, 0x89,
-	0x4f, 0x0c, 0x1a, 0x1f, 0xe8, 0x96, 0x9e, 0xa7, 0xd1, 0x4f, 0x78, 0x8d, 0x04, 0x56, 0x9f, 0x0e,
+	0x1a, 0x5d, 0x47, 0xaf, 0xf1, 0x91, 0xee, 0xe9, 0x34, 0x8d, 0xae, 0xc3, 0x6b, 0x24, 0xb0, 0xf8,
-	0x4a, 0x7b, 0x05, 0x76, 0x0e, 0xb1, 0x0b, 0x5d, 0xd9, 0x28, 0xde, 0xcb, 0xdb, 0x8e, 0x54, 0x16,
+	0xbc, 0x57, 0xda, 0x2b, 0xb0, 0x4b, 0x88, 0x5d, 0xe8, 0xca, 0x46, 0xf1, 0x51, 0xde, 0xb7, 0xa4,
-	0x14, 0x8b, 0x89, 0xa2, 0x4b, 0xb3, 0x4b, 0x58, 0x09, 0x92, 0xbb, 0xde, 0xc1, 0x93, 0x4e, 0x6d,
+	0xb2, 0x60, 0x35, 0x1b, 0x29, 0xba, 0x34, 0xbb, 0x86, 0x85, 0x20, 0xb9, 0xed, 0x1c, 0x3c, 0x6b,
-	0xb6, 0xb8, 0xa1, 0x61, 0xcb, 0xe3, 0xbe, 0x0b, 0x88, 0xbf, 0x48, 0x5d, 0xee, 0xff, 0xbb, 0x86,
+	0xd5, 0x66, 0x8a, 0x6b, 0xea, 0xa7, 0x1c, 0xf7, 0xfd, 0x01, 0xe2, 0xaf, 0x52, 0x17, 0xbb, 0xd3,
-	0x7d, 0x84, 0xc4, 0x77, 0x78, 0xcd, 0x7f, 0x9d, 0x4c, 0x00, 0xcf, 0x1f, 0x01, 0xbc, 0xfd, 0x33,
+	0xc6, 0x7c, 0x82, 0xc4, 0x77, 0xf9, 0x39, 0xff, 0xb7, 0x8d, 0xa0, 0x4f, 0x8f, 0x40, 0xdf, 0xfc,
-	0x87, 0xd3, 0x6b, 0xf7, 0xc7, 0xc6, 0xf7, 0x10, 0x3a, 0x74, 0x98, 0xf2, 0x09, 0xf5, 0x7c, 0xcd,
+	0x9d, 0xc2, 0xf9, 0xad, 0x7b, 0xec, 0xf8, 0x1e, 0x42, 0x87, 0x13, 0x53, 0x3e, 0x7a, 0x09, 0xf9,
-	0x8f, 0x98, 0xce, 0x4c, 0xb3, 0x63, 0x84, 0x29, 0x9f, 0xe0, 0xcd, 0xd7, 0xfc, 0x08, 0x9e, 0x6d,
+	0x92, 0x1f, 0x70, 0x9e, 0x98, 0xcb, 0x8e, 0x1b, 0xa6, 0x7c, 0x84, 0x3c, 0x5f, 0xf2, 0x03, 0xa0,
-	0x76, 0x30, 0x30, 0xe5, 0x13, 0x8e, 0xf9, 0x9a, 0x1f, 0x51, 0x9a, 0xe1, 0x5b, 0x58, 0x1a, 0x30,
+	0xf6, 0xb2, 0x03, 0x84, 0x29, 0x1f, 0xb1, 0xcd, 0x97, 0xfc, 0x80, 0xdc, 0x04, 0xdf, 0xc2, 0xdc,
-	0x18, 0xf3, 0x11, 0xae, 0x3c, 0xe1, 0x63, 0x5a, 0xae, 0xcd, 0x5c, 0x16, 0x63, 0x3e, 0xa2, 0x92,
+	0xc0, 0xc2, 0x98, 0x0f, 0x10, 0xe6, 0x09, 0x1f, 0x12, 0x74, 0xd7, 0xcc, 0xb6, 0x31, 0xe6, 0x03,
-	0x27, 0x7c, 0x7c, 0x6e, 0x36, 0xc3, 0x77, 0x70, 0x62, 0xaf, 0x85, 0x09, 0x1f, 0xdf, 0x35, 0x4f,
+	0x52, 0x79, 0xc2, 0x87, 0x08, 0xd8, 0x04, 0xdf, 0xc1, 0x99, 0xdd, 0x16, 0x26, 0x7c, 0xb8, 0xeb,
-	0xf9, 0xe4, 0x88, 0x6c, 0x76, 0x11, 0x7c, 0x0b, 0xed, 0xa7, 0x7d, 0xf9, 0x37, 0x00, 0x00, 0xff,
+	0x3c, 0xe5, 0xa3, 0x25, 0xb2, 0xc9, 0x55, 0xf0, 0x3d, 0xb4, 0xbf, 0xfb, 0xf5, 0xbf, 0x00, 0x00,
-	0xff, 0x85, 0xa3, 0x8e, 0x20, 0xf1, 0x03, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xc3, 0x45, 0xac, 0x57, 0x05, 0x04, 0x00, 0x00,
 }

config/source/service/proto/service.proto

@@ -58,6 +58,7 @@ message ReadResponse {
 
 message WatchRequest {
     string key = 1;
+    string path = 2;
 }
 
 message WatchResponse {

config/source/service/service.go

@@ -11,18 +11,21 @@ import (
 
 var (
 	DefaultName   = "go.micro.config"
+	DefaultKey    = "NAMESPACE:CONFIG"
+	DefaultPath   = ""
 	DefaultClient = client.DefaultClient
 )
 
 type service struct {
 	serviceName string
 	key         string
+	path        string
 	opts        source.Options
 	client      proto.Service
 }
 
 func (m *service) Read() (set *source.ChangeSet, err error) {
-	req, err := m.client.Read(context.Background(), &proto.ReadRequest{Path: m.key})
+	req, err := m.client.Read(context.Background(), &proto.ReadRequest{Key: m.key, Path: m.path})
 	if err != nil {
 		return nil, err
 	}
@@ -31,7 +34,7 @@ func (m *service) Read() (set *source.ChangeSet, err error) {
 }
 
 func (m *service) Watch() (w source.Watcher, err error) {
-	stream, err := m.client.Watch(context.Background(), &proto.WatchRequest{Key: m.key})
+	stream, err := m.client.Watch(context.Background(), &proto.WatchRequest{Key: m.key, Path: m.path})
 	if err != nil {
 		log.Error("watch err: ", err)
 		return
@@ -55,17 +58,31 @@ func NewSource(opts ...source.Option) source.Source {
 	}
 
 	addr := DefaultName
+	key := DefaultKey
+	path := DefaultPath
 
 	if options.Context != nil {
 		a, ok := options.Context.Value(serviceNameKey{}).(string)
 		if ok {
 			addr = a
 		}
+
+		k, ok := options.Context.Value(keyKey{}).(string)
+		if ok {
+			key = k
+		}
+
+		p, ok := options.Context.Value(pathKey{}).(string)
+		if ok {
+			path = p
+		}
 	}
 
 	s := &service{
 		serviceName: addr,
 		opts:        options,
+		key:         key,
+		path:        path,
 		client:      proto.NewService(addr, DefaultClient),
 	}