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/folder.go
+9 -9
View File
@@ -134,24 +134,24 @@ func toFolderError(err error) Response {
return Error(dashboardErr.StatusCode, err.Error(), err)
}
if err == models.ErrFolderTitleEmpty ||
err == models.ErrFolderSameNameExists ||
err == models.ErrFolderWithSameUIDExists ||
err == models.ErrDashboardTypeMismatch ||
err == models.ErrDashboardInvalidUid ||
err == models.ErrDashboardUidTooLong {
if errors.Is(err, models.ErrFolderTitleEmpty) ||
errors.Is(err, models.ErrFolderSameNameExists) ||
errors.Is(err, models.ErrFolderWithSameUIDExists) ||
errors.Is(err, models.ErrDashboardTypeMismatch) ||
errors.Is(err, models.ErrDashboardInvalidUid) ||
errors.Is(err, models.ErrDashboardUidTooLong) {
return Error(400, err.Error(), nil)
}
if err == models.ErrFolderAccessDenied {
if errors.Is(err, models.ErrFolderAccessDenied) {
return Error(403, "Access denied", err)
}
if err == models.ErrFolderNotFound {
if errors.Is(err, models.ErrFolderNotFound) {
return JSON(404, util.DynMap{"status": "not-found", "message": models.ErrFolderNotFound.Error()})
}
if err == models.ErrFolderVersionMismatch {
if errors.Is(err, models.ErrFolderVersionMismatch) {
return JSON(412, util.DynMap{"status": "version-mismatch", "message": models.ErrFolderVersionMismatch.Error()})
}