DataSources: Remove unused cfg from core Grafana data source (#56188)

* remove unused cfg from grafana ds

* fix test
pull/56288/head
Will Browne 3 years ago committed by GitHub
parent 2d433194d0
commit 1038ac7308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkg/plugins/manager/manager_integration_test.go
  2. 7
      pkg/tsdb/grafanads/grafana.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)

@ -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,

Loading…
Cancel
Save