Change OrganizationID to Organization in Roles
Fix formatting of proto filepull/5028/head
Michael Desa
parent
0a5da8a750
commit
20c61a76e4
|
|
@ -420,8 +420,8 @@ func MarshalUser(u *chronograf.User) ([]byte, error) {
|
|||
roles := make([]*Role, len(u.Roles))
|
||||
for i, role := range u.Roles {
|
||||
roles[i] = &Role{
|
||||
OrganizationID: role.OrganizationID,
|
||||
Name: role.Name,
|
||||
Organization: role.Organization,
|
||||
Name: role.Name,
|
||||
}
|
||||
}
|
||||
return MarshalUserPB(&User{
|
||||
|
|
@ -449,8 +449,8 @@ func UnmarshalUser(data []byte, u *chronograf.User) error {
|
|||
roles := make([]chronograf.Role, len(pb.Roles))
|
||||
for i, role := range pb.Roles {
|
||||
roles[i] = chronograf.Role{
|
||||
OrganizationID: role.OrganizationID,
|
||||
Name: role.Name,
|
||||
Organization: role.Organization,
|
||||
Name: role.Name,
|
||||
}
|
||||
}
|
||||
u.ID = pb.ID
|
||||
|
|
@ -474,8 +474,8 @@ func UnmarshalUserPB(data []byte, u *User) error {
|
|||
// MarshalOrganization encodes a organization to binary protobuf format.
|
||||
func MarshalRole(r *chronograf.Role) ([]byte, error) {
|
||||
return MarshalRolePB(&Role{
|
||||
OrganizationID: r.OrganizationID,
|
||||
Name: r.Name,
|
||||
Organization: r.Organization,
|
||||
Name: r.Name,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -490,7 +490,7 @@ func UnmarshalRole(data []byte, r *chronograf.Role) error {
|
|||
if err := UnmarshalRolePB(data, &pb); err != nil {
|
||||
return err
|
||||
}
|
||||
r.OrganizationID = pb.OrganizationID
|
||||
r.Organization = pb.Organization
|
||||
r.Name = pb.Name
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -325,8 +325,8 @@ func (m *User) GetRoles() []*Role {
|
|||
}
|
||||
|
||||
type Role struct {
|
||||
OrganizationID string `protobuf:"bytes,1,opt,name=OrganizationID,proto3" json:"OrganizationID,omitempty"`
|
||||
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
Organization string `protobuf:"bytes,1,opt,name=Organization,proto3" json:"Organization,omitempty"`
|
||||
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Role) Reset() { *m = Role{} }
|
||||
|
|
@ -334,6 +334,20 @@ func (m *Role) String() string { return proto.CompactTextString(m) }
|
|||
func (*Role) ProtoMessage() {}
|
||||
func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{14} }
|
||||
|
||||
func (m *Role) GetOrganization() string {
|
||||
if m != nil {
|
||||
return m.Organization
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *Role) GetName() string {
|
||||
if m != nil {
|
||||
return m.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type Organization struct {
|
||||
ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
||||
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
|
|
@ -366,75 +380,75 @@ func init() {
|
|||
func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
|
||||
|
||||
var fileDescriptorInternal = []byte{
|
||||
// 1111 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x8f, 0xdb, 0x44,
|
||||
0x14, 0x96, 0x63, 0x3b, 0x89, 0x5f, 0xb6, 0x0b, 0x1a, 0x55, 0xd4, 0x94, 0x4b, 0xb0, 0x00, 0x05,
|
||||
0x89, 0x2e, 0xa8, 0x15, 0x12, 0xe2, 0x96, 0xdd, 0xa0, 0x6a, 0xd9, 0x6d, 0xbb, 0x4c, 0x76, 0x97,
|
||||
0x13, 0xaa, 0x26, 0xce, 0x4b, 0x62, 0xd5, 0x89, 0xcd, 0xd8, 0xde, 0x8d, 0x39, 0xf3, 0x8f, 0x70,
|
||||
0xe5, 0x88, 0xb8, 0x23, 0x71, 0x42, 0x3d, 0xf2, 0x17, 0xa1, 0x37, 0x33, 0x76, 0x9c, 0x26, 0x54,
|
||||
0x7b, 0x81, 0xdb, 0x7c, 0xef, 0x8d, 0xdf, 0xbc, 0x1f, 0xdf, 0xfb, 0x64, 0x38, 0x8c, 0x56, 0x39,
|
||||
0xca, 0x95, 0x88, 0x8f, 0x52, 0x99, 0xe4, 0x09, 0xeb, 0x56, 0x38, 0xf8, 0xbb, 0x05, 0xed, 0x71,
|
||||
0x52, 0xc8, 0x10, 0xd9, 0x21, 0xb4, 0x4e, 0x47, 0xbe, 0xd5, 0xb7, 0x06, 0x36, 0x6f, 0x9d, 0x8e,
|
||||
0x18, 0x03, 0xe7, 0xb9, 0x58, 0xa2, 0xdf, 0xea, 0x5b, 0x03, 0x8f, 0xab, 0x33, 0xd9, 0x2e, 0xcb,
|
||||
0x14, 0x7d, 0x5b, 0xdb, 0xe8, 0xcc, 0x1e, 0x42, 0xf7, 0x2a, 0xa3, 0x68, 0x4b, 0xf4, 0x1d, 0x65,
|
||||
0xaf, 0x31, 0xf9, 0x2e, 0x44, 0x96, 0xdd, 0x26, 0x72, 0xea, 0xbb, 0xda, 0x57, 0x61, 0xf6, 0x2e,
|
||||
0xd8, 0x57, 0xfc, 0xdc, 0x6f, 0x2b, 0x33, 0x1d, 0x99, 0x0f, 0x9d, 0x11, 0xce, 0x44, 0x11, 0xe7,
|
||||
0x7e, 0xa7, 0x6f, 0x0d, 0xba, 0xbc, 0x82, 0x14, 0xe7, 0x12, 0x63, 0x9c, 0x4b, 0x31, 0xf3, 0xbb,
|
||||
0x3a, 0x4e, 0x85, 0xd9, 0x11, 0xb0, 0xd3, 0x55, 0x86, 0x61, 0x21, 0x71, 0xfc, 0x2a, 0x4a, 0xaf,
|
||||
0x51, 0x46, 0xb3, 0xd2, 0xf7, 0x54, 0x80, 0x3d, 0x1e, 0x7a, 0xe5, 0x19, 0xe6, 0x82, 0xde, 0x06,
|
||||
0x15, 0xaa, 0x82, 0x2c, 0x80, 0x83, 0xf1, 0x42, 0x48, 0x9c, 0x8e, 0x31, 0x94, 0x98, 0xfb, 0x3d,
|
||||
0xe5, 0xde, 0xb2, 0xd1, 0x9d, 0x17, 0x72, 0x2e, 0x56, 0xd1, 0x4f, 0x22, 0x8f, 0x92, 0x95, 0x7f,
|
||||
0xa0, 0xef, 0x34, 0x6d, 0xc1, 0xef, 0x16, 0x78, 0x23, 0x91, 0x2d, 0x26, 0x89, 0x90, 0xd3, 0x3b,
|
||||
0xf5, 0xf5, 0x11, 0xb8, 0x21, 0xc6, 0x71, 0xe6, 0xdb, 0x7d, 0x7b, 0xd0, 0x7b, 0xfc, 0xe0, 0xa8,
|
||||
0x1e, 0x58, 0x1d, 0xe7, 0x04, 0xe3, 0x98, 0xeb, 0x5b, 0xec, 0x0b, 0xf0, 0x72, 0x5c, 0xa6, 0xb1,
|
||||
0xc8, 0x31, 0xf3, 0x1d, 0xf5, 0x09, 0xdb, 0x7c, 0x72, 0x69, 0x5c, 0x7c, 0x73, 0x69, 0x27, 0x6d,
|
||||
0x77, 0x4f, 0xda, 0xbf, 0xb6, 0xe0, 0xde, 0xd6, 0x73, 0xec, 0x00, 0xac, 0xb5, 0xca, 0xdc, 0xe5,
|
||||
0xd6, 0x9a, 0x50, 0xa9, 0xb2, 0x76, 0xb9, 0x55, 0x12, 0xba, 0x55, 0x3c, 0x70, 0xb9, 0x75, 0x4b,
|
||||
0x68, 0xa1, 0xa6, 0xef, 0x72, 0x6b, 0xc1, 0x3e, 0x85, 0xce, 0x8f, 0x05, 0xca, 0x08, 0x33, 0xdf,
|
||||
0x55, 0xd9, 0xbd, 0xb3, 0xc9, 0xee, 0xbb, 0x02, 0x65, 0xc9, 0x2b, 0x3f, 0x75, 0x43, 0x31, 0x47,
|
||||
0xd3, 0x40, 0x9d, 0xc9, 0x96, 0x13, 0xcb, 0x3a, 0xda, 0x46, 0x67, 0xd3, 0x45, 0x3d, 0x7b, 0xea,
|
||||
0xe2, 0x97, 0xe0, 0x88, 0x35, 0x66, 0xbe, 0xa7, 0xe2, 0x7f, 0xf8, 0x2f, 0x0d, 0x3b, 0x1a, 0xae,
|
||||
0x31, 0xfb, 0x66, 0x95, 0xcb, 0x92, 0xab, 0xeb, 0x0f, 0x9f, 0x82, 0x57, 0x9b, 0x88, 0x81, 0xaf,
|
||||
0xb0, 0x54, 0x05, 0x7a, 0x9c, 0x8e, 0xec, 0x23, 0x70, 0x6f, 0x44, 0x5c, 0xe8, 0xe1, 0xf4, 0x1e,
|
||||
0x1f, 0x6e, 0xc2, 0x0e, 0xd7, 0x51, 0xc6, 0xb5, 0xf3, 0xeb, 0xd6, 0x57, 0x56, 0xf0, 0x9b, 0x05,
|
||||
0x0e, 0xd9, 0xa8, 0xb3, 0x31, 0xce, 0x45, 0x58, 0x1e, 0x27, 0xc5, 0x6a, 0x9a, 0xf9, 0x56, 0xdf,
|
||||
0x1e, 0xd8, 0x7c, 0xcb, 0xc6, 0xde, 0x83, 0xf6, 0x44, 0x7b, 0x5b, 0x7d, 0x7b, 0xe0, 0x71, 0x83,
|
||||
0xd8, 0x7d, 0x70, 0x63, 0x31, 0xc1, 0xd8, 0xec, 0x93, 0x06, 0x74, 0x3b, 0x95, 0x38, 0x8b, 0xd6,
|
||||
0x66, 0x9d, 0x0c, 0x22, 0x7b, 0x56, 0xcc, 0xc8, 0xae, 0xa7, 0x67, 0x10, 0xb5, 0x6b, 0x22, 0xb2,
|
||||
0xba, 0x85, 0x74, 0xa6, 0xc8, 0x59, 0x28, 0xe2, 0xaa, 0x87, 0x1a, 0x04, 0x7f, 0x58, 0xb4, 0x47,
|
||||
0x9a, 0x13, 0x0d, 0x5e, 0xea, 0x8e, 0xbe, 0x0f, 0x5d, 0xe2, 0xcb, 0xcb, 0x1b, 0x21, 0x0d, 0x37,
|
||||
0x3b, 0x84, 0xaf, 0x85, 0x64, 0x9f, 0x43, 0x5b, 0x55, 0xbe, 0x87, 0x9f, 0x55, 0xb8, 0x6b, 0xf2,
|
||||
0x73, 0x73, 0xad, 0x9e, 0xa0, 0xd3, 0x98, 0x60, 0x5d, 0xac, 0xdb, 0x2c, 0xf6, 0x11, 0xb8, 0x44,
|
||||
0x85, 0x52, 0x65, 0xbf, 0x37, 0xb2, 0x26, 0x8c, 0xbe, 0x15, 0x5c, 0xc1, 0xbd, 0xad, 0x17, 0xeb,
|
||||
0x97, 0xac, 0xed, 0x97, 0x36, 0x53, 0xf4, 0xcc, 0xd4, 0x48, 0x43, 0x32, 0x8c, 0x31, 0xcc, 0x71,
|
||||
0xaa, 0xfa, 0xdd, 0xe5, 0x35, 0x0e, 0x7e, 0xb1, 0x36, 0x71, 0xd5, 0x7b, 0xa4, 0x12, 0x61, 0xb2,
|
||||
0x5c, 0x8a, 0xd5, 0xd4, 0x84, 0xae, 0x20, 0xf5, 0x6d, 0x3a, 0x31, 0xa1, 0x5b, 0xd3, 0x09, 0x61,
|
||||
0x99, 0x9a, 0x09, 0xb6, 0x64, 0xca, 0xfa, 0xd0, 0x5b, 0xa2, 0xc8, 0x0a, 0x89, 0x4b, 0x5c, 0xe5,
|
||||
0xa6, 0x05, 0x4d, 0x13, 0x7b, 0x00, 0x9d, 0x5c, 0xcc, 0x5f, 0x12, 0xf7, 0xcc, 0x24, 0x73, 0x31,
|
||||
0x3f, 0xc3, 0x92, 0x7d, 0x00, 0xde, 0x2c, 0xc2, 0x78, 0xaa, 0x5c, 0x7a, 0x9c, 0x5d, 0x65, 0x38,
|
||||
0xc3, 0x32, 0xf8, 0xcb, 0x82, 0xf6, 0x18, 0xe5, 0x0d, 0xca, 0x3b, 0x49, 0x4a, 0x53, 0x96, 0xed,
|
||||
0xb7, 0xc8, 0xb2, 0xb3, 0x5f, 0x96, 0xdd, 0x8d, 0x2c, 0xdf, 0x07, 0x77, 0x2c, 0xc3, 0xd3, 0x91,
|
||||
0xca, 0xc8, 0xe6, 0x1a, 0x10, 0x1b, 0x87, 0x61, 0x1e, 0xdd, 0xa0, 0xd1, 0x6a, 0x83, 0x76, 0x94,
|
||||
0xa6, 0xbb, 0x47, 0x69, 0xfe, 0xb4, 0xa0, 0x7d, 0x2e, 0xca, 0xa4, 0xc8, 0x77, 0x58, 0xd8, 0x87,
|
||||
0xde, 0x30, 0x4d, 0xe3, 0x28, 0xd4, 0x5f, 0xeb, 0x8a, 0x9a, 0x26, 0xba, 0xf1, 0xac, 0xd1, 0x5f,
|
||||
0x5d, 0x5b, 0xd3, 0x44, 0x5b, 0x7c, 0xa2, 0xd4, 0x54, 0x4b, 0x63, 0x63, 0x8b, 0xb5, 0x88, 0x2a,
|
||||
0x27, 0x35, 0x61, 0x58, 0xe4, 0xc9, 0x2c, 0x4e, 0x6e, 0x55, 0xb5, 0x5d, 0x5e, 0xe3, 0x9d, 0x22,
|
||||
0x3a, 0x7b, 0x8a, 0x78, 0xdd, 0x02, 0xe7, 0xff, 0x52, 0xc9, 0x03, 0xb0, 0x22, 0x43, 0x08, 0x2b,
|
||||
0xaa, 0x35, 0xb3, 0xd3, 0xd0, 0x4c, 0x1f, 0x3a, 0xa5, 0x14, 0xab, 0x39, 0x66, 0x7e, 0x57, 0x29,
|
||||
0x50, 0x05, 0x95, 0x47, 0xed, 0x9a, 0x16, 0x4b, 0x8f, 0x57, 0xb0, 0xde, 0x1d, 0x68, 0xec, 0xce,
|
||||
0x67, 0x46, 0x57, 0x7b, 0x2a, 0x23, 0x7f, 0xbb, 0x75, 0xff, 0x9d, 0x9c, 0xbe, 0xb6, 0xc0, 0xad,
|
||||
0x17, 0xef, 0x64, 0x7b, 0xf1, 0x4e, 0x36, 0x8b, 0x37, 0x3a, 0xae, 0x16, 0x6f, 0x74, 0x4c, 0x98,
|
||||
0x5f, 0x54, 0x8b, 0xc7, 0x2f, 0x68, 0xa0, 0x4f, 0x65, 0x52, 0xa4, 0xc7, 0xa5, 0x9e, 0xbc, 0xc7,
|
||||
0x6b, 0x4c, 0x6c, 0xfd, 0x7e, 0x81, 0xd2, 0xb4, 0xda, 0xe3, 0x06, 0x11, 0xb7, 0xcf, 0x95, 0x28,
|
||||
0xe9, 0xe6, 0x6a, 0xc0, 0x3e, 0x06, 0x97, 0x53, 0xf3, 0x54, 0x87, 0xb7, 0xe6, 0xa2, 0xcc, 0x5c,
|
||||
0x7b, 0x29, 0xa8, 0xfe, 0x77, 0x32, 0x24, 0x37, 0x28, 0x78, 0x62, 0x3e, 0xa7, 0xe8, 0x57, 0x69,
|
||||
0x8a, 0xd2, 0xac, 0xaa, 0x06, 0xea, 0xcd, 0xe4, 0x16, 0xb5, 0xca, 0xda, 0x5c, 0x83, 0xe0, 0x07,
|
||||
0xf0, 0x86, 0x31, 0xca, 0x9c, 0x17, 0xf1, 0xae, 0x36, 0x33, 0x70, 0xbe, 0x1d, 0xbf, 0x78, 0x5e,
|
||||
0x2d, 0x38, 0x9d, 0x37, 0x6b, 0x69, 0xbf, 0xb1, 0x96, 0x67, 0x22, 0x15, 0xa7, 0x23, 0xc5, 0x33,
|
||||
0x9b, 0x1b, 0x14, 0xfc, 0x6c, 0x81, 0x43, 0xfb, 0xdf, 0x08, 0xed, 0xbc, 0x4d, 0x3b, 0x2e, 0x64,
|
||||
0x72, 0x13, 0x4d, 0x51, 0x56, 0xda, 0x51, 0x61, 0x55, 0x74, 0xb8, 0xc0, 0xfa, 0x67, 0xcf, 0x20,
|
||||
0x9a, 0x35, 0x4f, 0xe2, 0x9a, 0xcb, 0x8d, 0x59, 0x93, 0x99, 0x6b, 0x67, 0x70, 0x0c, 0x0e, 0x1d,
|
||||
0xd8, 0x27, 0x70, 0xd8, 0x5c, 0xa6, 0xba, 0xd8, 0x37, 0xac, 0xfb, 0xb2, 0x0b, 0x1e, 0x6f, 0x2f,
|
||||
0xe7, 0x5d, 0x2a, 0x9a, 0xb4, 0xd5, 0x8f, 0xef, 0x93, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc3,
|
||||
0xf4, 0xb2, 0x6a, 0x0a, 0x0b, 0x00, 0x00,
|
||||
// 1109 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xe3, 0xc4,
|
||||
0x17, 0x97, 0x63, 0x3b, 0x89, 0x5f, 0xba, 0xfd, 0x7e, 0x35, 0x5a, 0xb1, 0x66, 0xb9, 0x04, 0x0b,
|
||||
0xa4, 0x20, 0xb1, 0x05, 0x75, 0x85, 0x84, 0x38, 0x20, 0xa5, 0x0d, 0x5a, 0x95, 0x76, 0x77, 0xcb,
|
||||
0xa4, 0x2d, 0x27, 0xb4, 0x9a, 0x38, 0x2f, 0x89, 0xb5, 0x4e, 0x6c, 0xc6, 0x76, 0x1b, 0x73, 0xe6,
|
||||
0x1f, 0xe1, 0xca, 0x11, 0x71, 0x47, 0xe2, 0x84, 0xf6, 0xc8, 0x5f, 0x84, 0xde, 0xcc, 0xd8, 0x71,
|
||||
0x48, 0x58, 0xf5, 0x02, 0xb7, 0xf9, 0xbc, 0x37, 0x7e, 0xf3, 0x7e, 0x7d, 0x3e, 0x32, 0x1c, 0x46,
|
||||
0xab, 0x1c, 0xe5, 0x4a, 0xc4, 0x47, 0xa9, 0x4c, 0xf2, 0x84, 0x75, 0x2b, 0x1c, 0xfc, 0xd9, 0x82,
|
||||
0xf6, 0x38, 0x29, 0x64, 0x88, 0xec, 0x10, 0x5a, 0x67, 0x23, 0xdf, 0xea, 0x5b, 0x03, 0x9b, 0xb7,
|
||||
0xce, 0x46, 0x8c, 0x81, 0xf3, 0x42, 0x2c, 0xd1, 0x6f, 0xf5, 0xad, 0x81, 0xc7, 0xd5, 0x99, 0x6c,
|
||||
0x57, 0x65, 0x8a, 0xbe, 0xad, 0x6d, 0x74, 0x66, 0x8f, 0xa1, 0x7b, 0x9d, 0x51, 0xb4, 0x25, 0xfa,
|
||||
0x8e, 0xb2, 0xd7, 0x98, 0x7c, 0x97, 0x22, 0xcb, 0xee, 0x12, 0x39, 0xf5, 0x5d, 0xed, 0xab, 0x30,
|
||||
0xfb, 0x3f, 0xd8, 0xd7, 0xfc, 0xc2, 0x6f, 0x2b, 0x33, 0x1d, 0x99, 0x0f, 0x9d, 0x11, 0xce, 0x44,
|
||||
0x11, 0xe7, 0x7e, 0xa7, 0x6f, 0x0d, 0xba, 0xbc, 0x82, 0x14, 0xe7, 0x0a, 0x63, 0x9c, 0x4b, 0x31,
|
||||
0xf3, 0xbb, 0x3a, 0x4e, 0x85, 0xd9, 0x11, 0xb0, 0xb3, 0x55, 0x86, 0x61, 0x21, 0x71, 0xfc, 0x3a,
|
||||
0x4a, 0x6f, 0x50, 0x46, 0xb3, 0xd2, 0xf7, 0x54, 0x80, 0x3d, 0x1e, 0x7a, 0xe5, 0x39, 0xe6, 0x82,
|
||||
0xde, 0x06, 0x15, 0xaa, 0x82, 0x2c, 0x80, 0x83, 0xf1, 0x42, 0x48, 0x9c, 0x8e, 0x31, 0x94, 0x98,
|
||||
0xfb, 0x3d, 0xe5, 0xde, 0xb2, 0xd1, 0x9d, 0x97, 0x72, 0x2e, 0x56, 0xd1, 0x0f, 0x22, 0x8f, 0x92,
|
||||
0x95, 0x7f, 0xa0, 0xef, 0x34, 0x6d, 0xc1, 0xaf, 0x16, 0x78, 0x23, 0x91, 0x2d, 0x26, 0x89, 0x90,
|
||||
0xd3, 0x7b, 0xf5, 0xf5, 0x09, 0xb8, 0x21, 0xc6, 0x71, 0xe6, 0xdb, 0x7d, 0x7b, 0xd0, 0x3b, 0x7e,
|
||||
0x74, 0x54, 0x0f, 0xac, 0x8e, 0x73, 0x8a, 0x71, 0xcc, 0xf5, 0x2d, 0xf6, 0x29, 0x78, 0x39, 0x2e,
|
||||
0xd3, 0x58, 0xe4, 0x98, 0xf9, 0x8e, 0xfa, 0x84, 0x6d, 0x3e, 0xb9, 0x32, 0x2e, 0xbe, 0xb9, 0xb4,
|
||||
0x93, 0xb6, 0xbb, 0x27, 0xed, 0x9f, 0x5b, 0xf0, 0x60, 0xeb, 0x39, 0x76, 0x00, 0xd6, 0x5a, 0x65,
|
||||
0xee, 0x72, 0x6b, 0x4d, 0xa8, 0x54, 0x59, 0xbb, 0xdc, 0x2a, 0x09, 0xdd, 0xa9, 0x3d, 0x70, 0xb9,
|
||||
0x75, 0x47, 0x68, 0xa1, 0xa6, 0xef, 0x72, 0x6b, 0xc1, 0x3e, 0x82, 0xce, 0xf7, 0x05, 0xca, 0x08,
|
||||
0x33, 0xdf, 0x55, 0xd9, 0xfd, 0x6f, 0x93, 0xdd, 0x37, 0x05, 0xca, 0x92, 0x57, 0x7e, 0xea, 0x86,
|
||||
0xda, 0x1c, 0xbd, 0x06, 0xea, 0x4c, 0xb6, 0x9c, 0xb6, 0xac, 0xa3, 0x6d, 0x74, 0x36, 0x5d, 0xd4,
|
||||
0xb3, 0xa7, 0x2e, 0x7e, 0x06, 0x8e, 0x58, 0x63, 0xe6, 0x7b, 0x2a, 0xfe, 0xfb, 0xff, 0xd0, 0xb0,
|
||||
0xa3, 0xe1, 0x1a, 0xb3, 0xaf, 0x56, 0xb9, 0x2c, 0xb9, 0xba, 0xfe, 0xf8, 0x19, 0x78, 0xb5, 0x89,
|
||||
0x36, 0xf0, 0x35, 0x96, 0xaa, 0x40, 0x8f, 0xd3, 0x91, 0x7d, 0x00, 0xee, 0xad, 0x88, 0x0b, 0x3d,
|
||||
0x9c, 0xde, 0xf1, 0xe1, 0x26, 0xec, 0x70, 0x1d, 0x65, 0x5c, 0x3b, 0xbf, 0x68, 0x7d, 0x6e, 0x05,
|
||||
0xbf, 0x58, 0xe0, 0x90, 0x8d, 0x3a, 0x1b, 0xe3, 0x5c, 0x84, 0xe5, 0x49, 0x52, 0xac, 0xa6, 0x99,
|
||||
0x6f, 0xf5, 0xed, 0x81, 0xcd, 0xb7, 0x6c, 0xec, 0x1d, 0x68, 0x4f, 0xb4, 0xb7, 0xd5, 0xb7, 0x07,
|
||||
0x1e, 0x37, 0x88, 0x3d, 0x04, 0x37, 0x16, 0x13, 0x8c, 0x0d, 0x9f, 0x34, 0xa0, 0xdb, 0xa9, 0xc4,
|
||||
0x59, 0xb4, 0x36, 0x74, 0x32, 0x88, 0xec, 0x59, 0x31, 0x23, 0xbb, 0x9e, 0x9e, 0x41, 0xd4, 0xae,
|
||||
0x89, 0xc8, 0xea, 0x16, 0xd2, 0x99, 0x22, 0x67, 0xa1, 0x88, 0xab, 0x1e, 0x6a, 0x10, 0xfc, 0x66,
|
||||
0x11, 0x8f, 0xf4, 0x4e, 0x34, 0xf6, 0x52, 0x77, 0xf4, 0x5d, 0xe8, 0xd2, 0xbe, 0xbc, 0xba, 0x15,
|
||||
0xd2, 0xec, 0x66, 0x87, 0xf0, 0x8d, 0x90, 0xec, 0x13, 0x68, 0xab, 0xca, 0xf7, 0xec, 0x67, 0x15,
|
||||
0xee, 0x86, 0xfc, 0xdc, 0x5c, 0xab, 0x27, 0xe8, 0x34, 0x26, 0x58, 0x17, 0xeb, 0x36, 0x8b, 0x7d,
|
||||
0x02, 0x2e, 0xad, 0x42, 0xa9, 0xb2, 0xdf, 0x1b, 0x59, 0x2f, 0x8c, 0xbe, 0x15, 0x5c, 0xc3, 0x83,
|
||||
0xad, 0x17, 0xeb, 0x97, 0xac, 0xed, 0x97, 0x36, 0x53, 0xf4, 0xcc, 0xd4, 0x48, 0x43, 0x32, 0x8c,
|
||||
0x31, 0xcc, 0x71, 0xaa, 0xfa, 0xdd, 0xe5, 0x35, 0x0e, 0x7e, 0xb2, 0x36, 0x71, 0xd5, 0x7b, 0xa4,
|
||||
0x12, 0x61, 0xb2, 0x5c, 0x8a, 0xd5, 0xd4, 0x84, 0xae, 0x20, 0xf5, 0x6d, 0x3a, 0x31, 0xa1, 0x5b,
|
||||
0xd3, 0x09, 0x61, 0x99, 0x9a, 0x09, 0xb6, 0x64, 0xca, 0xfa, 0xd0, 0x5b, 0xa2, 0xc8, 0x0a, 0x89,
|
||||
0x4b, 0x5c, 0xe5, 0xa6, 0x05, 0x4d, 0x13, 0x7b, 0x04, 0x9d, 0x5c, 0xcc, 0x5f, 0xd1, 0xee, 0x99,
|
||||
0x49, 0xe6, 0x62, 0x7e, 0x8e, 0x25, 0x7b, 0x0f, 0xbc, 0x59, 0x84, 0xf1, 0x54, 0xb9, 0xf4, 0x38,
|
||||
0xbb, 0xca, 0x70, 0x8e, 0x65, 0xf0, 0x87, 0x05, 0xed, 0x31, 0xca, 0x5b, 0x94, 0xf7, 0x92, 0x94,
|
||||
0xa6, 0x2c, 0xdb, 0x6f, 0x91, 0x65, 0x67, 0xbf, 0x2c, 0xbb, 0x1b, 0x59, 0x7e, 0x08, 0xee, 0x58,
|
||||
0x86, 0x67, 0x23, 0x95, 0x91, 0xcd, 0x35, 0xa0, 0x6d, 0x1c, 0x86, 0x79, 0x74, 0x8b, 0x46, 0xab,
|
||||
0x0d, 0xda, 0x51, 0x9a, 0xee, 0x1e, 0xa5, 0xf9, 0xdd, 0x82, 0xf6, 0x85, 0x28, 0x93, 0x22, 0xdf,
|
||||
0xd9, 0xc2, 0x3e, 0xf4, 0x86, 0x69, 0x1a, 0x47, 0xa1, 0xfe, 0x5a, 0x57, 0xd4, 0x34, 0xd1, 0x8d,
|
||||
0xe7, 0x8d, 0xfe, 0xea, 0xda, 0x9a, 0x26, 0x62, 0xf1, 0xa9, 0x52, 0x53, 0x2d, 0x8d, 0x0d, 0x16,
|
||||
0x6b, 0x11, 0x55, 0x4e, 0x6a, 0xc2, 0xb0, 0xc8, 0x93, 0x59, 0x9c, 0xdc, 0xa9, 0x6a, 0xbb, 0xbc,
|
||||
0xc6, 0x3b, 0x45, 0xb4, 0xf7, 0x14, 0xf1, 0xa6, 0x05, 0xce, 0x7f, 0xa5, 0x92, 0x07, 0x60, 0x45,
|
||||
0x26, 0x09, 0x2b, 0xaa, 0x35, 0xb3, 0xd3, 0xd0, 0x4c, 0x1f, 0x3a, 0xa5, 0x14, 0xab, 0x39, 0x66,
|
||||
0x7e, 0x57, 0x29, 0x50, 0x05, 0x95, 0x47, 0x71, 0x4d, 0x8b, 0xa5, 0xc7, 0x2b, 0x58, 0x73, 0x07,
|
||||
0x1a, 0xdc, 0xf9, 0xd8, 0xe8, 0x6a, 0x4f, 0x65, 0xe4, 0x6f, 0xb7, 0xee, 0xdf, 0x93, 0xd3, 0x37,
|
||||
0x16, 0xb8, 0x35, 0xf1, 0x4e, 0xb7, 0x89, 0x77, 0xba, 0x21, 0xde, 0xe8, 0xa4, 0x22, 0xde, 0xe8,
|
||||
0x84, 0x30, 0xbf, 0xac, 0x88, 0xc7, 0x2f, 0x69, 0xa0, 0xcf, 0x64, 0x52, 0xa4, 0x27, 0xa5, 0x9e,
|
||||
0xbc, 0xc7, 0x6b, 0x4c, 0xdb, 0xfa, 0xed, 0x02, 0xa5, 0x69, 0xb5, 0xc7, 0x0d, 0xa2, 0xdd, 0xbe,
|
||||
0x50, 0xa2, 0xa4, 0x9b, 0xab, 0x01, 0xfb, 0x10, 0x5c, 0x4e, 0xcd, 0x53, 0x1d, 0xde, 0x9a, 0x8b,
|
||||
0x32, 0x73, 0xed, 0xa5, 0xa0, 0xfa, 0xdf, 0xc9, 0x2c, 0xb9, 0x41, 0xc1, 0x53, 0xf3, 0x39, 0x45,
|
||||
0xbf, 0x4e, 0x53, 0x94, 0x86, 0xaa, 0x1a, 0xa8, 0x37, 0x93, 0x3b, 0xd4, 0x2a, 0x6b, 0x73, 0x0d,
|
||||
0x82, 0xef, 0xc0, 0x1b, 0xc6, 0x28, 0x73, 0x5e, 0xc4, 0xbb, 0xda, 0xcc, 0xc0, 0xf9, 0x7a, 0xfc,
|
||||
0xf2, 0x45, 0x45, 0x70, 0x3a, 0x6f, 0x68, 0x69, 0xff, 0x8d, 0x96, 0xe7, 0x22, 0x15, 0x67, 0x23,
|
||||
0xb5, 0x67, 0x36, 0x37, 0x28, 0xf8, 0xd1, 0x02, 0x87, 0xf8, 0xdf, 0x08, 0xed, 0xbc, 0x4d, 0x3b,
|
||||
0x2e, 0x65, 0x72, 0x1b, 0x4d, 0x51, 0x56, 0xda, 0x51, 0x61, 0x55, 0x74, 0xb8, 0xc0, 0xfa, 0x67,
|
||||
0xcf, 0x20, 0x9a, 0x35, 0x4f, 0xe2, 0x7a, 0x97, 0x1b, 0xb3, 0x26, 0x33, 0xd7, 0xce, 0xe0, 0x4b,
|
||||
0x70, 0xe8, 0xb0, 0x43, 0x30, 0x6b, 0x97, 0x60, 0xfb, 0x32, 0x0b, 0x8e, 0xb7, 0xbf, 0xbb, 0x4f,
|
||||
0x35, 0x93, 0xb6, 0xfa, 0xe9, 0x7d, 0xfa, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xe0, 0x82,
|
||||
0xca, 0x06, 0x0b, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ message Layout {
|
|||
string Measurement = 3; // Measurement is the descriptive name of the time series data.
|
||||
repeated Cell Cells = 4; // Cells are the individual visualization elements.
|
||||
bool Autoflow = 5; // Autoflow indicates whether the frontend should layout the cells automatically.
|
||||
string Organization = 7; // Organization is the organization ID that resource belongs to
|
||||
string Organization = 6; // Organization is the organization ID that resource belongs to
|
||||
}
|
||||
|
||||
message Cell {
|
||||
|
|
@ -136,8 +136,8 @@ message User {
|
|||
}
|
||||
|
||||
message Role {
|
||||
string OrganizationID = 1; // OrganizationID is the ID of the organization that this user has a role in
|
||||
string Name = 2; // Name is the name of the role of this user in the respective organization
|
||||
string Organization = 1; // Organization is the ID of the organization that this user has a role in
|
||||
string Name = 2; // Name is the name of the role of this user in the respective organization
|
||||
}
|
||||
|
||||
message Organization {
|
||||
|
|
|
|||
|
|
@ -33,17 +33,17 @@ func validOrganization(ctx context.Context) (string, error) {
|
|||
return orgID, nil
|
||||
}
|
||||
|
||||
// validOrganizationRoles ensures that each User Role has both an associated OrganizationID and a Name
|
||||
// validOrganizationRoles ensures that each User Role has both an associated Organization and a Name
|
||||
func validOrganizationRoles(orgID string, u *chronograf.User) error {
|
||||
if u == nil || u.Roles == nil {
|
||||
return nil
|
||||
}
|
||||
for _, r := range u.Roles {
|
||||
if r.OrganizationID == "" {
|
||||
return fmt.Errorf("user role must have an OrganizationID")
|
||||
if r.Organization == "" {
|
||||
return fmt.Errorf("user role must have an Organization")
|
||||
}
|
||||
if r.OrganizationID != orgID {
|
||||
return fmt.Errorf("organizationID %s does not match %s", r.OrganizationID, orgID)
|
||||
if r.Organization != orgID {
|
||||
return fmt.Errorf("organizationID %s does not match %s", r.Organization, orgID)
|
||||
}
|
||||
if r.Name == "" {
|
||||
return fmt.Errorf("user role must have a Name")
|
||||
|
|
@ -66,7 +66,7 @@ func (s *OrganizationUsersStore) Get(ctx context.Context, q chronograf.UserQuery
|
|||
// filter Roles that are not scoped to this Organization
|
||||
roles := usr.Roles[:0]
|
||||
for _, r := range usr.Roles {
|
||||
if r.OrganizationID == orgID {
|
||||
if r.Organization == orgID {
|
||||
roles = append(roles, r)
|
||||
}
|
||||
}
|
||||
|
|
@ -120,7 +120,7 @@ func (s *OrganizationUsersStore) Delete(ctx context.Context, usr *chronograf.Use
|
|||
// delete Roles that are not scoped to this Organization
|
||||
roles := u.Roles[:0]
|
||||
for _, r := range u.Roles {
|
||||
if r.OrganizationID != orgID {
|
||||
if r.Organization != orgID {
|
||||
roles = append(roles, r)
|
||||
}
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ func (s *OrganizationUsersStore) Update(ctx context.Context, usr *chronograf.Use
|
|||
// filter Roles that are not scoped to this Organization
|
||||
roles := u.Roles[:0]
|
||||
for _, r := range u.Roles {
|
||||
if r.OrganizationID != orgID {
|
||||
if r.Organization != orgID {
|
||||
roles = append(roles, r)
|
||||
}
|
||||
}
|
||||
|
|
@ -172,7 +172,7 @@ func (s *OrganizationUsersStore) All(ctx context.Context) ([]chronograf.User, er
|
|||
for _, usr := range usrs {
|
||||
roles := usr.Roles[:0]
|
||||
for _, r := range usr.Roles {
|
||||
if r.OrganizationID == orgID {
|
||||
if r.Organization == orgID {
|
||||
roles = append(roles, r)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ func TestOrganizationUsersStore_Get(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
Organization: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -51,8 +51,8 @@ func TestOrganizationUsersStore_Get(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
Organization: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -70,12 +70,12 @@ func TestOrganizationUsersStore_Get(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
Organization: "1338",
|
||||
Name: "The HillBilliettas",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "The BillHilliettos",
|
||||
Organization: "1336",
|
||||
Name: "The BillHilliettos",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -87,8 +87,8 @@ func TestOrganizationUsersStore_Get(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "The BillHilliettos",
|
||||
Organization: "1336",
|
||||
Name: "The BillHilliettos",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -148,8 +148,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "editor",
|
||||
Organization: "1336",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -166,8 +166,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "editor",
|
||||
Organization: "1336",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -179,8 +179,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "editor",
|
||||
Organization: "1336",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -221,8 +221,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "admin",
|
||||
Organization: "1336",
|
||||
Name: "admin",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -233,8 +233,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -246,18 +246,18 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "admin",
|
||||
Organization: "1336",
|
||||
Name: "admin",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "Has invalid Role: missing OrganizationID",
|
||||
name: "Has invalid Role: missing Organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
u: &chronograf.User{
|
||||
|
|
@ -283,7 +283,7 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Organization: "1337",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -304,7 +304,7 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Has invalid OrganizationID",
|
||||
name: "Has invalid Organization",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
u: &chronograf.User{
|
||||
|
|
@ -322,8 +322,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -332,7 +332,7 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "OrganizationID does not match orgID",
|
||||
name: "Organization does not match orgID",
|
||||
args: args{
|
||||
ctx: context.Background(),
|
||||
u: &chronograf.User{
|
||||
|
|
@ -341,8 +341,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -353,8 +353,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -372,7 +372,7 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Organization: "1337",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -383,8 +383,8 @@ func TestOrganizationUsersStore_Add(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -460,12 +460,12 @@ func TestOrganizationUsersStore_Delete(t *testing.T) {
|
|||
Name: "noone",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "The BillHilliettas",
|
||||
Organization: "1338",
|
||||
Name: "The BillHilliettas",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "The HillBilliettas",
|
||||
Organization: "1336",
|
||||
Name: "The HillBilliettas",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -476,8 +476,8 @@ func TestOrganizationUsersStore_Delete(t *testing.T) {
|
|||
Name: "noone",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "The BillHilliettas",
|
||||
Organization: "1338",
|
||||
Name: "The BillHilliettas",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -547,19 +547,19 @@ func TestOrganizationUsersStore_Update(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "viewer",
|
||||
Organization: "1338",
|
||||
Name: "viewer",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "viewer",
|
||||
Organization: "1337",
|
||||
Name: "viewer",
|
||||
},
|
||||
},
|
||||
},
|
||||
roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
orgID: "1338",
|
||||
|
|
@ -570,8 +570,8 @@ func TestOrganizationUsersStore_Update(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -581,12 +581,12 @@ func TestOrganizationUsersStore_Update(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "viewer",
|
||||
Organization: "1337",
|
||||
Name: "viewer",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -662,12 +662,12 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "viewer",
|
||||
Organization: "1338",
|
||||
Name: "viewer",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "viewer",
|
||||
Organization: "1336",
|
||||
Name: "viewer",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -677,8 +677,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -688,8 +688,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -707,8 +707,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "viewer",
|
||||
Organization: "1338",
|
||||
Name: "viewer",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -718,8 +718,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -731,12 +731,12 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "viewer",
|
||||
Organization: "1338",
|
||||
Name: "viewer",
|
||||
},
|
||||
{
|
||||
OrganizationID: "1336",
|
||||
Name: "viewer",
|
||||
Organization: "1336",
|
||||
Name: "viewer",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -746,8 +746,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1337",
|
||||
Name: "editor",
|
||||
Organization: "1337",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -757,8 +757,8 @@ func TestOrganizationUsersStore_All(t *testing.T) {
|
|||
Scheme: "oauth2",
|
||||
Roles: []chronograf.Role{
|
||||
{
|
||||
OrganizationID: "1338",
|
||||
Name: "editor",
|
||||
Organization: "1338",
|
||||
Name: "editor",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -112,10 +112,10 @@ type TimeSeries interface {
|
|||
|
||||
// Role is a restricted set of permissions assigned to a set of users.
|
||||
type Role struct {
|
||||
Name string `json:"name"`
|
||||
Permissions Permissions `json:"permissions,omitempty"`
|
||||
Users []User `json:"users,omitempty"`
|
||||
OrganizationID string `json:"organization,string,omitempty"`
|
||||
Name string `json:"name"`
|
||||
Permissions Permissions `json:"permissions,omitempty"`
|
||||
Users []User `json:"users,omitempty"`
|
||||
Organization string `json:"organization,string,omitempty"`
|
||||
}
|
||||
|
||||
// RolesStore is the Storage and retrieval of authentication information
|
||||
|
|
|
|||
Loading…
Reference in New Issue