Implement basic bolt OrganizationsStore
parent
41386ca546
commit
de6ae41c60
|
@ -462,6 +462,7 @@ func UnmarshalUserPB(data []byte, u *User) error {
|
|||
// MarshalOrganization encodes a organization to binary protobuf format.
|
||||
func MarshalOrganization(o *chronograf.Organization) ([]byte, error) {
|
||||
return MarshalOrganizationPB(&Organization{
|
||||
ID: o.ID,
|
||||
Name: o.Name,
|
||||
})
|
||||
}
|
||||
|
@ -477,6 +478,7 @@ func UnmarshalOrganization(data []byte, o *chronograf.Organization) error {
|
|||
if err := UnmarshalOrganizationPB(data, &pb); err != nil {
|
||||
return err
|
||||
}
|
||||
o.ID = pb.ID
|
||||
o.Name = pb.Name
|
||||
|
||||
return nil
|
||||
|
|
|
@ -312,8 +312,44 @@ func (m *User) String() string { return proto.CompactTextString(m) }
|
|||
func (*User) ProtoMessage() {}
|
||||
func (*User) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{13} }
|
||||
|
||||
func (m *User) GetID() uint64 {
|
||||
if m != nil {
|
||||
return m.ID
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (m *User) GetName() string {
|
||||
if m != nil {
|
||||
return m.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *User) GetProvider() string {
|
||||
if m != nil {
|
||||
return m.Provider
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *User) GetScheme() string {
|
||||
if m != nil {
|
||||
return m.Scheme
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *User) GetRoles() []string {
|
||||
if m != nil {
|
||||
return m.Roles
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type Organization struct {
|
||||
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
||||
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Organization) Reset() { *m = Organization{} }
|
||||
|
@ -321,6 +357,20 @@ func (m *Organization) String() string { return proto.CompactTextStri
|
|||
func (*Organization) ProtoMessage() {}
|
||||
func (*Organization) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{14} }
|
||||
|
||||
func (m *Organization) GetID() uint64 {
|
||||
if m != nil {
|
||||
return m.ID
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (m *Organization) GetName() string {
|
||||
if m != nil {
|
||||
return m.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func init() {
|
||||
proto.RegisterType((*Source)(nil), "internal.Source")
|
||||
proto.RegisterType((*Dashboard)(nil), "internal.Dashboard")
|
||||
|
@ -342,72 +392,72 @@ func init() {
|
|||
func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
|
||||
|
||||
var fileDescriptorInternal = []byte{
|
||||
// 1070 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x56, 0xd1, 0x8e, 0xdb, 0x44,
|
||||
0x17, 0xd6, 0xc4, 0x76, 0x12, 0x9f, 0x6c, 0xf7, 0xff, 0x35, 0xaa, 0xa8, 0x29, 0x37, 0xc1, 0x02,
|
||||
0x29, 0x48, 0x74, 0x41, 0xad, 0x90, 0x10, 0x77, 0xd9, 0x0d, 0xaa, 0x96, 0xdd, 0xb6, 0xcb, 0x64,
|
||||
0x77, 0xb9, 0x42, 0xd5, 0xc4, 0x39, 0x49, 0xac, 0x3a, 0xb1, 0x19, 0xdb, 0xbb, 0x31, 0x4f, 0xc1,
|
||||
0x13, 0x20, 0x21, 0x71, 0xc5, 0x05, 0x17, 0xbc, 0x00, 0xf7, 0x7d, 0x2a, 0x74, 0x66, 0xc6, 0x8e,
|
||||
0x43, 0x97, 0xaa, 0x37, 0x70, 0x37, 0xdf, 0x39, 0x93, 0x33, 0x33, 0xe7, 0x3b, 0xdf, 0x17, 0xc3,
|
||||
0x61, 0xbc, 0x29, 0x50, 0x6d, 0x64, 0x72, 0x94, 0xa9, 0xb4, 0x48, 0x79, 0xbf, 0xc6, 0xe1, 0xef,
|
||||
0x1d, 0xe8, 0x4e, 0xd3, 0x52, 0x45, 0xc8, 0x0f, 0xa1, 0x73, 0x3a, 0x09, 0xd8, 0x90, 0x8d, 0x1c,
|
||||
0xd1, 0x39, 0x9d, 0x70, 0x0e, 0xee, 0x73, 0xb9, 0xc6, 0xa0, 0x33, 0x64, 0x23, 0x5f, 0xe8, 0x35,
|
||||
0xc5, 0x2e, 0xab, 0x0c, 0x03, 0xc7, 0xc4, 0x68, 0xcd, 0x1f, 0x42, 0xff, 0x2a, 0xa7, 0x6a, 0x6b,
|
||||
0x0c, 0x5c, 0x1d, 0x6f, 0x30, 0xe5, 0x2e, 0x64, 0x9e, 0xdf, 0xa6, 0x6a, 0x1e, 0x78, 0x26, 0x57,
|
||||
0x63, 0xfe, 0x7f, 0x70, 0xae, 0xc4, 0x79, 0xd0, 0xd5, 0x61, 0x5a, 0xf2, 0x00, 0x7a, 0x13, 0x5c,
|
||||
0xc8, 0x32, 0x29, 0x82, 0xde, 0x90, 0x8d, 0xfa, 0xa2, 0x86, 0x54, 0xe7, 0x12, 0x13, 0x5c, 0x2a,
|
||||
0xb9, 0x08, 0xfa, 0xa6, 0x4e, 0x8d, 0xf9, 0x11, 0xf0, 0xd3, 0x4d, 0x8e, 0x51, 0xa9, 0x70, 0xfa,
|
||||
0x2a, 0xce, 0xae, 0x51, 0xc5, 0x8b, 0x2a, 0xf0, 0x75, 0x81, 0x3b, 0x32, 0x74, 0xca, 0x33, 0x2c,
|
||||
0x24, 0x9d, 0x0d, 0xba, 0x54, 0x0d, 0x79, 0x08, 0x07, 0xd3, 0x95, 0x54, 0x38, 0x9f, 0x62, 0xa4,
|
||||
0xb0, 0x08, 0x06, 0x3a, 0xbd, 0x17, 0x0b, 0x7f, 0x62, 0xe0, 0x4f, 0x64, 0xbe, 0x9a, 0xa5, 0x52,
|
||||
0xcd, 0xdf, 0xa9, 0x67, 0x8f, 0xc0, 0x8b, 0x30, 0x49, 0xf2, 0xc0, 0x19, 0x3a, 0xa3, 0xc1, 0xe3,
|
||||
0x07, 0x47, 0x0d, 0x19, 0x4d, 0x9d, 0x13, 0x4c, 0x12, 0x61, 0x76, 0xf1, 0xcf, 0xc1, 0x2f, 0x70,
|
||||
0x9d, 0x25, 0xb2, 0xc0, 0x3c, 0x70, 0xf5, 0x4f, 0xf8, 0xee, 0x27, 0x97, 0x36, 0x25, 0x76, 0x9b,
|
||||
0xc2, 0xdf, 0x3a, 0x70, 0x6f, 0xaf, 0x14, 0x3f, 0x00, 0xb6, 0xd5, 0xb7, 0xf2, 0x04, 0xdb, 0x12,
|
||||
0xaa, 0xf4, 0x8d, 0x3c, 0xc1, 0x2a, 0x42, 0xb7, 0x9a, 0x3f, 0x4f, 0xb0, 0x5b, 0x42, 0x2b, 0xcd,
|
||||
0x9a, 0x27, 0xd8, 0x8a, 0x7f, 0x02, 0xbd, 0x1f, 0x4a, 0x54, 0x31, 0xe6, 0x81, 0xa7, 0x4f, 0xfe,
|
||||
0xdf, 0xee, 0xe4, 0x6f, 0x4b, 0x54, 0x95, 0xa8, 0xf3, 0xf4, 0x52, 0xcd, 0xb8, 0xa1, 0x4f, 0xaf,
|
||||
0x29, 0x56, 0xd0, 0x74, 0xf4, 0x4c, 0x8c, 0xd6, 0xb6, 0x43, 0x86, 0x33, 0xea, 0xd0, 0x17, 0xe0,
|
||||
0xca, 0x2d, 0xe6, 0x81, 0xaf, 0xeb, 0x7f, 0xf8, 0x0f, 0xcd, 0x38, 0x1a, 0x6f, 0x31, 0xff, 0x7a,
|
||||
0x53, 0xa8, 0x4a, 0xe8, 0xed, 0x0f, 0x9f, 0x82, 0xdf, 0x84, 0x68, 0x72, 0x5e, 0x61, 0xa5, 0x1f,
|
||||
0xe8, 0x0b, 0x5a, 0xf2, 0x8f, 0xc0, 0xbb, 0x91, 0x49, 0x69, 0x1a, 0x3f, 0x78, 0x7c, 0xb8, 0x2b,
|
||||
0x3b, 0xde, 0xc6, 0xb9, 0x30, 0xc9, 0xaf, 0x3a, 0x5f, 0xb2, 0xf0, 0x0f, 0x06, 0x2e, 0xc5, 0x88,
|
||||
0xec, 0x04, 0x97, 0x32, 0xaa, 0x8e, 0xd3, 0x72, 0x33, 0xcf, 0x03, 0x36, 0x74, 0x46, 0x8e, 0xd8,
|
||||
0x8b, 0xf1, 0xf7, 0xa0, 0x3b, 0x33, 0xd9, 0xce, 0xd0, 0x19, 0xf9, 0xc2, 0x22, 0x7e, 0x1f, 0xbc,
|
||||
0x44, 0xce, 0x30, 0xb1, 0x3a, 0x30, 0x80, 0x76, 0x67, 0x0a, 0x17, 0xf1, 0xd6, 0xca, 0xc0, 0x22,
|
||||
0x8a, 0xe7, 0xe5, 0x82, 0xe2, 0x46, 0x02, 0x16, 0x51, 0xbb, 0x66, 0x32, 0x6f, 0x5a, 0x48, 0x6b,
|
||||
0xaa, 0x9c, 0x47, 0x32, 0xa9, 0x7b, 0x68, 0x40, 0xf8, 0x27, 0xa3, 0xf9, 0x37, 0x7c, 0xb7, 0x66,
|
||||
0xce, 0x74, 0xf4, 0x7d, 0xe8, 0xd3, 0x2c, 0xbc, 0xbc, 0x91, 0xca, 0xce, 0x5d, 0x8f, 0xf0, 0xb5,
|
||||
0x54, 0xfc, 0x33, 0xe8, 0xea, 0x97, 0xdf, 0x31, 0x7b, 0x75, 0xb9, 0x6b, 0xca, 0x0b, 0xbb, 0xad,
|
||||
0x61, 0xd0, 0x6d, 0x31, 0xd8, 0x3c, 0xd6, 0x6b, 0x3f, 0xf6, 0x11, 0x78, 0x34, 0x0a, 0x95, 0xbe,
|
||||
0xfd, 0x9d, 0x95, 0xcd, 0xc0, 0x98, 0x5d, 0xe1, 0x15, 0xdc, 0xdb, 0x3b, 0xb1, 0x39, 0x89, 0xed,
|
||||
0x9f, 0xb4, 0x63, 0xd1, 0xb7, 0xac, 0x91, 0xf6, 0x73, 0x4c, 0x30, 0x2a, 0x70, 0xae, 0xfb, 0xdd,
|
||||
0x17, 0x0d, 0x0e, 0x7f, 0x61, 0xbb, 0xba, 0xfa, 0x3c, 0x52, 0x77, 0x94, 0xae, 0xd7, 0x72, 0x33,
|
||||
0xb7, 0xa5, 0x6b, 0x48, 0x7d, 0x9b, 0xcf, 0x6c, 0xe9, 0xce, 0x7c, 0x46, 0x58, 0x65, 0x96, 0xc1,
|
||||
0x8e, 0xca, 0xf8, 0x10, 0x06, 0x6b, 0x94, 0x79, 0xa9, 0x70, 0x8d, 0x9b, 0xc2, 0xb6, 0xa0, 0x1d,
|
||||
0xe2, 0x0f, 0xa0, 0x57, 0xc8, 0xe5, 0x4b, 0x9a, 0x3d, 0xcb, 0x64, 0x21, 0x97, 0x67, 0x58, 0xf1,
|
||||
0x0f, 0xc0, 0x5f, 0xc4, 0x98, 0xcc, 0x75, 0xca, 0xd0, 0xd9, 0xd7, 0x81, 0x33, 0xac, 0xc2, 0x5f,
|
||||
0x19, 0x74, 0xa7, 0xa8, 0x6e, 0x50, 0xbd, 0x93, 0x5d, 0xb4, 0xed, 0xd4, 0x79, 0x8b, 0x9d, 0xba,
|
||||
0x77, 0xdb, 0xa9, 0xb7, 0xb3, 0xd3, 0xfb, 0xe0, 0x4d, 0x55, 0x74, 0x3a, 0xd1, 0x37, 0x72, 0x84,
|
||||
0x01, 0x34, 0x8d, 0xe3, 0xa8, 0x88, 0x6f, 0xd0, 0x7a, 0xac, 0x45, 0xe1, 0xcf, 0x0c, 0xba, 0xe7,
|
||||
0xb2, 0x4a, 0xcb, 0xe2, 0x8d, 0x09, 0x1b, 0xc2, 0x60, 0x9c, 0x65, 0x49, 0x1c, 0xc9, 0x22, 0x4e,
|
||||
0x37, 0xf6, 0xb6, 0xed, 0x10, 0xed, 0x78, 0xd6, 0xea, 0x9d, 0xb9, 0x77, 0x3b, 0x44, 0x0a, 0x3d,
|
||||
0xd1, 0x2e, 0x68, 0x2c, 0xad, 0xa5, 0x50, 0x63, 0x7e, 0x3a, 0x49, 0x0f, 0x1c, 0x97, 0x45, 0xba,
|
||||
0x48, 0xd2, 0x5b, 0xfd, 0x92, 0xbe, 0x68, 0x70, 0xf8, 0xba, 0x03, 0xee, 0x7f, 0xe5, 0x6e, 0x07,
|
||||
0xc0, 0x62, 0x4b, 0x24, 0x8b, 0x1b, 0xaf, 0xeb, 0xb5, 0xbc, 0x2e, 0x80, 0x5e, 0xa5, 0xe4, 0x66,
|
||||
0x89, 0x79, 0xd0, 0xd7, 0xce, 0x51, 0x43, 0x9d, 0xd1, 0x1a, 0x31, 0x26, 0xe7, 0x8b, 0x1a, 0x36,
|
||||
0x33, 0x0f, 0xad, 0x99, 0xff, 0xd4, 0xfa, 0xe1, 0x40, 0xdf, 0x28, 0xd8, 0x6f, 0xcb, 0xbf, 0x67,
|
||||
0x83, 0xaf, 0x19, 0x78, 0x8d, 0x60, 0x4e, 0xf6, 0x05, 0x73, 0xb2, 0x13, 0xcc, 0xe4, 0xb8, 0x16,
|
||||
0xcc, 0xe4, 0x98, 0xb0, 0xb8, 0xa8, 0x05, 0x23, 0x2e, 0x88, 0xac, 0xa7, 0x2a, 0x2d, 0xb3, 0xe3,
|
||||
0xca, 0xb0, 0xea, 0x8b, 0x06, 0xd3, 0x94, 0x7d, 0xb7, 0x42, 0x65, 0x5b, 0xed, 0x0b, 0x8b, 0x68,
|
||||
0x26, 0xcf, 0xb5, 0x99, 0x98, 0xe6, 0x1a, 0xc0, 0x3f, 0x06, 0x4f, 0x50, 0xf3, 0x74, 0x87, 0xf7,
|
||||
0x78, 0xd1, 0x61, 0x61, 0xb2, 0x54, 0xd4, 0x7c, 0xab, 0xd8, 0xff, 0x13, 0x8b, 0xc2, 0x27, 0xf6,
|
||||
0xe7, 0x54, 0xfd, 0x2a, 0xcb, 0x50, 0x59, 0x89, 0x19, 0xa0, 0xcf, 0x4c, 0x6f, 0xd1, 0xb8, 0xa3,
|
||||
0x23, 0x0c, 0x08, 0xbf, 0x07, 0x7f, 0x9c, 0xa0, 0x2a, 0x44, 0x99, 0xbc, 0xe9, 0xa9, 0x1c, 0xdc,
|
||||
0x6f, 0xa6, 0x2f, 0x9e, 0xd7, 0xc2, 0xa4, 0xf5, 0x4e, 0x4e, 0xce, 0xdf, 0xe4, 0x74, 0x26, 0x33,
|
||||
0x79, 0x3a, 0xd1, 0x73, 0xe6, 0x08, 0x8b, 0xc2, 0x02, 0x5c, 0x92, 0x6d, 0xab, 0xb2, 0xfb, 0x36,
|
||||
0xc9, 0x5f, 0xa8, 0xf4, 0x26, 0x9e, 0xa3, 0xaa, 0x25, 0x5f, 0x63, 0xfd, 0xe6, 0x68, 0x85, 0xcd,
|
||||
0xb7, 0x95, 0x45, 0x74, 0x1b, 0x91, 0x26, 0x4d, 0x7f, 0x0d, 0x08, 0x43, 0x38, 0x78, 0xa1, 0x96,
|
||||
0x72, 0x13, 0xff, 0x68, 0x74, 0x59, 0x9f, 0xc6, 0x76, 0xa7, 0xcd, 0xba, 0xfa, 0x1b, 0xf0, 0xc9,
|
||||
0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x97, 0x53, 0x8f, 0x15, 0x0a, 0x00, 0x00,
|
||||
// 1068 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xd1, 0x8e, 0xdb, 0x44,
|
||||
0x17, 0xd6, 0xc4, 0x76, 0x12, 0x9f, 0x6c, 0xfb, 0xff, 0x1a, 0x55, 0xd4, 0x94, 0x9b, 0x60, 0x81,
|
||||
0x14, 0x24, 0xba, 0xa0, 0x56, 0x48, 0x88, 0xbb, 0xec, 0x06, 0x55, 0xcb, 0x6e, 0xdb, 0x65, 0xb2,
|
||||
0xbb, 0x5c, 0xa1, 0x6a, 0xe2, 0x9c, 0x24, 0x56, 0x9d, 0xd8, 0x8c, 0xed, 0xdd, 0x98, 0xa7, 0xe0,
|
||||
0x09, 0x90, 0x90, 0xb8, 0xe2, 0x82, 0x0b, 0x5e, 0x80, 0xfb, 0x3e, 0x15, 0x3a, 0x33, 0x63, 0xc7,
|
||||
0xa1, 0x4b, 0xb5, 0x37, 0x70, 0x37, 0xdf, 0x39, 0x93, 0x33, 0x33, 0xe7, 0x3b, 0xdf, 0x17, 0xc3,
|
||||
0xfd, 0x78, 0x53, 0xa0, 0xda, 0xc8, 0xe4, 0x30, 0x53, 0x69, 0x91, 0xf2, 0x7e, 0x8d, 0xc3, 0xdf,
|
||||
0x3b, 0xd0, 0x9d, 0xa6, 0xa5, 0x8a, 0x90, 0xdf, 0x87, 0xce, 0xc9, 0x24, 0x60, 0x43, 0x36, 0x72,
|
||||
0x44, 0xe7, 0x64, 0xc2, 0x39, 0xb8, 0x2f, 0xe4, 0x1a, 0x83, 0xce, 0x90, 0x8d, 0x7c, 0xa1, 0xd7,
|
||||
0x14, 0xbb, 0xa8, 0x32, 0x0c, 0x1c, 0x13, 0xa3, 0x35, 0x7f, 0x04, 0xfd, 0xcb, 0x9c, 0xaa, 0xad,
|
||||
0x31, 0x70, 0x75, 0xbc, 0xc1, 0x94, 0x3b, 0x97, 0x79, 0x7e, 0x93, 0xaa, 0x79, 0xe0, 0x99, 0x5c,
|
||||
0x8d, 0xf9, 0xff, 0xc1, 0xb9, 0x14, 0x67, 0x41, 0x57, 0x87, 0x69, 0xc9, 0x03, 0xe8, 0x4d, 0x70,
|
||||
0x21, 0xcb, 0xa4, 0x08, 0x7a, 0x43, 0x36, 0xea, 0x8b, 0x1a, 0x52, 0x9d, 0x0b, 0x4c, 0x70, 0xa9,
|
||||
0xe4, 0x22, 0xe8, 0x9b, 0x3a, 0x35, 0xe6, 0x87, 0xc0, 0x4f, 0x36, 0x39, 0x46, 0xa5, 0xc2, 0xe9,
|
||||
0xeb, 0x38, 0xbb, 0x42, 0x15, 0x2f, 0xaa, 0xc0, 0xd7, 0x05, 0x6e, 0xc9, 0xd0, 0x29, 0xcf, 0xb1,
|
||||
0x90, 0x74, 0x36, 0xe8, 0x52, 0x35, 0xe4, 0x21, 0x1c, 0x4c, 0x57, 0x52, 0xe1, 0x7c, 0x8a, 0x91,
|
||||
0xc2, 0x22, 0x18, 0xe8, 0xf4, 0x5e, 0x2c, 0xfc, 0x89, 0x81, 0x3f, 0x91, 0xf9, 0x6a, 0x96, 0x4a,
|
||||
0x35, 0xbf, 0x53, 0xcf, 0x1e, 0x83, 0x17, 0x61, 0x92, 0xe4, 0x81, 0x33, 0x74, 0x46, 0x83, 0x27,
|
||||
0x0f, 0x0f, 0x1b, 0x32, 0x9a, 0x3a, 0xc7, 0x98, 0x24, 0xc2, 0xec, 0xe2, 0x9f, 0x83, 0x5f, 0xe0,
|
||||
0x3a, 0x4b, 0x64, 0x81, 0x79, 0xe0, 0xea, 0x9f, 0xf0, 0xdd, 0x4f, 0x2e, 0x6c, 0x4a, 0xec, 0x36,
|
||||
0x85, 0xbf, 0x75, 0xe0, 0xde, 0x5e, 0x29, 0x7e, 0x00, 0x6c, 0xab, 0x6f, 0xe5, 0x09, 0xb6, 0x25,
|
||||
0x54, 0xe9, 0x1b, 0x79, 0x82, 0x55, 0x84, 0x6e, 0x34, 0x7f, 0x9e, 0x60, 0x37, 0x84, 0x56, 0x9a,
|
||||
0x35, 0x4f, 0xb0, 0x15, 0xff, 0x04, 0x7a, 0x3f, 0x94, 0xa8, 0x62, 0xcc, 0x03, 0x4f, 0x9f, 0xfc,
|
||||
0xbf, 0xdd, 0xc9, 0xdf, 0x96, 0xa8, 0x2a, 0x51, 0xe7, 0xe9, 0xa5, 0x9a, 0x71, 0x43, 0x9f, 0x5e,
|
||||
0x53, 0xac, 0xa0, 0xe9, 0xe8, 0x99, 0x18, 0xad, 0x6d, 0x87, 0x0c, 0x67, 0xd4, 0xa1, 0x2f, 0xc0,
|
||||
0x95, 0x5b, 0xcc, 0x03, 0x5f, 0xd7, 0xff, 0xf0, 0x1f, 0x9a, 0x71, 0x38, 0xde, 0x62, 0xfe, 0xf5,
|
||||
0xa6, 0x50, 0x95, 0xd0, 0xdb, 0x1f, 0x3d, 0x03, 0xbf, 0x09, 0xd1, 0xe4, 0xbc, 0xc6, 0x4a, 0x3f,
|
||||
0xd0, 0x17, 0xb4, 0xe4, 0x1f, 0x81, 0x77, 0x2d, 0x93, 0xd2, 0x34, 0x7e, 0xf0, 0xe4, 0xfe, 0xae,
|
||||
0xec, 0x78, 0x1b, 0xe7, 0xc2, 0x24, 0xbf, 0xea, 0x7c, 0xc9, 0xc2, 0x3f, 0x18, 0xb8, 0x14, 0x23,
|
||||
0xb2, 0x13, 0x5c, 0xca, 0xa8, 0x3a, 0x4a, 0xcb, 0xcd, 0x3c, 0x0f, 0xd8, 0xd0, 0x19, 0x39, 0x62,
|
||||
0x2f, 0xc6, 0xdf, 0x83, 0xee, 0xcc, 0x64, 0x3b, 0x43, 0x67, 0xe4, 0x0b, 0x8b, 0xf8, 0x03, 0xf0,
|
||||
0x12, 0x39, 0xc3, 0xc4, 0xea, 0xc0, 0x00, 0xda, 0x9d, 0x29, 0x5c, 0xc4, 0x5b, 0x2b, 0x03, 0x8b,
|
||||
0x28, 0x9e, 0x97, 0x0b, 0x8a, 0x1b, 0x09, 0x58, 0x44, 0xed, 0x9a, 0xc9, 0xbc, 0x69, 0x21, 0xad,
|
||||
0xa9, 0x72, 0x1e, 0xc9, 0xa4, 0xee, 0xa1, 0x01, 0xe1, 0x9f, 0x8c, 0xe6, 0xdf, 0xf0, 0xdd, 0x9a,
|
||||
0x39, 0xd3, 0xd1, 0xf7, 0xa1, 0x4f, 0xb3, 0xf0, 0xea, 0x5a, 0x2a, 0x3b, 0x77, 0x3d, 0xc2, 0x57,
|
||||
0x52, 0xf1, 0xcf, 0xa0, 0xab, 0x5f, 0x7e, 0xcb, 0xec, 0xd5, 0xe5, 0xae, 0x28, 0x2f, 0xec, 0xb6,
|
||||
0x86, 0x41, 0xb7, 0xc5, 0x60, 0xf3, 0x58, 0xaf, 0xfd, 0xd8, 0xc7, 0xe0, 0xd1, 0x28, 0x54, 0xfa,
|
||||
0xf6, 0xb7, 0x56, 0x36, 0x03, 0x63, 0x76, 0x85, 0x97, 0x70, 0x6f, 0xef, 0xc4, 0xe6, 0x24, 0xb6,
|
||||
0x7f, 0xd2, 0x8e, 0x45, 0xdf, 0xb2, 0x46, 0xda, 0xcf, 0x31, 0xc1, 0xa8, 0xc0, 0xb9, 0xee, 0x77,
|
||||
0x5f, 0x34, 0x38, 0xfc, 0x85, 0xed, 0xea, 0xea, 0xf3, 0x48, 0xdd, 0x51, 0xba, 0x5e, 0xcb, 0xcd,
|
||||
0xdc, 0x96, 0xae, 0x21, 0xf5, 0x6d, 0x3e, 0xb3, 0xa5, 0x3b, 0xf3, 0x19, 0x61, 0x95, 0x59, 0x06,
|
||||
0x3b, 0x2a, 0xe3, 0x43, 0x18, 0xac, 0x51, 0xe6, 0xa5, 0xc2, 0x35, 0x6e, 0x0a, 0xdb, 0x82, 0x76,
|
||||
0x88, 0x3f, 0x84, 0x5e, 0x21, 0x97, 0xaf, 0x68, 0xf6, 0x2c, 0x93, 0x85, 0x5c, 0x9e, 0x62, 0xc5,
|
||||
0x3f, 0x00, 0x7f, 0x11, 0x63, 0x32, 0xd7, 0x29, 0x43, 0x67, 0x5f, 0x07, 0x4e, 0xb1, 0x0a, 0x7f,
|
||||
0x65, 0xd0, 0x9d, 0xa2, 0xba, 0x46, 0x75, 0x27, 0xbb, 0x68, 0xdb, 0xa9, 0xf3, 0x0e, 0x3b, 0x75,
|
||||
0x6f, 0xb7, 0x53, 0x6f, 0x67, 0xa7, 0x0f, 0xc0, 0x9b, 0xaa, 0xe8, 0x64, 0xa2, 0x6f, 0xe4, 0x08,
|
||||
0x03, 0x68, 0x1a, 0xc7, 0x51, 0x11, 0x5f, 0xa3, 0xf5, 0x58, 0x8b, 0xc2, 0x9f, 0x19, 0x74, 0xcf,
|
||||
0x64, 0x95, 0x96, 0xc5, 0x5b, 0x13, 0x36, 0x84, 0xc1, 0x38, 0xcb, 0x92, 0x38, 0x92, 0x45, 0x9c,
|
||||
0x6e, 0xec, 0x6d, 0xdb, 0x21, 0xda, 0xf1, 0xbc, 0xd5, 0x3b, 0x73, 0xef, 0x76, 0x88, 0x14, 0x7a,
|
||||
0xac, 0x5d, 0xd0, 0x58, 0x5a, 0x4b, 0xa1, 0xc6, 0xfc, 0x74, 0x92, 0x1e, 0x38, 0x2e, 0x8b, 0x74,
|
||||
0x91, 0xa4, 0x37, 0xfa, 0x25, 0x7d, 0xd1, 0xe0, 0xf0, 0x4d, 0x07, 0xdc, 0xff, 0xca, 0xdd, 0x0e,
|
||||
0x80, 0xc5, 0x96, 0x48, 0x16, 0x37, 0x5e, 0xd7, 0x6b, 0x79, 0x5d, 0x00, 0xbd, 0x4a, 0xc9, 0xcd,
|
||||
0x12, 0xf3, 0xa0, 0xaf, 0x9d, 0xa3, 0x86, 0x3a, 0xa3, 0x35, 0x62, 0x4c, 0xce, 0x17, 0x35, 0x6c,
|
||||
0x66, 0x1e, 0x5a, 0x33, 0xff, 0xa9, 0xf5, 0xc3, 0x81, 0xbe, 0x51, 0xb0, 0xdf, 0x96, 0x7f, 0xcf,
|
||||
0x06, 0xdf, 0x30, 0xf0, 0x1a, 0xc1, 0x1c, 0xef, 0x0b, 0xe6, 0x78, 0x27, 0x98, 0xc9, 0x51, 0x2d,
|
||||
0x98, 0xc9, 0x11, 0x61, 0x71, 0x5e, 0x0b, 0x46, 0x9c, 0x13, 0x59, 0xcf, 0x54, 0x5a, 0x66, 0x47,
|
||||
0x95, 0x61, 0xd5, 0x17, 0x0d, 0xa6, 0x29, 0xfb, 0x6e, 0x85, 0xca, 0xb6, 0xda, 0x17, 0x16, 0xd1,
|
||||
0x4c, 0x9e, 0x69, 0x33, 0x31, 0xcd, 0x35, 0x80, 0x7f, 0x0c, 0x9e, 0xa0, 0xe6, 0xe9, 0x0e, 0xef,
|
||||
0xf1, 0xa2, 0xc3, 0xc2, 0x64, 0xa9, 0xa8, 0xf9, 0x56, 0xb1, 0xff, 0x27, 0x16, 0x85, 0x4f, 0xed,
|
||||
0xcf, 0xa9, 0xfa, 0x65, 0x96, 0xa1, 0xb2, 0x12, 0x33, 0x40, 0x9f, 0x99, 0xde, 0xa0, 0x71, 0x47,
|
||||
0x47, 0x18, 0x10, 0x7e, 0x0f, 0xfe, 0x38, 0x41, 0x55, 0x88, 0x32, 0x79, 0xdb, 0x53, 0x39, 0xb8,
|
||||
0xdf, 0x4c, 0x5f, 0xbe, 0xa8, 0x85, 0x49, 0xeb, 0x9d, 0x9c, 0x9c, 0xbf, 0xc9, 0xe9, 0x54, 0x66,
|
||||
0xf2, 0x64, 0xa2, 0xe7, 0xcc, 0x11, 0x16, 0x85, 0x05, 0xb8, 0x24, 0xdb, 0x56, 0x65, 0xf7, 0x5d,
|
||||
0x92, 0x3f, 0x57, 0xe9, 0x75, 0x3c, 0x47, 0x55, 0x4b, 0xbe, 0xc6, 0xfa, 0xcd, 0xd1, 0x0a, 0x9b,
|
||||
0x6f, 0x2b, 0x8b, 0xe8, 0x36, 0x22, 0x4d, 0x9a, 0xfe, 0x1a, 0x10, 0x3e, 0x81, 0x83, 0x97, 0x6a,
|
||||
0x29, 0x37, 0xf1, 0x8f, 0x46, 0x97, 0x77, 0x38, 0x7d, 0xd6, 0xd5, 0xdf, 0x84, 0x4f, 0xff, 0x0a,
|
||||
0x00, 0x00, 0xff, 0xff, 0xac, 0x72, 0x06, 0x7f, 0x25, 0x0a, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
@ -132,7 +132,8 @@ message User {
|
|||
}
|
||||
|
||||
message Organization {
|
||||
string Name = 1; // Name is the organization's name
|
||||
uint64 ID = 1; // ID is the unique ID of the organization
|
||||
string Name = 2; // Name is the organization's name
|
||||
}
|
||||
|
||||
// The following is a vim modeline, it autoconfigures vim to have the
|
||||
|
|
|
@ -2,6 +2,7 @@ package bolt
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/boltdb/bolt"
|
||||
"github.com/influxdata/chronograf"
|
||||
|
@ -26,6 +27,7 @@ func (s *OrganizationsStore) Add(ctx context.Context, o *chronograf.Organization
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
o.ID = seq
|
||||
if v, err := internal.MarshalOrganization(o); err != nil {
|
||||
return err
|
||||
} else if err := b.Put(u64tob(seq), v); err != nil {
|
||||
|
@ -39,12 +41,44 @@ func (s *OrganizationsStore) Add(ctx context.Context, o *chronograf.Organization
|
|||
return o, nil
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) All(context.Context) ([]chronograf.Organization, error) {
|
||||
panic("not implemented")
|
||||
func (s *OrganizationsStore) All(ctx context.Context) ([]chronograf.Organization, error) {
|
||||
var orgs []chronograf.Organization
|
||||
err := s.each(ctx, func(o *chronograf.Organization) {
|
||||
orgs = append(orgs, *o)
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return orgs, nil
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) Delete(context.Context, *chronograf.Organization) error {
|
||||
panic("not implemented")
|
||||
func (s *OrganizationsStore) Delete(ctx context.Context, o *chronograf.Organization) error {
|
||||
_, err := s.get(ctx, o.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.client.db.Update(func(tx *bolt.Tx) error {
|
||||
return tx.Bucket(OrganizationsBucket).Delete(u64tob(o.ID))
|
||||
})
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) get(ctx context.Context, id uint64) (*chronograf.Organization, error) {
|
||||
var o chronograf.Organization
|
||||
err := s.client.db.View(func(tx *bolt.Tx) error {
|
||||
v := tx.Bucket(OrganizationsBucket).Get(u64tob(id))
|
||||
if v == nil {
|
||||
return chronograf.ErrOrganizationNotFound
|
||||
}
|
||||
return internal.UnmarshalOrganization(v, &o)
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &o, nil
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) each(ctx context.Context, fn func(*chronograf.Organization)) error {
|
||||
|
@ -61,29 +95,48 @@ func (s *OrganizationsStore) each(ctx context.Context, fn func(*chronograf.Organ
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) Get(ctx context.Context, name string) (*chronograf.Organization, error) {
|
||||
var org *chronograf.Organization
|
||||
err := s.each(ctx, func(o *chronograf.Organization) {
|
||||
if org != nil {
|
||||
return
|
||||
func (s *OrganizationsStore) Get(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
|
||||
if q.ID != nil {
|
||||
return s.get(ctx, *q.ID)
|
||||
}
|
||||
|
||||
if q.Name != nil {
|
||||
var org *chronograf.Organization
|
||||
err := s.each(ctx, func(o *chronograf.Organization) {
|
||||
if org != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if o.Name == *q.Name {
|
||||
org = o
|
||||
}
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if o.Name == name {
|
||||
org = o
|
||||
if org == nil {
|
||||
return nil, chronograf.ErrOrganizationNotFound
|
||||
}
|
||||
})
|
||||
|
||||
return org, nil
|
||||
}
|
||||
return nil, fmt.Errorf("must specify either ID, or Name in OrganizationQuery")
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) Update(ctx context.Context, o *chronograf.Organization) error {
|
||||
org, err := s.get(ctx, o.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
if org == nil {
|
||||
return nil, chronograf.ErrOrganizationNotFound
|
||||
}
|
||||
|
||||
return org, nil
|
||||
}
|
||||
|
||||
func (s *OrganizationsStore) Update(context.Context, *chronograf.Organization) error {
|
||||
panic("not implemented")
|
||||
return s.client.db.Update(func(tx *bolt.Tx) error {
|
||||
org.Name = o.Name
|
||||
if v, err := internal.MarshalOrganization(org); err != nil {
|
||||
return err
|
||||
} else if err := tx.Bucket(OrganizationsBucket).Put(u64tob(org.ID), v); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ package bolt_test
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
|
@ -9,11 +10,12 @@ import (
|
|||
"github.com/influxdata/chronograf"
|
||||
)
|
||||
|
||||
var orgCMPOptions = cmp.Options{
|
||||
var orgCmpOptions = cmp.Options{
|
||||
cmpopts.IgnoreFields(chronograf.Organization{}, "ID"),
|
||||
cmpopts.EquateEmpty(),
|
||||
}
|
||||
|
||||
func TestOrganizationsStore_Get(t *testing.T) {
|
||||
func TestOrganizationsStore_GetWithName(t *testing.T) {
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
org *chronograf.Organization
|
||||
|
@ -68,14 +70,284 @@ func TestOrganizationsStore_Get(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
got, err := s.Get(tt.args.ctx, tt.args.org.Name)
|
||||
got, err := s.Get(tt.args.ctx, chronograf.OrganizationQuery{Name: &tt.args.org.Name})
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("%q. OrganizationsStore.Get() error = %v, wantErr %v", tt.name, err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
if diff := cmp.Diff(got, tt.want, orgCMPOptions...); diff != "" {
|
||||
if diff := cmp.Diff(got, tt.want, orgCmpOptions...); diff != "" {
|
||||
t.Errorf("%q. OrganizationsStore.Get():\n-got/+want\ndiff %s", tt.name, diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizationsStore_GetWithID(t *testing.T) {
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
org *chronograf.Organization
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want *chronograf.Organization
|
||||
wantErr bool
|
||||
addFirst bool
|
||||
}{
|
||||
{
|
||||
name: "Organization not found",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Get Organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{
|
||||
Name: "EE - Evil Empire",
|
||||
},
|
||||
},
|
||||
want: &chronograf.Organization{
|
||||
Name: "EE - Evil Empire",
|
||||
},
|
||||
addFirst: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
client, err := NewTestClient()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := client.Open(context.TODO()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer client.Close()
|
||||
|
||||
s := client.OrganizationsStore
|
||||
if tt.addFirst {
|
||||
tt.args.org, err = s.Add(tt.args.ctx, tt.args.org)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
got, err := s.Get(tt.args.ctx, chronograf.OrganizationQuery{ID: &tt.args.org.ID})
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("%q. OrganizationsStore.Get() error = %v, wantErr %v", tt.name, err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
if diff := cmp.Diff(got, tt.want, orgCmpOptions...); diff != "" {
|
||||
t.Errorf("%q. OrganizationsStore.Get():\n-got/+want\ndiff %s", tt.name, diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizationsStore_All(t *testing.T) {
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
orgs []chronograf.Organization
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want []chronograf.Organization
|
||||
addFirst bool
|
||||
}{
|
||||
{
|
||||
name: "Get Organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
orgs: []chronograf.Organization{
|
||||
{
|
||||
Name: "EE - Evil Empire",
|
||||
},
|
||||
{
|
||||
Name: "The Good Place",
|
||||
},
|
||||
},
|
||||
},
|
||||
want: []chronograf.Organization{
|
||||
{
|
||||
Name: "EE - Evil Empire",
|
||||
},
|
||||
{
|
||||
Name: "The Good Place",
|
||||
},
|
||||
},
|
||||
addFirst: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
client, err := NewTestClient()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := client.Open(context.TODO()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer client.Close()
|
||||
|
||||
s := client.OrganizationsStore
|
||||
if tt.addFirst {
|
||||
for _, org := range tt.args.orgs {
|
||||
_, err = s.Add(tt.args.ctx, &org)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
got, err := s.All(tt.args.ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
return
|
||||
}
|
||||
if diff := cmp.Diff(got, tt.want, orgCmpOptions...); diff != "" {
|
||||
t.Errorf("%q. OrganizationsStore.All():\n-got/+want\ndiff %s", tt.name, diff)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizationsStore_Update(t *testing.T) {
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
org *chronograf.Organization
|
||||
name string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
addFirst bool
|
||||
want *chronograf.Organization
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "No such organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{
|
||||
Name: "The Okay Place",
|
||||
},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Update organization name",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{
|
||||
Name: "The Good Place",
|
||||
},
|
||||
name: "The Bad Place",
|
||||
},
|
||||
want: &chronograf.Organization{
|
||||
Name: "The Bad Place",
|
||||
},
|
||||
addFirst: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
client, err := NewTestClient()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := client.Open(context.TODO()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer client.Close()
|
||||
s := client.OrganizationsStore
|
||||
|
||||
if tt.addFirst {
|
||||
fmt.Println(tt.args.org)
|
||||
tt.args.org, err = s.Add(tt.args.ctx, tt.args.org)
|
||||
fmt.Println(tt.args.org)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
if tt.args.name != "" {
|
||||
tt.args.org.Name = tt.args.name
|
||||
}
|
||||
|
||||
if err := s.Update(tt.args.ctx, tt.args.org); (err != nil) != tt.wantErr {
|
||||
t.Errorf("%q. OrganizationsStore.Update() error = %v, wantErr %v", tt.name, err, tt.wantErr)
|
||||
}
|
||||
|
||||
// for the empty test
|
||||
if tt.want == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
got, err := s.Get(tt.args.ctx, chronograf.OrganizationQuery{Name: &tt.args.org.Name})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to get organization: %v", err)
|
||||
}
|
||||
if diff := cmp.Diff(got, tt.want, orgCmpOptions...); diff != "" {
|
||||
t.Errorf("%q. OrganizationsStore.Update():\n-got/+want\ndiff %s", tt.name, diff)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizationStore_Delete(t *testing.T) {
|
||||
type args struct {
|
||||
ctx context.Context
|
||||
org *chronograf.Organization
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
addFirst bool
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "No such organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{
|
||||
ID: 10,
|
||||
},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Delete new organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
org: &chronograf.Organization{
|
||||
Name: "The Deleted Place",
|
||||
},
|
||||
},
|
||||
addFirst: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
client, err := NewTestClient()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := client.Open(context.TODO()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer client.Close()
|
||||
s := client.OrganizationsStore
|
||||
|
||||
if tt.addFirst {
|
||||
tt.args.org, _ = s.Add(tt.args.ctx, tt.args.org)
|
||||
}
|
||||
if err := s.Delete(tt.args.ctx, tt.args.org); (err != nil) != tt.wantErr {
|
||||
t.Errorf("%q. OrganizationsStore.Delete() error = %v, wantErr %v", tt.name, err, tt.wantErr)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -747,6 +747,7 @@ type LayoutStore interface {
|
|||
|
||||
// Organization is a group of resources under a common name
|
||||
type Organization struct {
|
||||
ID uint64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
SourcesStore SourcesStore
|
||||
ServersStore ServersStore
|
||||
|
@ -754,6 +755,13 @@ type Organization struct {
|
|||
UsersStore UsersStore
|
||||
}
|
||||
|
||||
// OrganizationQuery represents the attributes that a user may be retrieved by.
|
||||
// It is predominantly used in the OrganizationsStore.Get method.
|
||||
type OrganizationQuery struct {
|
||||
ID *uint64
|
||||
Name *string
|
||||
}
|
||||
|
||||
// OrganizationsStore is the storage and retrieval of Organizations
|
||||
type OrganizationsStore interface {
|
||||
// Add creates a new Organization
|
||||
|
@ -763,7 +771,7 @@ type OrganizationsStore interface {
|
|||
// Delete removes an Organization from the OrganizationsStore
|
||||
Delete(context.Context, *Organization) error
|
||||
// Get retrieves an Organization from the OrganizationsStore
|
||||
Get(context.Context, string) (*Organization, error)
|
||||
Get(context.Context, OrganizationQuery) (*Organization, error)
|
||||
// Update updates an Organization in the OrganizationsStore
|
||||
Update(context.Context, *Organization) error
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue