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

Chore: Moves common and response into separate packages (#30298)

Browse Source 
* Chore: moves common and response into separate packages

* Chore: moves common and response into separate packages

* Update pkg/api/utils/common.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: changes after PR comments

* Chore: move wrap to routing package

* Chore: move functions in common to response package

* Chore: move functions in common to response package

* Chore: formats imports

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Hugo Häggmark
2021-01-15 14:43:20 +01:00
committed by GitHub
co-authored by Arve Knudsen
parent a94c256516
commit 3d41267fc4
51 changed files with 1321 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/admin_provisioning.go
+13 -12
View File
@@ -4,37 +4,38 @@ import (
"context"
"errors"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/models"
)
func (hs *HTTPServer) AdminProvisioningReloadDashboards(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminProvisioningReloadDashboards(c *models.ReqContext) response.Response {
err := hs.ProvisioningService.ProvisionDashboards()
if err != nil && !errors.Is(err, context.Canceled) {
return Error(500, "", err)
return response.Error(500, "", err)
}
return Success("Dashboards config reloaded")
return response.Success("Dashboards config reloaded")
}
func (hs *HTTPServer) AdminProvisioningReloadDatasources(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminProvisioningReloadDatasources(c *models.ReqContext) response.Response {
err := hs.ProvisioningService.ProvisionDatasources()
if err != nil {
return Error(500, "", err)
return response.Error(500, "", err)
}
return Success("Datasources config reloaded")
return response.Success("Datasources config reloaded")
}
func (hs *HTTPServer) AdminProvisioningReloadPlugins(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminProvisioningReloadPlugins(c *models.ReqContext) response.Response {
err := hs.ProvisioningService.ProvisionPlugins()
if err != nil {
return Error(500, "Failed to reload plugins config", err)
return response.Error(500, "Failed to reload plugins config", err)
}
return Success("Plugins config reloaded")
return response.Success("Plugins config reloaded")
}
func (hs *HTTPServer) AdminProvisioningReloadNotifications(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminProvisioningReloadNotifications(c *models.ReqContext) response.Response {
err := hs.ProvisioningService.ProvisionNotifications()
if err != nil {
return Error(500, "", err)
return response.Error(500, "", err)
}
return Success("Notifications config reloaded")
return response.Success("Notifications config reloaded")
}