From b0ef9272cac1f9a0e2285d0491d729df2e8d34d5 Mon Sep 17 00:00:00 2001 From: Michael Mandrus Date: Fri, 10 Jun 2022 14:37:01 -0400 Subject: [PATCH] just declare error once --- pkg/api/datasources.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index 6fb22f305d5..0142cd8878d 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -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) }