diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go index 392825a226..fadb5f5174 100644 --- a/bolt/internal/internal.go +++ b/bolt/internal/internal.go @@ -509,8 +509,9 @@ func UnmarshalRolePB(data []byte, r *Role) 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, + ID: o.ID, + Name: o.Name, + DefaultRole: o.DefaultRole, }) } @@ -527,6 +528,7 @@ func UnmarshalOrganization(data []byte, o *chronograf.Organization) error { } o.ID = pb.ID o.Name = pb.Name + o.DefaultRole = pb.DefaultRole return nil } diff --git a/bolt/internal/internal.pb.go b/bolt/internal/internal.pb.go index 7ed1b0272a..44bbb5ae0b 100644 --- a/bolt/internal/internal.pb.go +++ b/bolt/internal/internal.pb.go @@ -385,8 +385,9 @@ func (m *Role) GetName() string { } 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"` + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"` + DefaultRole string `protobuf:"bytes,3,opt,name=DefaultRole,proto3" json:"DefaultRole,omitempty"` } func (m *Organization) Reset() { *m = Organization{} } @@ -394,6 +395,27 @@ func (m *Organization) String() string { return proto.CompactTextStri func (*Organization) ProtoMessage() {} func (*Organization) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{15} } +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 (m *Organization) GetDefaultRole() string { + if m != nil { + return m.DefaultRole + } + return "" +} + func init() { proto.RegisterType((*Source)(nil), "internal.Source") proto.RegisterType((*Dashboard)(nil), "internal.Dashboard") @@ -416,76 +438,76 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) } var fileDescriptorInternal = []byte{ - // 1123 bytes of a gzipped FileDescriptorProto + // 1133 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x8f, 0xdb, 0x44, - 0x14, 0x96, 0x63, 0x3b, 0x89, 0x5f, 0xb6, 0x05, 0x8d, 0x2a, 0x6a, 0x8a, 0x84, 0x82, 0x05, 0x52, - 0x90, 0xe8, 0x82, 0xb6, 0x42, 0x42, 0x1c, 0x90, 0xb2, 0x1b, 0x54, 0x2d, 0xbb, 0x6d, 0x97, 0xc9, + 0x14, 0x96, 0x63, 0x3b, 0x89, 0x5f, 0xb6, 0x0b, 0x1a, 0x55, 0xd4, 0x14, 0x09, 0x05, 0x0b, 0xa4, + 0x20, 0xd1, 0x05, 0xb5, 0x42, 0x42, 0x1c, 0x90, 0xb2, 0x1b, 0x54, 0x2d, 0xbb, 0x6d, 0x97, 0xc9, 0xee, 0x72, 0x42, 0xd5, 0xc4, 0x79, 0x49, 0xac, 0x3a, 0xb1, 0x19, 0xdb, 0xbb, 0x31, 0xff, 0x0d, 0x12, 0x27, 0x8e, 0x88, 0x3b, 0x12, 0x27, 0xd4, 0x23, 0x7f, 0x11, 0x7a, 0x33, 0x63, 0xc7, 0x21, - 0xa1, 0xda, 0x0b, 0xdc, 0xe6, 0x7b, 0x6f, 0xfc, 0xe6, 0xfd, 0xfa, 0x3e, 0x19, 0xee, 0x47, 0xab, - 0x1c, 0xe5, 0x4a, 0xc4, 0x87, 0xa9, 0x4c, 0xf2, 0x84, 0x75, 0x2b, 0x1c, 0xfc, 0xd5, 0x82, 0xf6, - 0x38, 0x29, 0x64, 0x88, 0xec, 0x3e, 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, 0x41, 0xf7, 0x2a, 0xa3, 0x68, 0x4b, 0xf4, 0x1d, - 0x65, 0xaf, 0x31, 0xf9, 0x2e, 0x44, 0x96, 0xdd, 0x26, 0x72, 0xea, 0xbb, 0xda, 0x57, 0x61, 0xf6, - 0x36, 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, 0x21, 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, 0x8f, 0x22, 0x8f, 0x92, 0x95, - 0x7f, 0xa0, 0xef, 0x34, 0x6d, 0xc1, 0x6f, 0x16, 0x78, 0x23, 0x91, 0x2d, 0x26, 0x89, 0x90, 0xd3, - 0x3b, 0xf5, 0xf5, 0x31, 0xb8, 0x21, 0xc6, 0x71, 0xe6, 0xdb, 0x7d, 0x7b, 0xd0, 0x3b, 0x7a, 0x78, - 0x58, 0x0f, 0xac, 0x8e, 0x73, 0x82, 0x71, 0xcc, 0xf5, 0x2d, 0xf6, 0x19, 0x78, 0x39, 0x2e, 0xd3, - 0x58, 0xe4, 0x98, 0xf9, 0x8e, 0xfa, 0x84, 0x6d, 0x3e, 0xb9, 0x34, 0x2e, 0xbe, 0xb9, 0xb4, 0x93, - 0xb6, 0xbb, 0x27, 0xed, 0x5f, 0x5a, 0x70, 0x6f, 0xeb, 0x39, 0x76, 0x00, 0xd6, 0x5a, 0x65, 0xee, - 0x72, 0x6b, 0x4d, 0xa8, 0x54, 0x59, 0xbb, 0xdc, 0x2a, 0x09, 0xdd, 0xaa, 0x3d, 0x70, 0xb9, 0x75, - 0x4b, 0x68, 0xa1, 0xa6, 0xef, 0x72, 0x6b, 0xc1, 0x3e, 0x86, 0xce, 0x0f, 0x05, 0xca, 0x08, 0x33, - 0xdf, 0x55, 0xd9, 0xbd, 0xb5, 0xc9, 0xee, 0xdb, 0x02, 0x65, 0xc9, 0x2b, 0x3f, 0x75, 0x43, 0x6d, - 0x8e, 0x5e, 0x03, 0x75, 0x26, 0x5b, 0x4e, 0x5b, 0xd6, 0xd1, 0x36, 0x3a, 0x9b, 0x2e, 0xea, 0xd9, - 0x53, 0x17, 0x3f, 0x07, 0x47, 0xac, 0x31, 0xf3, 0x3d, 0x15, 0xff, 0x83, 0x7f, 0x69, 0xd8, 0xe1, - 0x70, 0x8d, 0xd9, 0xd7, 0xab, 0x5c, 0x96, 0x5c, 0x5d, 0x7f, 0xf4, 0x14, 0xbc, 0xda, 0x44, 0x1b, - 0xf8, 0x0a, 0x4b, 0x55, 0xa0, 0xc7, 0xe9, 0xc8, 0x3e, 0x04, 0xf7, 0x46, 0xc4, 0x85, 0x1e, 0x4e, - 0xef, 0xe8, 0xfe, 0x26, 0xec, 0x70, 0x1d, 0x65, 0x5c, 0x3b, 0xbf, 0x6c, 0x7d, 0x61, 0x05, 0xbf, - 0x5a, 0xe0, 0x90, 0x8d, 0x3a, 0x1b, 0xe3, 0x5c, 0x84, 0xe5, 0x71, 0x52, 0xac, 0xa6, 0x99, 0x6f, - 0xf5, 0xed, 0x81, 0xcd, 0xb7, 0x6c, 0xec, 0x1d, 0x68, 0x4f, 0xb4, 0xb7, 0xd5, 0xb7, 0x07, 0x1e, - 0x37, 0x88, 0x3d, 0x00, 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, 0x6e, 0x11, - 0x8f, 0xf4, 0x4e, 0x34, 0xf6, 0x52, 0x77, 0xf4, 0x5d, 0xe8, 0xd2, 0xbe, 0xbc, 0xbc, 0x11, 0xd2, - 0xec, 0x66, 0x87, 0xf0, 0xb5, 0x90, 0xec, 0x53, 0x68, 0xab, 0xca, 0xf7, 0xec, 0x67, 0x15, 0xee, - 0x9a, 0xfc, 0xdc, 0x5c, 0xab, 0x27, 0xe8, 0x34, 0x26, 0x58, 0x17, 0xeb, 0x36, 0x8b, 0x7d, 0x0c, - 0x2e, 0xad, 0x42, 0xa9, 0xb2, 0xdf, 0x1b, 0x59, 0x2f, 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, 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, 0x08, 0x9d, 0x5c, 0xcc, 0x5f, 0xd2, 0xee, 0x99, 0x49, - 0xe6, 0x62, 0x7e, 0x86, 0x25, 0x7b, 0x0f, 0xbc, 0x59, 0x84, 0xf1, 0x54, 0xb9, 0xf4, 0x38, 0xbb, - 0xca, 0x70, 0x86, 0x65, 0xf0, 0xa7, 0x05, 0xed, 0x31, 0xca, 0x1b, 0x94, 0x77, 0x92, 0x94, 0xa6, - 0x2c, 0xdb, 0x6f, 0x90, 0x65, 0x67, 0xbf, 0x2c, 0xbb, 0x1b, 0x59, 0x7e, 0x00, 0xee, 0x58, 0x86, - 0xa7, 0x23, 0x95, 0x91, 0xcd, 0x35, 0xa0, 0x6d, 0x1c, 0x86, 0x79, 0x74, 0x83, 0x46, 0xab, 0x0d, - 0xda, 0x51, 0x9a, 0xee, 0x1e, 0xa5, 0xf9, 0xc3, 0x82, 0xf6, 0xb9, 0x28, 0x93, 0x22, 0xdf, 0xd9, - 0xc2, 0x3e, 0xf4, 0x86, 0x69, 0x1a, 0x47, 0xa1, 0xfe, 0x5a, 0x57, 0xd4, 0x34, 0xd1, 0x8d, 0x67, - 0x8d, 0xfe, 0xea, 0xda, 0x9a, 0x26, 0x62, 0xf1, 0x89, 0x52, 0x53, 0x2d, 0x8d, 0x0d, 0x16, 0x6b, - 0x11, 0x55, 0x4e, 0x6a, 0xc2, 0xb0, 0xc8, 0x93, 0x59, 0x9c, 0xdc, 0xaa, 0x6a, 0xbb, 0xbc, 0xc6, - 0x3b, 0x45, 0xb4, 0xf7, 0x14, 0xf1, 0xba, 0x05, 0xce, 0xff, 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, 0xc4, 0xe8, 0x6a, 0x4f, 0x65, 0xe4, 0x6f, 0xb7, 0xee, 0xbf, 0x93, 0xd3, 0xd7, 0x16, - 0xb8, 0x35, 0xf1, 0x4e, 0xb6, 0x89, 0x77, 0xb2, 0x21, 0xde, 0xe8, 0xb8, 0x22, 0xde, 0xe8, 0x98, - 0x30, 0xbf, 0xa8, 0x88, 0xc7, 0x2f, 0x68, 0xa0, 0x4f, 0x65, 0x52, 0xa4, 0xc7, 0xa5, 0x9e, 0xbc, - 0xc7, 0x6b, 0x4c, 0xdb, 0xfa, 0xdd, 0x02, 0xa5, 0x69, 0xb5, 0xc7, 0x0d, 0xa2, 0xdd, 0x3e, 0x57, - 0xa2, 0xa4, 0x9b, 0xab, 0x01, 0xfb, 0x08, 0x5c, 0x4e, 0xcd, 0x53, 0x1d, 0xde, 0x9a, 0x8b, 0x32, - 0x73, 0xed, 0xa5, 0xa0, 0xfa, 0xdf, 0xc9, 0x2c, 0xb9, 0x41, 0xc1, 0x13, 0xf3, 0x39, 0x45, 0xbf, - 0x4a, 0x53, 0x94, 0x86, 0xaa, 0x1a, 0xa8, 0x37, 0x93, 0x5b, 0xd4, 0x2a, 0x6b, 0x73, 0x0d, 0x82, - 0xef, 0xc1, 0x1b, 0xc6, 0x28, 0x73, 0x5e, 0xc4, 0xbb, 0xda, 0xcc, 0xc0, 0xf9, 0x66, 0xfc, 0xe2, - 0x79, 0x45, 0x70, 0x3a, 0x6f, 0x68, 0x69, 0xff, 0x83, 0x96, 0x67, 0x22, 0x15, 0xa7, 0x23, 0xb5, - 0x67, 0x36, 0x37, 0x28, 0xf8, 0xd9, 0x02, 0x87, 0xf8, 0xdf, 0x08, 0xed, 0xbc, 0x49, 0x3b, 0x2e, - 0x64, 0x72, 0x13, 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, 0x4e, 0xf6, 0x3e, 0xc0, - 0xb8, 0x48, 0x51, 0x0e, 0xa7, 0xcb, 0x48, 0xd3, 0xaa, 0xcb, 0x1b, 0x96, 0xe0, 0x2b, 0x70, 0xe8, - 0xe2, 0x0e, 0x01, 0xad, 0x5d, 0x02, 0xee, 0xcb, 0x3c, 0x38, 0xda, 0xfe, 0xee, 0x2e, 0xd5, 0x4e, - 0xda, 0xea, 0xa7, 0xf8, 0xc9, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x31, 0x7a, 0x41, 0x26, - 0x0b, 0x00, 0x00, + 0xa1, 0xda, 0x0b, 0xdc, 0xe6, 0x7b, 0x6f, 0xfc, 0xe6, 0xfd, 0xfa, 0x3e, 0x19, 0x0e, 0xa3, 0x55, + 0x8e, 0x72, 0x25, 0xe2, 0xa3, 0x54, 0x26, 0x79, 0xc2, 0xba, 0x15, 0x0e, 0xfe, 0x6a, 0x41, 0x7b, + 0x9c, 0x14, 0x32, 0x44, 0x76, 0x08, 0xad, 0xd3, 0x91, 0x6f, 0xf5, 0xad, 0x81, 0xcd, 0x5b, 0xa7, + 0x23, 0xc6, 0xc0, 0x79, 0x2e, 0x96, 0xe8, 0xb7, 0xfa, 0xd6, 0xc0, 0xe3, 0xea, 0x4c, 0xb6, 0xcb, + 0x32, 0x45, 0xdf, 0xd6, 0x36, 0x3a, 0xb3, 0x87, 0xd0, 0xbd, 0xca, 0x28, 0xda, 0x12, 0x7d, 0x47, + 0xd9, 0x6b, 0x4c, 0xbe, 0x0b, 0x91, 0x65, 0xb7, 0x89, 0x9c, 0xfa, 0xae, 0xf6, 0x55, 0x98, 0xbd, + 0x0d, 0xf6, 0x15, 0x3f, 0xf7, 0xdb, 0xca, 0x4c, 0x47, 0xe6, 0x43, 0x67, 0x84, 0x33, 0x51, 0xc4, + 0xb9, 0xdf, 0xe9, 0x5b, 0x83, 0x2e, 0xaf, 0x20, 0xc5, 0xb9, 0xc4, 0x18, 0xe7, 0x52, 0xcc, 0xfc, + 0xae, 0x8e, 0x53, 0x61, 0x76, 0x04, 0xec, 0x74, 0x95, 0x61, 0x58, 0x48, 0x1c, 0xbf, 0x8a, 0xd2, + 0x6b, 0x94, 0xd1, 0xac, 0xf4, 0x3d, 0x15, 0x60, 0x8f, 0x87, 0x5e, 0x79, 0x86, 0xb9, 0xa0, 0xb7, + 0x41, 0x85, 0xaa, 0x20, 0x0b, 0xe0, 0x60, 0xbc, 0x10, 0x12, 0xa7, 0x63, 0x0c, 0x25, 0xe6, 0x7e, + 0x4f, 0xb9, 0xb7, 0x6c, 0x74, 0xe7, 0x85, 0x9c, 0x8b, 0x55, 0xf4, 0xa3, 0xc8, 0xa3, 0x64, 0xe5, + 0x1f, 0xe8, 0x3b, 0x4d, 0x5b, 0xf0, 0x9b, 0x05, 0xde, 0x48, 0x64, 0x8b, 0x49, 0x22, 0xe4, 0xf4, + 0x4e, 0x7d, 0x7d, 0x04, 0x6e, 0x88, 0x71, 0x9c, 0xf9, 0x76, 0xdf, 0x1e, 0xf4, 0x1e, 0x3f, 0x38, + 0xaa, 0x07, 0x56, 0xc7, 0x39, 0xc1, 0x38, 0xe6, 0xfa, 0x16, 0xfb, 0x0c, 0xbc, 0x1c, 0x97, 0x69, + 0x2c, 0x72, 0xcc, 0x7c, 0x47, 0x7d, 0xc2, 0x36, 0x9f, 0x5c, 0x1a, 0x17, 0xdf, 0x5c, 0xda, 0x49, + 0xdb, 0xdd, 0x93, 0xf6, 0x2f, 0x2d, 0xb8, 0xb7, 0xf5, 0x1c, 0x3b, 0x00, 0x6b, 0xad, 0x32, 0x77, + 0xb9, 0xb5, 0x26, 0x54, 0xaa, 0xac, 0x5d, 0x6e, 0x95, 0x84, 0x6e, 0xd5, 0x1e, 0xb8, 0xdc, 0xba, + 0x25, 0xb4, 0x50, 0xd3, 0x77, 0xb9, 0xb5, 0x60, 0x1f, 0x43, 0xe7, 0x87, 0x02, 0x65, 0x84, 0x99, + 0xef, 0xaa, 0xec, 0xde, 0xda, 0x64, 0xf7, 0x6d, 0x81, 0xb2, 0xe4, 0x95, 0x9f, 0xba, 0xa1, 0x36, + 0x47, 0xaf, 0x81, 0x3a, 0x93, 0x2d, 0xa7, 0x2d, 0xeb, 0x68, 0x1b, 0x9d, 0x4d, 0x17, 0xf5, 0xec, + 0xa9, 0x8b, 0x9f, 0x83, 0x23, 0xd6, 0x98, 0xf9, 0x9e, 0x8a, 0xff, 0xc1, 0xbf, 0x34, 0xec, 0x68, + 0xb8, 0xc6, 0xec, 0xeb, 0x55, 0x2e, 0x4b, 0xae, 0xae, 0x3f, 0x7c, 0x0a, 0x5e, 0x6d, 0xa2, 0x0d, + 0x7c, 0x85, 0xa5, 0x2a, 0xd0, 0xe3, 0x74, 0x64, 0x1f, 0x82, 0x7b, 0x23, 0xe2, 0x42, 0x0f, 0xa7, + 0xf7, 0xf8, 0x70, 0x13, 0x76, 0xb8, 0x8e, 0x32, 0xae, 0x9d, 0x5f, 0xb6, 0xbe, 0xb0, 0x82, 0x5f, + 0x2d, 0x70, 0xc8, 0x46, 0x9d, 0x8d, 0x71, 0x2e, 0xc2, 0xf2, 0x38, 0x29, 0x56, 0xd3, 0xcc, 0xb7, + 0xfa, 0xf6, 0xc0, 0xe6, 0x5b, 0x36, 0xf6, 0x0e, 0xb4, 0x27, 0xda, 0xdb, 0xea, 0xdb, 0x03, 0x8f, + 0x1b, 0xc4, 0xee, 0x83, 0x1b, 0x8b, 0x09, 0xc6, 0x86, 0x4f, 0x1a, 0xd0, 0xed, 0x54, 0xe2, 0x2c, + 0x5a, 0x1b, 0x3a, 0x19, 0x44, 0xf6, 0xac, 0x98, 0x91, 0x5d, 0x4f, 0xcf, 0x20, 0x6a, 0xd7, 0x44, + 0x64, 0x75, 0x0b, 0xe9, 0x4c, 0x91, 0xb3, 0x50, 0xc4, 0x55, 0x0f, 0x35, 0x08, 0x7e, 0xb7, 0x88, + 0x47, 0x7a, 0x27, 0x1a, 0x7b, 0xa9, 0x3b, 0xfa, 0x2e, 0x74, 0x69, 0x5f, 0x5e, 0xde, 0x08, 0x69, + 0x76, 0xb3, 0x43, 0xf8, 0x5a, 0x48, 0xf6, 0x29, 0xb4, 0x55, 0xe5, 0x7b, 0xf6, 0xb3, 0x0a, 0x77, + 0x4d, 0x7e, 0x6e, 0xae, 0xd5, 0x13, 0x74, 0x1a, 0x13, 0xac, 0x8b, 0x75, 0x9b, 0xc5, 0x3e, 0x02, + 0x97, 0x56, 0xa1, 0x54, 0xd9, 0xef, 0x8d, 0xac, 0x17, 0x46, 0xdf, 0x0a, 0xae, 0xe0, 0xde, 0xd6, + 0x8b, 0xf5, 0x4b, 0xd6, 0xf6, 0x4b, 0x9b, 0x29, 0x7a, 0x66, 0x6a, 0xa4, 0x21, 0x19, 0xc6, 0x18, + 0xe6, 0x38, 0x55, 0xfd, 0xee, 0xf2, 0x1a, 0x07, 0x3f, 0x59, 0x9b, 0xb8, 0xea, 0x3d, 0x52, 0x89, + 0x30, 0x59, 0x2e, 0xc5, 0x6a, 0x6a, 0x42, 0x57, 0x90, 0xfa, 0x36, 0x9d, 0x98, 0xd0, 0xad, 0xe9, + 0x84, 0xb0, 0x4c, 0xcd, 0x04, 0x5b, 0x32, 0x65, 0x7d, 0xe8, 0x2d, 0x51, 0x64, 0x85, 0xc4, 0x25, + 0xae, 0x72, 0xd3, 0x82, 0xa6, 0x89, 0x3d, 0x80, 0x4e, 0x2e, 0xe6, 0x2f, 0x69, 0xf7, 0xcc, 0x24, + 0x73, 0x31, 0x3f, 0xc3, 0x92, 0xbd, 0x07, 0xde, 0x2c, 0xc2, 0x78, 0xaa, 0x5c, 0x7a, 0x9c, 0x5d, + 0x65, 0x38, 0xc3, 0x32, 0xf8, 0xd3, 0x82, 0xf6, 0x18, 0xe5, 0x0d, 0xca, 0x3b, 0x49, 0x4a, 0x53, + 0x96, 0xed, 0x37, 0xc8, 0xb2, 0xb3, 0x5f, 0x96, 0xdd, 0x8d, 0x2c, 0xdf, 0x07, 0x77, 0x2c, 0xc3, + 0xd3, 0x91, 0xca, 0xc8, 0xe6, 0x1a, 0xd0, 0x36, 0x0e, 0xc3, 0x3c, 0xba, 0x41, 0xa3, 0xd5, 0x06, + 0xed, 0x28, 0x4d, 0x77, 0x8f, 0xd2, 0xfc, 0x61, 0x41, 0xfb, 0x5c, 0x94, 0x49, 0x91, 0xef, 0x6c, + 0x61, 0x1f, 0x7a, 0xc3, 0x34, 0x8d, 0xa3, 0x50, 0x7f, 0xad, 0x2b, 0x6a, 0x9a, 0xe8, 0xc6, 0xb3, + 0x46, 0x7f, 0x75, 0x6d, 0x4d, 0x13, 0xb1, 0xf8, 0x44, 0xa9, 0xa9, 0x96, 0xc6, 0x06, 0x8b, 0xb5, + 0x88, 0x2a, 0x27, 0x35, 0x61, 0x58, 0xe4, 0xc9, 0x2c, 0x4e, 0x6e, 0x55, 0xb5, 0x5d, 0x5e, 0xe3, + 0x9d, 0x22, 0xda, 0x7b, 0x8a, 0x78, 0xdd, 0x02, 0xe7, 0xff, 0x52, 0xc9, 0x03, 0xb0, 0x22, 0x93, + 0x84, 0x15, 0xd5, 0x9a, 0xd9, 0x69, 0x68, 0xa6, 0x0f, 0x9d, 0x52, 0x8a, 0xd5, 0x1c, 0x33, 0xbf, + 0xab, 0x14, 0xa8, 0x82, 0xca, 0xa3, 0xb8, 0xa6, 0xc5, 0xd2, 0xe3, 0x15, 0xac, 0xb9, 0x03, 0x0d, + 0xee, 0x7c, 0x62, 0x74, 0xb5, 0xa7, 0x32, 0xf2, 0xb7, 0x5b, 0xf7, 0xdf, 0xc9, 0xe9, 0x6b, 0x0b, + 0xdc, 0x9a, 0x78, 0x27, 0xdb, 0xc4, 0x3b, 0xd9, 0x10, 0x6f, 0x74, 0x5c, 0x11, 0x6f, 0x74, 0x4c, + 0x98, 0x5f, 0x54, 0xc4, 0xe3, 0x17, 0x34, 0xd0, 0xa7, 0x32, 0x29, 0xd2, 0xe3, 0x52, 0x4f, 0xde, + 0xe3, 0x35, 0xa6, 0x6d, 0xfd, 0x6e, 0x81, 0xd2, 0xb4, 0xda, 0xe3, 0x06, 0xd1, 0x6e, 0x9f, 0x2b, + 0x51, 0xd2, 0xcd, 0xd5, 0x80, 0x7d, 0x04, 0x2e, 0xa7, 0xe6, 0xa9, 0x0e, 0x6f, 0xcd, 0x45, 0x99, + 0xb9, 0xf6, 0x52, 0x50, 0xfd, 0xef, 0x64, 0x96, 0xdc, 0xa0, 0xe0, 0x89, 0xf9, 0x9c, 0xa2, 0x5f, + 0xa5, 0x29, 0x4a, 0x43, 0x55, 0x0d, 0xd4, 0x9b, 0xc9, 0x2d, 0x6a, 0x95, 0xb5, 0xb9, 0x06, 0xc1, + 0xf7, 0xe0, 0x0d, 0x63, 0x94, 0x39, 0x2f, 0xe2, 0x5d, 0x6d, 0x66, 0xe0, 0x7c, 0x33, 0x7e, 0xf1, + 0xbc, 0x22, 0x38, 0x9d, 0x37, 0xb4, 0xb4, 0xff, 0x41, 0xcb, 0x33, 0x91, 0x8a, 0xd3, 0x91, 0xda, + 0x33, 0x9b, 0x1b, 0x14, 0xfc, 0x6c, 0x81, 0x43, 0xfc, 0x6f, 0x84, 0x76, 0xde, 0xa4, 0x1d, 0x17, + 0x32, 0xb9, 0x89, 0xa6, 0x28, 0x2b, 0xed, 0xa8, 0xb0, 0x2a, 0x3a, 0x5c, 0x60, 0xfd, 0xb3, 0x67, + 0x10, 0xcd, 0x9a, 0x27, 0x71, 0xbd, 0xcb, 0x8d, 0x59, 0x93, 0x99, 0x6b, 0x27, 0x7b, 0x1f, 0x60, + 0x5c, 0xa4, 0x28, 0x87, 0xd3, 0x65, 0xa4, 0x69, 0xd5, 0xe5, 0x0d, 0x4b, 0xf0, 0x15, 0x38, 0x74, + 0x71, 0x87, 0x80, 0xd6, 0x2e, 0x01, 0xf7, 0x65, 0x1e, 0x5c, 0x6e, 0x7f, 0x77, 0xa7, 0x6a, 0xfb, + 0xd0, 0x33, 0xff, 0x99, 0xf4, 0x74, 0x25, 0x28, 0x0d, 0xd3, 0xa4, 0xad, 0x7e, 0x9b, 0x9f, 0xfc, + 0x1d, 0x00, 0x00, 0xff, 0xff, 0x65, 0x9d, 0x67, 0xe0, 0x48, 0x0b, 0x00, 0x00, } diff --git a/bolt/internal/internal.proto b/bolt/internal/internal.proto index 4ea2063e26..6e0c0f66c6 100644 --- a/bolt/internal/internal.proto +++ b/bolt/internal/internal.proto @@ -144,6 +144,7 @@ message Role { message Organization { uint64 ID = 1; // ID is the unique ID of the organization string Name = 2; // Name is the organization's name + string DefaultRole = 3; // DefaultRole is the name of the role that is the default for any users added to the organization } // The following is a vim modeline, it autoconfigures vim to have the diff --git a/bolt/organizations.go b/bolt/organizations.go index e8bfefdc5e..63325de22e 100644 --- a/bolt/organizations.go +++ b/bolt/organizations.go @@ -24,8 +24,9 @@ type OrganizationsStore struct { // Migrate sets the default organization at runtime func (s *OrganizationsStore) Migrate(ctx context.Context) error { o := chronograf.Organization{ - ID: 0, - Name: "__default", + ID: 0, + Name: "__default", + DefaultRole: "member", } return s.client.db.Update(func(tx *bolt.Tx) error { b := tx.Bucket(OrganizationsBucket) diff --git a/bolt/organizations_test.go b/bolt/organizations_test.go index e73a4b09a6..7b46aa8be6 100644 --- a/bolt/organizations_test.go +++ b/bolt/organizations_test.go @@ -183,7 +183,8 @@ func TestOrganizationsStore_All(t *testing.T) { }, want: []chronograf.Organization{ { - Name: "__default", + Name: "__default", + DefaultRole: "member", }, { Name: "EE - Evil Empire", diff --git a/chronograf.go b/chronograf.go index a77438b0b0..12f2fb035f 100644 --- a/chronograf.go +++ b/chronograf.go @@ -771,8 +771,9 @@ type LayoutsStore interface { // Organization is a group of resources under a common name type Organization struct { - ID uint64 `json:"id,string"` - Name string `json:"name"` + ID uint64 `json:"id,string"` + Name string `json:"name"` + DefaultRole string `json:"defaultRole,omitempty"` } // OrganizationQuery represents the attributes that a organization may be retrieved by. diff --git a/server/organizations.go b/server/organizations.go index f0c5ebd5f0..a61274c8dd 100644 --- a/server/organizations.go +++ b/server/organizations.go @@ -15,33 +15,50 @@ func parseOrganizationID(id string) (uint64, error) { } type organizationRequest struct { - Name string `json:"name"` + Name string `json:"name"` + DefaultRole string `json:"defaultRole"` } func (r *organizationRequest) ValidCreate() error { if r.Name == "" { return fmt.Errorf("Name required on Chronograf Organization request body") } - return nil + + return r.ValidDefaultRole() } func (r *organizationRequest) ValidUpdate() error { - if r.Name == "" { + if r.Name == "" && r.DefaultRole == "" { return fmt.Errorf("No fields to update") } - return nil + return r.ValidDefaultRole() +} + +func (r *organizationRequest) ValidDefaultRole() error { + if r.DefaultRole == "" { + r.DefaultRole = MemberRoleName + } + + switch r.DefaultRole { + case MemberRoleName, ViewerRoleName, EditorRoleName, AdminRoleName: + return nil + default: + return fmt.Errorf("default role must be member, viewer, editor, or admin") + } } type organizationResponse struct { - Links selfLinks `json:"links"` - ID uint64 `json:"id,string"` - Name string `json:"name"` + Links selfLinks `json:"links"` + ID uint64 `json:"id,string"` + Name string `json:"name"` + DefaultRole string `json:"defaultRole,omitempty"` } func newOrganizationResponse(o *chronograf.Organization) *organizationResponse { return &organizationResponse{ - ID: o.ID, - Name: o.Name, + ID: o.ID, + Name: o.Name, + DefaultRole: o.DefaultRole, Links: selfLinks{ Self: fmt.Sprintf("/chronograf/v1/organizations/%d", o.ID), }, @@ -95,7 +112,8 @@ func (s *Service) NewOrganization(w http.ResponseWriter, r *http.Request) { ctx := r.Context() org := &chronograf.Organization{ - Name: req.Name, + Name: req.Name, + DefaultRole: req.DefaultRole, } res, err := s.Store.Organizations(ctx).Add(ctx, org)