diff --git a/config/cmd/cmd.go b/config/cmd/cmd.go index a61dafc8..4dc16edf 100644 --- a/config/cmd/cmd.go +++ b/config/cmd/cmd.go @@ -831,7 +831,11 @@ func (c *cmd) Before(ctx *cli.Context) error { // Setup config sources if ctx.String("config") == "service" { - opt := config.WithSource(configSrv.NewSource(configSrc.WithClient(microClient))) + opt := config.WithSource(configSrv.NewSource( + configSrc.WithClient(microClient), + configSrv.Namespace(ctx.String("service_namespace")), + )) + if err := (*c.opts.Config).Init(opt); err != nil { logger.Fatalf("Error configuring config: %v", err) } diff --git a/config/source/service/proto/service.pb.go b/config/source/service/proto/service.pb.go index 45e62cdf..6cce6174 100644 --- a/config/source/service/proto/service.pb.go +++ b/config/source/service/proto/service.pb.go @@ -361,6 +361,7 @@ func (m *DeleteResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteResponse proto.InternalMessageInfo type ListRequest struct { + Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -391,6 +392,13 @@ func (m *ListRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListRequest proto.InternalMessageInfo +func (m *ListRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + type ListResponse struct { Values []*Change `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -632,35 +640,35 @@ func init() { } 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, + // 440 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6b, 0xdb, 0x40, + 0x10, 0xb5, 0x6c, 0x47, 0xad, 0xc7, 0x96, 0x5c, 0xe6, 0x50, 0x84, 0x28, 0xd4, 0x2c, 0x14, 0xdc, + 0x06, 0xd6, 0xc1, 0xfd, 0x01, 0x2d, 0xb8, 0xc7, 0x9e, 0x54, 0x4a, 0xce, 0xdb, 0xf5, 0x24, 0x36, + 0x8d, 0x2c, 0x55, 0xbb, 0xca, 0x7f, 0xc8, 0xbf, 0x2e, 0xfb, 0xa1, 0x48, 0x32, 0x45, 0xd4, 0xb9, + 0x69, 0xde, 0xce, 0xbc, 0x37, 0xbb, 0xef, 0xd9, 0xf0, 0x51, 0x16, 0xa7, 0xbb, 0xe3, 0xfd, 0x46, + 0x15, 0x75, 0x25, 0x69, 0xa3, 0xa8, 0x7a, 0x3c, 0x4a, 0xda, 0x94, 0x55, 0xa1, 0x8b, 0xa6, 0xe2, + 0xb6, 0x62, 0x4f, 0x01, 0xcc, 0x76, 0x07, 0x71, 0xba, 0xa7, 0x1f, 0xa4, 0x11, 0x61, 0xba, 0x17, + 0x5a, 0x24, 0xc1, 0x2a, 0x58, 0xcf, 0x32, 0xfb, 0x8d, 0x29, 0xbc, 0x96, 0x07, 0x92, 0xbf, 0x55, + 0x9d, 0x27, 0x63, 0x8b, 0x3f, 0xd7, 0xf8, 0x16, 0xc2, 0xbb, 0xa2, 0xca, 0x85, 0x4e, 0x26, 0xf6, + 0xc4, 0x57, 0x06, 0x77, 0xda, 0xc9, 0xd4, 0xe1, 0xae, 0xc2, 0x77, 0x30, 0xd3, 0xc7, 0x9c, 0x94, + 0x16, 0x79, 0x99, 0x5c, 0xad, 0x82, 0xf5, 0x24, 0x6b, 0x01, 0xb6, 0x87, 0xd0, 0xad, 0x62, 0xfa, + 0x4e, 0x22, 0x27, 0x55, 0x0a, 0x49, 0x7e, 0x99, 0x16, 0x30, 0x5b, 0x96, 0x42, 0x1f, 0xfc, 0x36, + 0xf6, 0x1b, 0xd7, 0x30, 0x93, 0xcd, 0x35, 0xec, 0x32, 0xf3, 0x2d, 0xf0, 0xe7, 0x8b, 0x65, 0xed, + 0x21, 0xbb, 0x81, 0x68, 0x57, 0x91, 0xd0, 0x94, 0xd1, 0x9f, 0x9a, 0x94, 0xc6, 0xf7, 0x10, 0xba, + 0x53, 0xab, 0x34, 0xdf, 0xbe, 0xf2, 0x73, 0x99, 0x87, 0xd9, 0x1b, 0x88, 0x9b, 0x09, 0x55, 0x16, + 0x27, 0x45, 0x86, 0xe3, 0x67, 0xb9, 0xbf, 0x90, 0xa3, 0x99, 0x68, 0x39, 0xbe, 0xd1, 0x03, 0x5d, + 0xc6, 0xd1, 0x4c, 0x78, 0x8e, 0x6b, 0x98, 0x7f, 0x3f, 0x2a, 0xdd, 0x30, 0x0c, 0x3e, 0x1b, 0xdb, + 0xc0, 0xc2, 0x35, 0xbb, 0x61, 0xa3, 0xf7, 0x28, 0x1e, 0x6a, 0x52, 0x49, 0xb0, 0x9a, 0xf4, 0xf4, + 0x1c, 0xcc, 0xbe, 0xc0, 0x3c, 0x23, 0xb1, 0xff, 0x2f, 0xf6, 0x7f, 0x99, 0x62, 0x14, 0x1d, 0x41, + 0xab, 0x38, 0x7c, 0xc3, 0xaf, 0xb0, 0xb8, 0x15, 0x5a, 0x1e, 0x5e, 0x2e, 0x79, 0x0b, 0x91, 0x67, + 0xf0, 0x9a, 0xc3, 0x14, 0xbd, 0xd8, 0x8c, 0x07, 0x62, 0xb3, 0x7d, 0x1a, 0x43, 0xb8, 0xb3, 0x3f, + 0x2b, 0xbc, 0x86, 0xd0, 0xe5, 0x01, 0x63, 0xde, 0x8b, 0x52, 0xba, 0xe4, 0x67, 0x41, 0x19, 0x99, + 0x66, 0x67, 0x3c, 0xc6, 0xbc, 0x97, 0x99, 0x74, 0xc9, 0xcf, 0x12, 0x61, 0x9b, 0x9d, 0xc3, 0x18, + 0xf3, 0x5e, 0x38, 0xd2, 0x25, 0x3f, 0xb3, 0x7e, 0x84, 0x1f, 0x60, 0x6a, 0xfc, 0xc4, 0x05, 0xef, + 0x64, 0x20, 0x8d, 0x78, 0xd7, 0x64, 0xd7, 0x66, 0x4c, 0xc0, 0x05, 0xef, 0x98, 0x99, 0x46, 0xbc, + 0xeb, 0x0c, 0x1b, 0xe1, 0x27, 0xb8, 0xb2, 0x0f, 0x87, 0x11, 0xef, 0x5a, 0x90, 0xc6, 0xbc, 0xf7, + 0x9e, 0x6c, 0x74, 0x13, 0xfc, 0x0a, 0xed, 0x7f, 0xc7, 0xe7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xb7, 0x06, 0x45, 0x6a, 0x68, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/config/source/service/proto/service.proto b/config/source/service/proto/service.proto index 68ddabad..5e0a3389 100644 --- a/config/source/service/proto/service.proto +++ b/config/source/service/proto/service.proto @@ -41,7 +41,9 @@ message DeleteRequest { message DeleteResponse {} -message ListRequest {} +message ListRequest { + string namespace = 1; +} message ListResponse { repeated Change values = 1;