Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename userHasValidRoles to validOrganizationRoles for clarity 

Signed-off-by: Michael de Sa <mjdesa@gmail.com>
pull/10616/head
Jared Scheib 2017-10-24 14:04:48 -07:00 committed by Michael de Sa
parent fac9d03b09
commit 66eb1f824e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bolt/organization_users.go
View File

@ -31,8 +31,8 @@ func validOrganization(ctx context.Context) (string, error) {
return orgID, nil
}
// userHasValidRoles ensures that each User Role has both an associated OrganizationID and a Name
func userHasValidRoles(orgID string, u *chronograf.User) error {
// validOrganizationRoles ensures that each User Role has both an associated OrganizationID and a Name
func validOrganizationRoles(orgID string, u *chronograf.User) error {
if u == nil || u.Roles == nil {
return nil
}
@ -83,7 +83,7 @@ func (s *OrganizationUsersStore) Add(ctx context.Context, u *chronograf.User) (*
if err != nil {
return nil, err
}
if err := userHasValidRoles(orgID, u); err != nil {
if err := validOrganizationRoles(orgID, u); err != nil {
return nil, err
}
return s.client.UsersStore.Add(ctx, u)
@ -116,7 +116,7 @@ func (s *OrganizationUsersStore) Update(ctx context.Context, usr *chronograf.Use
if err != nil {
return err
}
if err := userHasValidRoles(orgID, usr); err != nil {
if err := validOrganizationRoles(orgID, usr); err != nil {
return err
}
u, err := s.client.UsersStore.Get(ctx, chronograf.UserQuery{ID: &usr.ID})