From 1038ac73089ebecaf5c850f91693c19026660b1f Mon Sep 17 00:00:00 2001 From: Will Browne Date: Tue, 4 Oct 2022 12:32:25 +0200 Subject: [PATCH] DataSources: Remove unused cfg from core Grafana data source (#56188) * remove unused cfg from grafana ds * fix test --- pkg/plugins/manager/manager_integration_test.go | 2 +- pkg/tsdb/grafanads/grafana.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go index 1c275f5b70b..c8af6e3f126 100644 --- a/pkg/plugins/manager/manager_integration_test.go +++ b/pkg/plugins/manager/manager_integration_test.go @@ -96,7 +96,7 @@ func TestIntegrationPluginManager(t *testing.T) { my := mysql.ProvideService(cfg, hcp) ms := mssql.ProvideService(cfg) sv2 := searchV2.ProvideService(cfg, sqlstore.InitTestDB(t), nil, nil, tracer, features, nil, nil) - graf := grafanads.ProvideService(cfg, sv2, nil) + graf := grafanads.ProvideService(sv2, nil) coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf) diff --git a/pkg/tsdb/grafanads/grafana.go b/pkg/tsdb/grafanads/grafana.go index cc0341c3e1c..5fe344c1423 100644 --- a/pkg/tsdb/grafanads/grafana.go +++ b/pkg/tsdb/grafanads/grafana.go @@ -14,7 +14,6 @@ import ( "github.com/grafana/grafana/pkg/services/datasources" "github.com/grafana/grafana/pkg/services/searchV2" "github.com/grafana/grafana/pkg/services/store" - "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/tsdb/testdatasource" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -51,11 +50,11 @@ var ( ) ) -func ProvideService(cfg *setting.Cfg, search searchV2.SearchService, store store.StorageService) *Service { - return newService(cfg, search, store) +func ProvideService(search searchV2.SearchService, store store.StorageService) *Service { + return newService(search, store) } -func newService(cfg *setting.Cfg, search searchV2.SearchService, store store.StorageService) *Service { +func newService(search searchV2.SearchService, store store.StorageService) *Service { s := &Service{ search: search, store: store,