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>
2025-02-25 18:55:37 -06:00 · 2021-03-17 16:06:10 +01:00
parent f1df32ac03
commit 87c3a2b790
95 changed files with 2455 additions and 2426 deletions
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -13,8 +13,8 @@ import (
 	"gopkg.in/macaron.v1"

 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	dboards "github.com/grafana/grafana/pkg/dashboards"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/dashboards"
@@ -731,6 +731,7 @@ type scenarioContext struct {
 	user          models.SignedInUser
 	folder        *models.Folder
 	initialResult libraryPanelResult
+	sqlStore      *sqlstore.SQLStore
 }

 type folderACLItem struct {
@@ -738,7 +739,8 @@ type folderACLItem struct {
 	permission models.PermissionType
 }

-func createDashboard(t *testing.T, user models.SignedInUser, title string, folderID int64) *models.Dashboard {
+func createDashboard(t *testing.T, sqlStore *sqlstore.SQLStore, user models.SignedInUser, title string,
+	folderID int64) *models.Dashboard {
 	dash := models.NewDashboard(title)
 	dash.FolderId = folderID
 	dashItem := &dashboards.SaveDashboardDTO{
@@ -748,53 +750,47 @@ func createDashboard(t *testing.T, user models.SignedInUser, title string, folde
 		User:      &user,
 		Overwrite: false,
 	}
-	bus.AddHandler("test", func(cmd *models.ValidateDashboardAlertsCommand) error {
-		return nil
+	origUpdateAlerting := dashboards.UpdateAlerting
+	t.Cleanup(func() {
+		dashboards.UpdateAlerting = origUpdateAlerting
 	})
-	bus.AddHandler("test", func(cmd *models.ValidateDashboardBeforeSaveCommand) error {
-		cmd.Result = &models.ValidateDashboardBeforeSaveResult{}
+	dashboards.UpdateAlerting = func(store dboards.Store, orgID int64, dashboard *models.Dashboard,
+		user *models.SignedInUser) error {
 		return nil
-	})
-	bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error {
-		cmd.Result = nil
-		return nil
-	})
-	bus.AddHandler("test", func(cmd *models.UpdateDashboardAlertsCommand) error {
-		return nil
-	})
+	}

-	dashboard, err := dashboards.NewService().SaveDashboard(dashItem, true)
+	dashboard, err := dashboards.NewService(sqlStore).SaveDashboard(dashItem, true)
 	require.NoError(t, err)

 	return dashboard
 }

-func createFolderWithACL(t *testing.T, title string, user models.SignedInUser, items []folderACLItem) *models.Folder {
-	s := dashboards.NewFolderService(user.OrgId, &user)
-	folderCmd := models.CreateFolderCommand{
-		Uid:   title,
-		Title: title,
-	}
-	err := s.CreateFolder(&folderCmd)
+func createFolderWithACL(t *testing.T, sqlStore *sqlstore.SQLStore, title string, user models.SignedInUser,
+	items []folderACLItem) *models.Folder {
+	t.Helper()
+
+	s := dashboards.NewFolderService(user.OrgId, &user, sqlStore)
+	t.Logf("Creating folder with title and UID %q", title)
+	folder, err := s.CreateFolder(title, title)
 	require.NoError(t, err)

-	updateFolderACL(t, folderCmd.Result.Id, items)
+	updateFolderACL(t, sqlStore, folder.Id, items)

-	return folderCmd.Result
+	return folder
 }

-func updateFolderACL(t *testing.T, folderID int64, items []folderACLItem) {
+func updateFolderACL(t *testing.T, sqlStore *sqlstore.SQLStore, folderID int64, items []folderACLItem) {
+	t.Helper()
+
 	if len(items) == 0 {
 		return
 	}

-	cmd := models.UpdateDashboardAclCommand{
-		DashboardID: folderID,
-	}
+	var aclItems []*models.DashboardAcl
 	for _, item := range items {
 		role := item.roleType
 		permission := item.permission
-		cmd.Items = append(cmd.Items, &models.DashboardAcl{
+		aclItems = append(aclItems, &models.DashboardAcl{
 			DashboardID: folderID,
 			Role:        &role,
 			Permission:  permission,
@@ -803,11 +799,13 @@ func updateFolderACL(t *testing.T, folderID int64, items []folderACLItem) {
 		})
 	}

-	err := bus.Dispatch(&cmd)
+	err := sqlStore.UpdateDashboardACL(folderID, aclItems)
 	require.NoError(t, err)
 }

 func validateAndUnMarshalResponse(t *testing.T, resp response.Response) libraryPanelResult {
+	t.Helper()
+
 	require.Equal(t, 200, resp.Status())

 	var result = libraryPanelResult{}
@@ -818,6 +816,8 @@ func validateAndUnMarshalResponse(t *testing.T, resp response.Response) libraryP
 }

 func scenarioWithLibraryPanel(t *testing.T, desc string, fn func(t *testing.T, sc scenarioContext)) {
+	t.Helper()
+
 	testScenario(t, desc, func(t *testing.T, sc scenarioContext) {
 		command := getCreateCommand(sc.folder.Id, "Text - Library Panel")
 		resp := sc.service.createHandler(sc.reqContext, command)
@@ -865,25 +865,26 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
 		// deliberate difference between signed in user and user in db to make it crystal clear
 		// what to expect in the tests
 		// In the real world these are identical
-		cmd := &models.CreateUserCommand{
+		cmd := models.CreateUserCommand{
 			Email: "user.in.db@test.com",
 			Name:  "User In DB",
 			Login: UserInDbName,
 		}
-		err := sqlstore.CreateUser(context.Background(), cmd)
+		_, err := sqlStore.CreateUser(context.Background(), cmd)
 		require.NoError(t, err)

 		sc := scenarioContext{
-			user:    user,
-			ctx:     &ctx,
-			service: &service,
+			user:     user,
+			ctx:      &ctx,
+			service:  &service,
+			sqlStore: sqlStore,
 			reqContext: &models.ReqContext{
 				Context:      &ctx,
 				SignedInUser: &user,
 			},
 		}

-		sc.folder = createFolderWithACL(t, "ScenarioFolder", sc.user, []folderACLItem{})
+		sc.folder = createFolderWithACL(t, sc.sqlStore, "ScenarioFolder", sc.user, []folderACLItem{})

 		fn(t, sc)
 	})