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

just declare error once

Browse Source
This commit is contained in:
Michael Mandrus committed 2022-06-10 14:37:01 -04:00
1 parent c01484a323
commit b0ef9272ca
1 file changed
+1 -5
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/datasources.go
+1 -5
View File
@@ -24,6 +24,7 @@ import (
)
var datasourcesLogger = log.New("datasources")
var secretsPluginError *models.ErrDatasourceSecretsPlugin
func (hs *HTTPServer) GetDataSources(c *models.ReqContext) response.Response {
query := models.GetDataSourcesQuery{OrgId: c.OrgId, DataSourceLimit: hs.Cfg.DataSourceLimit}
@@ -127,7 +128,6 @@ func (hs *HTTPServer) DeleteDataSourceById(c *models.ReqContext) response.Respon
err = hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
if err != nil {
var secretsPluginError *models.ErrDatasourceSecretsPlugin
if errors.As(err, &secretsPluginError) {
return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
}
@@ -182,7 +182,6 @@ func (hs *HTTPServer) DeleteDataSourceByUID(c *models.ReqContext) response.Respo
err = hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
if err != nil {
var secretsPluginError *models.ErrDatasourceSecretsPlugin
if errors.As(err, &secretsPluginError) {
return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
}
@@ -220,7 +219,6 @@ func (hs *HTTPServer) DeleteDataSourceByName(c *models.ReqContext) response.Resp
cmd := &models.DeleteDataSourceCommand{Name: name, OrgID: c.OrgId}
err := hs.DataSourcesService.DeleteDataSource(c.Req.Context(), cmd)
if err != nil {
var secretsPluginError *models.ErrDatasourceSecretsPlugin
if errors.As(err, &secretsPluginError) {
return response.Error(500, "Failed to delete datasource: "+err.Error(), err)
}
@@ -264,7 +262,6 @@ func (hs *HTTPServer) AddDataSource(c *models.ReqContext) response.Response {
return response.Error(409, err.Error(), err)
}
var secretsPluginError *models.ErrDatasourceSecretsPlugin
if errors.As(err, &secretsPluginError) {
return response.Error(500, "Failed to add datasource: "+err.Error(), err)
}
@@ -341,7 +338,6 @@ func (hs *HTTPServer) updateDataSourceByID(c *models.ReqContext, ds *models.Data
return response.Error(409, "Datasource has already been updated by someone else. Please reload and try again", err)
}
var secretsPluginError *models.ErrDatasourceSecretsPlugin
if errors.As(err, &secretsPluginError) {
return response.Error(500, "Failed to update datasource: "+err.Error(), err)
}