public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Handle wrapped errors (#29223)

Browse Source 
* Chore: Handle wrapped errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
This commit is contained in:
Arve Knudsen
2020-11-19 13:34:28 +01:00
committed by GitHub
co-authored by Emil Tullstedt
parent 0cb29d337a
commit 294770f411
34 changed files with 153 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/apikey.go
+3 -2
View File
@@ -1,6 +1,7 @@
package api
import (
"errors"
"time"
"github.com/grafana/grafana/pkg/api/dtos"
@@ -70,10 +71,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
cmd.Key = newKeyInfo.HashedKey
if err := bus.Dispatch(&cmd); err != nil {
if err == models.ErrInvalidApiKeyExpiration {
if errors.Is(err, models.ErrInvalidApiKeyExpiration) {
return Error(400, err.Error(), nil)
}
if err == models.ErrDuplicateApiKey {
if errors.Is(err, models.ErrDuplicateApiKey) {
return Error(409, err.Error(), nil)
}
return Error(500, "Failed to add API Key", err)