From 126c4a106ee80f6bc975e63f34e3afeb5b1fc76b Mon Sep 17 00:00:00 2001 From: Serge Zaitsev Date: Mon, 20 Mar 2023 19:18:21 +0100 Subject: [PATCH] Chore: Remove result field from remaining datasources queries (#65054) remove result field from datasources --- pkg/services/datasources/datasources.go | 2 +- .../datasources/fakes/fake_datasource_service.go | 5 ++--- pkg/services/datasources/models.go | 4 +--- pkg/services/datasources/service/datasource.go | 2 +- pkg/services/datasources/service/store.go | 11 ++++++----- .../secrets/kvstore/migrations/datasource_mig.go | 4 ++-- pkg/services/store/resolver/ds_cache.go | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkg/services/datasources/datasources.go b/pkg/services/datasources/datasources.go index 8e9572fccc5..443b13e3289 100644 --- a/pkg/services/datasources/datasources.go +++ b/pkg/services/datasources/datasources.go @@ -19,7 +19,7 @@ type DataSourceService interface { GetDataSources(ctx context.Context, query *GetDataSourcesQuery) ([]*DataSource, error) // GetAllDataSources gets all datasources. - GetAllDataSources(ctx context.Context, query *GetAllDataSourcesQuery) error + GetAllDataSources(ctx context.Context, query *GetAllDataSourcesQuery) (res []*DataSource, err error) // GetDataSourcesByType gets datasources by type. GetDataSourcesByType(ctx context.Context, query *GetDataSourcesByTypeQuery) ([]*DataSource, error) diff --git a/pkg/services/datasources/fakes/fake_datasource_service.go b/pkg/services/datasources/fakes/fake_datasource_service.go index d2a306b2ab5..8f43219769f 100644 --- a/pkg/services/datasources/fakes/fake_datasource_service.go +++ b/pkg/services/datasources/fakes/fake_datasource_service.go @@ -41,9 +41,8 @@ func (s *FakeDataSourceService) GetDataSources(ctx context.Context, query *datas return dataSources, nil } -func (s *FakeDataSourceService) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error { - query.Result = s.DataSources - return nil +func (s *FakeDataSourceService) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) { + return s.DataSources, nil } func (s *FakeDataSourceService) GetDataSourcesByType(ctx context.Context, query *datasources.GetDataSourcesByTypeQuery) ([]*datasources.DataSource, error) { diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go index 2e9e51d6550..f8be5eeed37 100644 --- a/pkg/services/datasources/models.go +++ b/pkg/services/datasources/models.go @@ -157,9 +157,7 @@ type GetDataSourcesQuery struct { User *user.SignedInUser } -type GetAllDataSourcesQuery struct { - Result []*DataSource -} +type GetAllDataSourcesQuery struct{} type GetDataSourcesByTypeQuery struct { OrgID int64 // optional: filter by org_id diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go index 2d3b01be8eb..39e90579553 100644 --- a/pkg/services/datasources/service/datasource.go +++ b/pkg/services/datasources/service/datasource.go @@ -161,7 +161,7 @@ func (s *Service) GetDataSources(ctx context.Context, query *datasources.GetData return s.SQLStore.GetDataSources(ctx, query) } -func (s *Service) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error { +func (s *Service) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) { return s.SQLStore.GetAllDataSources(ctx, query) } diff --git a/pkg/services/datasources/service/store.go b/pkg/services/datasources/service/store.go index 709f953efce..abde4e001a2 100644 --- a/pkg/services/datasources/service/store.go +++ b/pkg/services/datasources/service/store.go @@ -30,7 +30,7 @@ type Store interface { DeleteDataSource(context.Context, *datasources.DeleteDataSourceCommand) error AddDataSource(context.Context, *datasources.AddDataSourceCommand) (*datasources.DataSource, error) UpdateDataSource(context.Context, *datasources.UpdateDataSourceCommand) (*datasources.DataSource, error) - GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error + GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) Count(context.Context, *quota.ScopeParameters) (*quota.Map, error) } @@ -93,11 +93,12 @@ func (ss *SqlStore) GetDataSources(ctx context.Context, query *datasources.GetDa }) } -func (ss *SqlStore) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) error { - return ss.db.WithDbSession(ctx, func(sess *db.Session) error { - query.Result = make([]*datasources.DataSource, 0) - return sess.Asc("name").Find(&query.Result) +func (ss *SqlStore) GetAllDataSources(ctx context.Context, query *datasources.GetAllDataSourcesQuery) (res []*datasources.DataSource, err error) { + err = ss.db.WithDbSession(ctx, func(sess *db.Session) error { + res = make([]*datasources.DataSource, 0) + return sess.Asc("name").Find(&res) }) + return res, err } // GetDataSourcesByType returns all datasources for a given type or an error if the specified type is an empty string diff --git a/pkg/services/secrets/kvstore/migrations/datasource_mig.go b/pkg/services/secrets/kvstore/migrations/datasource_mig.go index 8192391b23c..3953fe0b60d 100644 --- a/pkg/services/secrets/kvstore/migrations/datasource_mig.go +++ b/pkg/services/secrets/kvstore/migrations/datasource_mig.go @@ -55,12 +55,12 @@ func (s *DataSourceSecretMigrationService) Migrate(ctx context.Context) error { if needCompatibility || needMigration { logger.Debug("performing secret migration", "needs migration", needMigration, "needs compatibility", needCompatibility) query := &datasources.GetAllDataSourcesQuery{} - err := s.dataSourcesService.GetAllDataSources(ctx, query) + dsList, err := s.dataSourcesService.GetAllDataSources(ctx, query) if err != nil { return err } - for _, ds := range query.Result { + for _, ds := range dsList { secureJsonData, err := s.dataSourcesService.DecryptedValues(ctx, ds) if err != nil { return err diff --git a/pkg/services/store/resolver/ds_cache.go b/pkg/services/store/resolver/ds_cache.go index d13ef78a5da..b66795f3641 100644 --- a/pkg/services/store/resolver/ds_cache.go +++ b/pkg/services/store/resolver/ds_cache.go @@ -43,12 +43,12 @@ func (c *dsCache) refreshCache(ctx context.Context) error { defaultDS := make(map[int64]*dsVal, 0) q := &datasources.GetAllDataSourcesQuery{} - err := c.ds.GetAllDataSources(ctx, q) + dsList, err := c.ds.GetAllDataSources(ctx, q) if err != nil { return err } - for _, ds := range q.Result { + for _, ds := range dsList { val := &dsVal{ InternalID: ds.ID, Name: ds.Name,