Alerting/consistent api errors (#34858) (#34920)

* consolidates alertmanager api errors

* util & testing consistent errors

* consistent errors for rest of ngalert apis

* updates expected errors in testware

* bump ci

* linting

* unrelated: dashboard.go lint

(cherry picked from commit 9aca032d10)

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-05-28 12:20:46 -04:00
committed by GitHub
co-authored by Owen Diehl
parent 6dc4e4d563
commit 4a67bfc102
13 changed files with 127 additions and 129 deletions
+1 -2
View File
@@ -51,8 +51,7 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa
dash := cmd.Dashboard
meta := cmd.Meta
trimedResult := *dash
trimedResult, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash)
trimedResult, err := hs.LoadSchemaService.DashboardTrimDefaults(*dash)
if err != nil {
return response.Error(500, "Error while trim default value from dashboard json", err)
}