From dcc1169ab2bac72b3db1e892546655944a5a66d5 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Mon, 5 Jun 2023 11:34:02 +0200
Subject: [PATCH] Chore: Remove unused code/dependencies in testdata datasource
 (#69386)

---
 pkg/api/plugin_resource_test.go                 | 2 +-
 pkg/plugins/manager/manager_integration_test.go | 2 +-
 pkg/tsdb/testdatasource/csv_data_test.go        | 4 +---
 pkg/tsdb/testdatasource/testdata.go             | 5 +----
 pkg/tsdb/testdatasource/usa_stats_test.go       | 6 +-----
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index de24f3f852c..2bb03754f07 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -61,7 +61,7 @@ func TestCallResource(t *testing.T) {
 	cfg.Azure = &azsettings.AzureSettings{}
 
 	coreRegistry := coreplugin.ProvideCoreRegistry(nil, &cloudwatch.CloudWatchService{}, nil, nil, nil, nil,
-		nil, nil, nil, nil, testdatasource.ProvideService(cfg, featuremgmt.WithFeatures()), nil, nil, nil, nil, nil, nil)
+		nil, nil, nil, nil, testdatasource.ProvideService(cfg), nil, nil, nil, nil, nil, nil)
 	pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg, featuremgmt.WithFeatures())
 	require.NoError(t, err)
 	reg := registry.ProvideService()
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index f897986e3c3..b7c91b43c29 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -102,7 +102,7 @@ func TestIntegrationPluginManager(t *testing.T) {
 	otsdb := opentsdb.ProvideService(hcp)
 	pr := prometheus.ProvideService(hcp, cfg, features, tracer)
 	tmpo := tempo.ProvideService(hcp)
-	td := testdatasource.ProvideService(cfg, features)
+	td := testdatasource.ProvideService(cfg)
 	pg := postgres.ProvideService(cfg)
 	my := mysql.ProvideService(cfg, hcp)
 	ms := mssql.ProvideService(cfg)
diff --git a/pkg/tsdb/testdatasource/csv_data_test.go b/pkg/tsdb/testdatasource/csv_data_test.go
index f5cbcc4c2fb..99660ef95cb 100644
--- a/pkg/tsdb/testdatasource/csv_data_test.go
+++ b/pkg/tsdb/testdatasource/csv_data_test.go
@@ -17,9 +17,7 @@ func TestCSVFileScenario(t *testing.T) {
 	cfg.DataPath = t.TempDir()
 	cfg.StaticRootPath = "../../../public"
 
-	s := &Service{
-		cfg: cfg,
-	}
+	s := &Service{}
 
 	t.Run("loadCsvFile", func(t *testing.T) {
 		files := []string{"simple", "mixed", "labels"}
diff --git a/pkg/tsdb/testdatasource/testdata.go b/pkg/tsdb/testdatasource/testdata.go
index 3cedd2f91ef..3622704a0a8 100644
--- a/pkg/tsdb/testdatasource/testdata.go
+++ b/pkg/tsdb/testdatasource/testdata.go
@@ -10,14 +10,12 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/testdatasource/sims"
 )
 
-func ProvideService(cfg *setting.Cfg, features featuremgmt.FeatureToggles) *Service {
+func ProvideService(cfg *setting.Cfg) *Service {
 	s := &Service{
-		features:  features,
 		queryMux:  datasource.NewQueryTypeMux(),
 		scenarios: map[string]*Scenario{},
 		frame: data.NewFrame("testdata",
@@ -55,7 +53,6 @@ type Service struct {
 	labelFrame      *data.Frame
 	queryMux        *datasource.QueryTypeMux
 	resourceHandler backend.CallResourceHandler
-	features        featuremgmt.FeatureToggles
 	sims            *sims.SimulationEngine
 }
 
diff --git a/pkg/tsdb/testdatasource/usa_stats_test.go b/pkg/tsdb/testdatasource/usa_stats_test.go
index 90de995aa77..688ede59f3c 100644
--- a/pkg/tsdb/testdatasource/usa_stats_test.go
+++ b/pkg/tsdb/testdatasource/usa_stats_test.go
@@ -8,15 +8,11 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/require"
 )
 
 func TestUSAScenario(t *testing.T) {
-	cfg := setting.NewCfg()
-	p := &Service{
-		cfg: cfg,
-	}
+	p := &Service{}
 
 	t.Run("usa query modes", func(t *testing.T) {
 		start := time.Date(2020, time.January, 10, 23, 0, 0, 0, time.UTC)