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,9 +13,9 @@ import (

 func TestDashboardProvisioningTest(t *testing.T) {
 	Convey("Testing Dashboard provisioning", t, func() {
-		InitTestDB(t)
+		sqlStore := InitTestDB(t)

-		folderCmd := &models.SaveDashboardCommand{
+		folderCmd := models.SaveDashboardCommand{
 			OrgId:    1,
 			FolderId: 0,
 			IsFolder: true,
@@ -25,13 +25,13 @@ func TestDashboardProvisioningTest(t *testing.T) {
 			}),
 		}

-		err := SaveDashboard(folderCmd)
+		dash, err := sqlStore.SaveDashboard(folderCmd)
 		So(err, ShouldBeNil)

-		saveDashboardCmd := &models.SaveDashboardCommand{
+		saveDashboardCmd := models.SaveDashboardCommand{
 			OrgId:    1,
 			IsFolder: false,
-			FolderId: folderCmd.Result.Id,
+			FolderId: dash.Id,
 			Dashboard: simplejson.NewFromAny(map[string]interface{}{
 				"id":    nil,
 				"title": "test dashboard",
@@ -41,43 +41,38 @@ func TestDashboardProvisioningTest(t *testing.T) {
 		Convey("Saving dashboards with provisioning meta data", func() {
 			now := time.Now()

-			cmd := &models.SaveProvisionedDashboardCommand{
-				DashboardCmd: saveDashboardCmd,
-				DashboardProvisioning: &models.DashboardProvisioning{
-					Name:       "default",
-					ExternalId: "/var/grafana.json",
-					Updated:    now.Unix(),
-				},
+			provisioning := &models.DashboardProvisioning{
+				Name:       "default",
+				ExternalId: "/var/grafana.json",
+				Updated:    now.Unix(),
 			}

-			err := SaveProvisionedDashboard(cmd)
+			dash, err := sqlStore.SaveProvisionedDashboard(saveDashboardCmd, provisioning)
 			So(err, ShouldBeNil)
-			So(cmd.Result, ShouldNotBeNil)
-			So(cmd.Result.Id, ShouldNotEqual, 0)
-			dashId := cmd.Result.Id
+			So(dash, ShouldNotBeNil)
+			So(dash.Id, ShouldNotEqual, 0)
+			dashId := dash.Id

 			Convey("Deleting orphaned provisioned dashboards", func() {
-				anotherCmd := &models.SaveProvisionedDashboardCommand{
-					DashboardCmd: &models.SaveDashboardCommand{
-						OrgId:    1,
-						IsFolder: false,
-						FolderId: folderCmd.Result.Id,
-						Dashboard: simplejson.NewFromAny(map[string]interface{}{
-							"id":    nil,
-							"title": "another_dashboard",
-						}),
-					},
-					DashboardProvisioning: &models.DashboardProvisioning{
-						Name:       "another_reader",
-						ExternalId: "/var/grafana.json",
-						Updated:    now.Unix(),
-					},
+				saveCmd := models.SaveDashboardCommand{
+					OrgId:    1,
+					IsFolder: false,
+					FolderId: dash.Id,
+					Dashboard: simplejson.NewFromAny(map[string]interface{}{
+						"id":    nil,
+						"title": "another_dashboard",
+					}),
+				}
+				provisioning := &models.DashboardProvisioning{
+					Name:       "another_reader",
+					ExternalId: "/var/grafana.json",
+					Updated:    now.Unix(),
 				}

-				err := SaveProvisionedDashboard(anotherCmd)
+				anotherDash, err := sqlStore.SaveProvisionedDashboard(saveCmd, provisioning)
 				So(err, ShouldBeNil)

-				query := &models.GetDashboardsQuery{DashboardIds: []int64{anotherCmd.Result.Id}}
+				query := &models.GetDashboardsQuery{DashboardIds: []int64{anotherDash.Id}}
 				err = GetDashboards(query)
 				So(err, ShouldBeNil)
 				So(query.Result, ShouldNotBeNil)
@@ -85,7 +80,7 @@ func TestDashboardProvisioningTest(t *testing.T) {
 				deleteCmd := &models.DeleteOrphanedProvisionedDashboardsCommand{ReaderNames: []string{"default"}}
 				So(DeleteOrphanedProvisionedDashboards(deleteCmd), ShouldBeNil)

-				query = &models.GetDashboardsQuery{DashboardIds: []int64{cmd.Result.Id, anotherCmd.Result.Id}}
+				query = &models.GetDashboardsQuery{DashboardIds: []int64{dash.Id, anotherDash.Id}}
 				err = GetDashboards(query)
 				So(err, ShouldBeNil)

@@ -94,45 +89,38 @@ func TestDashboardProvisioningTest(t *testing.T) {
 			})

 			Convey("Can query for provisioned dashboards", func() {
-				query := &models.GetProvisionedDashboardDataQuery{Name: "default"}
-				err := GetProvisionedDashboardDataQuery(query)
+				rslt, err := sqlStore.GetProvisionedDashboardData("default")
 				So(err, ShouldBeNil)

-				So(len(query.Result), ShouldEqual, 1)
-				So(query.Result[0].DashboardId, ShouldEqual, dashId)
-				So(query.Result[0].Updated, ShouldEqual, now.Unix())
+				So(len(rslt), ShouldEqual, 1)
+				So(rslt[0].DashboardId, ShouldEqual, dashId)
+				So(rslt[0].Updated, ShouldEqual, now.Unix())
 			})

 			Convey("Can query for one provisioned dashboard", func() {
-				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id}
-
-				err := GetProvisionedDataByDashboardId(query)
+				data, err := sqlStore.GetProvisionedDataByDashboardID(dash.Id)
 				So(err, ShouldBeNil)

-				So(query.Result, ShouldNotBeNil)
+				So(data, ShouldNotBeNil)
 			})

 			Convey("Can query for none provisioned dashboard", func() {
-				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: 3000}
-
-				err := GetProvisionedDataByDashboardId(query)
+				data, err := sqlStore.GetProvisionedDataByDashboardID(3000)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeNil)
+				So(data, ShouldBeNil)
 			})

 			Convey("Deleting folder should delete provision meta data", func() {
 				deleteCmd := &models.DeleteDashboardCommand{
-					Id:    folderCmd.Result.Id,
+					Id:    dash.Id,
 					OrgId: 1,
 				}

 				So(DeleteDashboard(deleteCmd), ShouldBeNil)

-				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id}
-
-				err = GetProvisionedDataByDashboardId(query)
+				data, err := sqlStore.GetProvisionedDataByDashboardID(dash.Id)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeNil)
+				So(data, ShouldBeNil)
 			})

 			Convey("UnprovisionDashboard should delete provisioning metadata", func() {
@@ -142,11 +130,9 @@ func TestDashboardProvisioningTest(t *testing.T) {

 				So(UnprovisionDashboard(unprovisionCmd), ShouldBeNil)

-				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: dashId}
-
-				err = GetProvisionedDataByDashboardId(query)
+				data, err := sqlStore.GetProvisionedDataByDashboardID(dashId)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeNil)
+				So(data, ShouldBeNil)
 			})
 		})
 	})