PluginManager: Make Plugins, Renderer and DataSources non-global (#31866)

* PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-03-17 16:06:10 +01:00
parent f1df32ac03
commit 87c3a2b790
95 changed files with 2455 additions and 2426 deletions
@@ -13,7 +13,9 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )

-func updateTestDashboard(dashboard *models.Dashboard, data map[string]interface{}) {
+func updateTestDashboard(t *testing.T, sqlStore *SQLStore, dashboard *models.Dashboard, data map[string]interface{}) {
+	t.Helper()
+
 	data["id"] = dashboard.Id

 	saveCmd := models.SaveDashboardCommand{
@@ -21,17 +23,16 @@ func updateTestDashboard(dashboard *models.Dashboard, data map[string]interface{
 		Overwrite: true,
 		Dashboard: simplejson.NewFromAny(data),
 	}
-
-	err := SaveDashboard(&saveCmd)
+	_, err := sqlStore.SaveDashboard(saveCmd)
 	So(err, ShouldBeNil)
 }

 func TestGetDashboardVersion(t *testing.T) {
 	Convey("Testing dashboard version retrieval", t, func() {
-		InitTestDB(t)
+		sqlStore := InitTestDB(t)

 		Convey("Get a Dashboard ID and version ID", func() {
-			savedDash := insertTestDashboard(t, "test dash 26", 1, 0, false, "diff")
+			savedDash := insertTestDashboard(t, sqlStore, "test dash 26", 1, 0, false, "diff")

 			query := models.GetDashboardVersionQuery{
 				DashboardId: savedDash.Id,
@@ -71,8 +72,8 @@ func TestGetDashboardVersion(t *testing.T) {

 func TestGetDashboardVersions(t *testing.T) {
 	Convey("Testing dashboard versions retrieval", t, func() {
-		InitTestDB(t)
-		savedDash := insertTestDashboard(t, "test dash 43", 1, 0, false, "diff-all")
+		sqlStore := InitTestDB(t)
+		savedDash := insertTestDashboard(t, sqlStore, "test dash 43", 1, 0, false, "diff-all")

 		Convey("Get all versions for a given Dashboard ID", func() {
 			query := models.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1}
@@ -92,7 +93,7 @@ func TestGetDashboardVersions(t *testing.T) {
 		})

 		Convey("Get all versions for an updated dashboard", func() {
-			updateTestDashboard(savedDash, map[string]interface{}{
+			updateTestDashboard(t, sqlStore, savedDash, map[string]interface{}{
 				"tags": "different-tag",
 			})

@@ -107,14 +108,14 @@ func TestGetDashboardVersions(t *testing.T) {

 func TestDeleteExpiredVersions(t *testing.T) {
 	Convey("Testing dashboard versions clean up", t, func() {
-		InitTestDB(t)
+		sqlStore := InitTestDB(t)
 		versionsToKeep := 5
 		versionsToWrite := 10
 		setting.DashboardVersionsToKeep = versionsToKeep

-		savedDash := insertTestDashboard(t, "test dash 53", 1, 0, false, "diff-all")
+		savedDash := insertTestDashboard(t, sqlStore, "test dash 53", 1, 0, false, "diff-all")
 		for i := 0; i < versionsToWrite-1; i++ {
-			updateTestDashboard(savedDash, map[string]interface{}{
+			updateTestDashboard(t, sqlStore, savedDash, map[string]interface{}{
 				"tags": "different-tag",
 			})
 		}
@@ -152,7 +153,7 @@ func TestDeleteExpiredVersions(t *testing.T) {

 			versionsToWriteBigNumber := perBatch*maxBatches + versionsToWrite
 			for i := 0; i < versionsToWriteBigNumber-versionsToWrite; i++ {
-				updateTestDashboard(savedDash, map[string]interface{}{
+				updateTestDashboard(t, sqlStore, savedDash, map[string]interface{}{
 					"tags": "different-tag",
 				})
 			}