IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Use errors.Is for comparing errors (#26719)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-07-31 10:16:49 +02:00 committed by GitHub
parent 16c185c3b9
commit 35c67606ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/login/login.go
View File

@ -42,7 +42,7 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
} }
if err := bus.Dispatch(userQuery); err != nil { if err := bus.Dispatch(userQuery); err != nil {
if err != models.ErrUserNotFound { if !errors.Is(err, models.ErrUserNotFound) {
return err return err
} }
if !cmd.SignupAllowed { if !cmd.SignupAllowed {
@ -114,7 +114,7 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
User: cmd.Result, User: cmd.Result,
ExternalUser: extUser, ExternalUser: extUser,
}) })
if err != nil && err != bus.ErrHandlerNotFound { if err != nil && !errors.Is(err, bus.ErrHandlerNotFound) {
return err return err
} }
@ -223,7 +223,7 @@ func syncOrgRoles(user *models.User, extUser *models.ExternalUserInfo) error {
// add role // add role
cmd := &models.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId} cmd := &models.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId}
err := bus.Dispatch(cmd) err := bus.Dispatch(cmd)
if err != nil && err != models.ErrOrgNotFound { if err != nil && !errors.Is(err, models.ErrOrgNotFound) {
return err return err
} }
} }