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>

pkg/services/librarypanels/database.go

@@ -8,7 +8,6 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -67,7 +66,7 @@ func (lps *LibraryPanelService) createLibraryPanel(c *models.ReqContext, cmd cre
 	}
 
 	err := lps.SQLStore.WithTransactionalDbSession(c.Context.Req.Context(), func(session *sqlstore.DBSession) error {
-		if err := requirePermissionsOnFolder(c.SignedInUser, cmd.FolderID); err != nil {
+		if err := lps.requirePermissionsOnFolder(c.SignedInUser, cmd.FolderID); err != nil {
 			return err
 		}
 		if _, err := session.Insert(&libraryPanel); err != nil {
@@ -108,12 +107,22 @@ func (lps *LibraryPanelService) createLibraryPanel(c *models.ReqContext, cmd cre
 	return dto, err
 }
 
-func connectDashboard(session *sqlstore.DBSession, dialect migrator.Dialect, user *models.SignedInUser, uid string, dashboardID int64) error {
+// connectDashboard adds a connection between a Library Panel and a Dashboard.
+func (lps *LibraryPanelService) connectDashboard(c *models.ReqContext, uid string, dashboardID int64) error {
+	err := lps.SQLStore.WithTransactionalDbSession(c.Context.Req.Context(), func(session *sqlstore.DBSession) error {
+		return lps.implConnectDashboard(session, c.SignedInUser, uid, dashboardID)
+	})
+
+	return err
+}
+
+func (lps *LibraryPanelService) implConnectDashboard(session *sqlstore.DBSession, user *models.SignedInUser,
+	uid string, dashboardID int64) error {
 	panel, err := getLibraryPanel(session, uid, user.OrgId)
 	if err != nil {
 		return err
 	}
-	if err := requirePermissionsOnFolder(user, panel.FolderID); err != nil {
+	if err := lps.requirePermissionsOnFolder(user, panel.FolderID); err != nil {
 		return err
 	}
 
@@ -126,7 +135,7 @@ func connectDashboard(session *sqlstore.DBSession, dialect migrator.Dialect, use
 		CreatedBy:      user.UserId,
 	}
 	if _, err := session.Insert(&libraryPanelDashboard); err != nil {
-		if dialect.IsUniqueConstraintViolation(err) {
+		if lps.SQLStore.Dialect.IsUniqueConstraintViolation(err) {
 			return nil
 		}
 		return err
@@ -134,15 +143,6 @@ func connectDashboard(session *sqlstore.DBSession, dialect migrator.Dialect, use
 	return nil
 }
 
-// connectDashboard adds a connection between a Library Panel and a Dashboard.
-func (lps *LibraryPanelService) connectDashboard(c *models.ReqContext, uid string, dashboardID int64) error {
-	err := lps.SQLStore.WithTransactionalDbSession(c.Context.Req.Context(), func(session *sqlstore.DBSession) error {
-		return connectDashboard(session, lps.SQLStore.Dialect, c.SignedInUser, uid, dashboardID)
-	})
-
-	return err
-}
-
 // connectLibraryPanelsForDashboard adds connections for all Library Panels in a Dashboard.
 func (lps *LibraryPanelService) connectLibraryPanelsForDashboard(c *models.ReqContext, uids []string, dashboardID int64) error {
 	err := lps.SQLStore.WithTransactionalDbSession(c.Context.Req.Context(), func(session *sqlstore.DBSession) error {
@@ -151,7 +151,7 @@ func (lps *LibraryPanelService) connectLibraryPanelsForDashboard(c *models.ReqCo
 			return err
 		}
 		for _, uid := range uids {
-			err := connectDashboard(session, lps.SQLStore.Dialect, c.SignedInUser, uid, dashboardID)
+			err := lps.implConnectDashboard(session, c.SignedInUser, uid, dashboardID)
 			if err != nil {
 				return err
 			}
@@ -169,7 +169,7 @@ func (lps *LibraryPanelService) deleteLibraryPanel(c *models.ReqContext, uid str
 		if err != nil {
 			return err
 		}
-		if err := requirePermissionsOnFolder(c.SignedInUser, panel.FolderID); err != nil {
+		if err := lps.requirePermissionsOnFolder(c.SignedInUser, panel.FolderID); err != nil {
 			return err
 		}
 		if _, err := session.Exec("DELETE FROM library_panel_dashboard WHERE librarypanel_id=?", panel.ID); err != nil {
@@ -197,7 +197,7 @@ func (lps *LibraryPanelService) disconnectDashboard(c *models.ReqContext, uid st
 		if err != nil {
 			return err
 		}
-		if err := requirePermissionsOnFolder(c.SignedInUser, panel.FolderID); err != nil {
+		if err := lps.requirePermissionsOnFolder(c.SignedInUser, panel.FolderID); err != nil {
 			return err
 		}
 
@@ -248,7 +248,7 @@ func (lps *LibraryPanelService) deleteLibraryPanelsInFolder(c *models.ReqContext
 		}
 		folderID := folderUIDs[0].ID
 
-		if err := requirePermissionsOnFolder(c.SignedInUser, folderID); err != nil {
+		if err := lps.requirePermissionsOnFolder(c.SignedInUser, folderID); err != nil {
 			return err
 		}
 		var dashIDs []struct {
@@ -496,7 +496,8 @@ func (lps *LibraryPanelService) getLibraryPanelsForDashboardID(c *models.ReqCont
 	return libraryPanelMap, err
 }
 
-func handleFolderIDPatches(panelToPatch *LibraryPanel, fromFolderID int64, toFolderID int64, user *models.SignedInUser) error {
+func (lps *LibraryPanelService) handleFolderIDPatches(panelToPatch *LibraryPanel, fromFolderID int64,
+	toFolderID int64, user *models.SignedInUser) error {
 	// FolderID was not provided in the PATCH request
 	if toFolderID == -1 {
 		toFolderID = fromFolderID
@@ -504,13 +505,13 @@ func handleFolderIDPatches(panelToPatch *LibraryPanel, fromFolderID int64, toFol
 
 	// FolderID was provided in the PATCH request
 	if toFolderID != -1 && toFolderID != fromFolderID {
-		if err := requirePermissionsOnFolder(user, toFolderID); err != nil {
+		if err := lps.requirePermissionsOnFolder(user, toFolderID); err != nil {
 			return err
 		}
 	}
 
 	// Always check permissions for the folder where library panel resides
-	if err := requirePermissionsOnFolder(user, fromFolderID); err != nil {
+	if err := lps.requirePermissionsOnFolder(user, fromFolderID); err != nil {
 		return err
 	}
 
@@ -551,7 +552,7 @@ func (lps *LibraryPanelService) patchLibraryPanel(c *models.ReqContext, cmd patc
 		if cmd.Model == nil {
 			libraryPanel.Model = panelInDB.Model
 		}
-		if err := handleFolderIDPatches(&libraryPanel, panelInDB.FolderID, cmd.FolderID, c.SignedInUser); err != nil {
+		if err := lps.handleFolderIDPatches(&libraryPanel, panelInDB.FolderID, cmd.FolderID, c.SignedInUser); err != nil {
 			return err
 		}
 		if err := syncTitleWithName(&libraryPanel); err != nil {

pkg/services/librarypanels/guard.go

@@ -10,7 +10,7 @@ func isGeneralFolder(folderID int64) bool {
 	return folderID == 0
 }
 
-func requirePermissionsOnFolder(user *models.SignedInUser, folderID int64) error {
+func (lps *LibraryPanelService) requirePermissionsOnFolder(user *models.SignedInUser, folderID int64) error {
 	if isGeneralFolder(folderID) && user.HasRole(models.ROLE_EDITOR) {
 		return nil
 	}
@@ -19,7 +19,7 @@ func requirePermissionsOnFolder(user *models.SignedInUser, folderID int64) error
 		return models.ErrFolderAccessDenied
 	}
 
-	s := dashboards.NewFolderService(user.OrgId, user)
+	s := dashboards.NewFolderService(user.OrgId, user, lps.SQLStore)
 	folder, err := s.GetFolderByID(folderID)
 	if err != nil {
 		return err

pkg/services/librarypanels/librarypanels_connections_test.go

@@ -74,11 +74,11 @@ func TestGetConnectedDashboards(t *testing.T) {
 
 	scenarioWithLibraryPanel(t, "When an admin tries to get connected dashboards for a library panel that exists and has connections, it should return connected dashboard IDs",
 		func(t *testing.T, sc scenarioContext) {
-			firstDash := createDashboard(t, sc.user, "Dash 1", 0)
+			firstDash := createDashboard(t, sc.sqlStore, sc.user, "Dash 1", 0)
 			sc.reqContext.ReplaceAllParams(map[string]string{":uid": sc.initialResult.Result.UID, ":dashboardId": strconv.FormatInt(firstDash.Id, 10)})
 			resp := sc.service.connectHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
-			secondDash := createDashboard(t, sc.user, "Dash 2", 0)
+			secondDash := createDashboard(t, sc.sqlStore, sc.user, "Dash 2", 0)
 			sc.reqContext.ReplaceAllParams(map[string]string{":uid": sc.initialResult.Result.UID, ":dashboardId": strconv.FormatInt(secondDash.Id, 10)})
 			resp = sc.service.connectHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())

pkg/services/librarypanels/librarypanels_patch_test.go

@@ -25,7 +25,7 @@ func TestPatchLibraryPanel(t *testing.T) {
 			resp = sc.service.connectHandler(sc.reqContext)
 			require.Equal(t, 200, resp.Status())
 
-			newFolder := createFolderWithACL(t, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
 			cmd := patchLibraryPanelCommand{
 				FolderID: newFolder.Id,
 				Name:     "Panel - New name",
@@ -82,7 +82,7 @@ func TestPatchLibraryPanel(t *testing.T) {
 
 	scenarioWithLibraryPanel(t, "When an admin tries to patch a library panel with folder only, it should change folder successfully and return correct result",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
 			cmd := patchLibraryPanelCommand{
 				FolderID: newFolder.Id,
 				Version:  1,
@@ -174,7 +174,7 @@ func TestPatchLibraryPanel(t *testing.T) {
 
 	scenarioWithLibraryPanel(t, "When an admin tries to patch a library panel with a folder where a library panel with the same name already exists, it should fail",
 		func(t *testing.T, sc scenarioContext) {
-			newFolder := createFolderWithACL(t, "NewFolder", sc.user, []folderACLItem{})
+			newFolder := createFolderWithACL(t, sc.sqlStore, "NewFolder", sc.user, []folderACLItem{})
 			command := getCreateCommand(newFolder.Id, "Text - Library Panel")
 			resp := sc.service.createHandler(sc.reqContext, command)
 			var result = validateAndUnMarshalResponse(t, resp)

pkg/services/librarypanels/librarypanels_permissions_test.go

@@ -68,7 +68,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 	for _, testCase := range accessCases {
 		testScenario(t, fmt.Sprintf("When %s tries to create a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
 				command := getCreateCommand(folder.Id, "Library Panel Name")
@@ -78,11 +78,11 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				fromFolder := createFolderWithACL(t, "Everyone", sc.user, everyonePermissions)
+				fromFolder := createFolderWithACL(t, sc.sqlStore, "Everyone", sc.user, everyonePermissions)
 				command := getCreateCommand(fromFolder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, command)
 				result := validateAndUnMarshalResponse(t, resp)
-				toFolder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
+				toFolder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
 				cmd := patchLibraryPanelCommand{FolderID: toFolder.Id, Version: 1}
@@ -93,11 +93,11 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it from a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				fromFolder := createFolderWithACL(t, "Everyone", sc.user, testCase.items)
+				fromFolder := createFolderWithACL(t, sc.sqlStore, "Everyone", sc.user, testCase.items)
 				command := getCreateCommand(fromFolder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, command)
 				result := validateAndUnMarshalResponse(t, resp)
-				toFolder := createFolderWithACL(t, "Folder", sc.user, everyonePermissions)
+				toFolder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
 				sc.reqContext.SignedInUser.OrgRole = testCase.role
 
 				cmd := patchLibraryPanelCommand{FolderID: toFolder.Id, Version: 1}
@@ -108,7 +108,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to delete a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
 				cmd := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -121,8 +121,8 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to connect a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
-				dashboard := createDashboard(t, sc.user, "Some Folder Dash", folder.Id)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
+				dashboard := createDashboard(t, sc.sqlStore, sc.user, "Some Folder Dash", folder.Id)
 				cmd := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -135,8 +135,8 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to disconnect a library panel in a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
-				dashboard := createDashboard(t, sc.user, "Some Folder Dash", folder.Id)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
+				dashboard := createDashboard(t, sc.sqlStore, sc.user, "Some Folder Dash", folder.Id)
 				cmd := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -152,7 +152,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to delete all library panels in a folder with %s, it should return correct status", testCase.role, testCase.desc),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, testCase.items)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, testCase.items)
 				cmd := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				validateAndUnMarshalResponse(t, resp)
@@ -191,7 +191,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, everyonePermissions)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
 				command := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, command)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -205,7 +205,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it from the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, everyonePermissions)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
 				command := getCreateCommand(0, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, command)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -231,7 +231,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to connect a library panel in the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				dashboard := createDashboard(t, sc.user, "General Folder Dash", 0)
+				dashboard := createDashboard(t, sc.sqlStore, sc.user, "General Folder Dash", 0)
 				cmd := getCreateCommand(0, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -244,7 +244,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to disconnect a library panel in the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				dashboard := createDashboard(t, sc.user, "General Folder Dash", 0)
+				dashboard := createDashboard(t, sc.sqlStore, sc.user, "General Folder Dash", 0)
 				cmd := getCreateCommand(0, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -260,7 +260,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to get connected dashboards in the General folder for a library panel in the General folder, it should return correct status", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				dashboard := createDashboard(t, sc.user, "General Folder Dash", 0)
+				dashboard := createDashboard(t, sc.sqlStore, sc.user, "General Folder Dash", 0)
 				cmd := getCreateCommand(0, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -301,7 +301,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 
 		testScenario(t, fmt.Sprintf("When %s tries to patch a library panel by moving it to a folder that doesn't exist, it should fail", testCase.role),
 			func(t *testing.T, sc scenarioContext) {
-				folder := createFolderWithACL(t, "Folder", sc.user, everyonePermissions)
+				folder := createFolderWithACL(t, sc.sqlStore, "Folder", sc.user, everyonePermissions)
 				command := getCreateCommand(folder.Id, "Library Panel Name")
 				resp := sc.service.createHandler(sc.reqContext, command)
 				result := validateAndUnMarshalResponse(t, resp)
@@ -329,7 +329,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 			func(t *testing.T, sc scenarioContext) {
 				var results []libraryPanel
 				for i, folderCase := range folderCases {
-					folder := createFolderWithACL(t, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
+					folder := createFolderWithACL(t, sc.sqlStore, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
 					cmd := getCreateCommand(folder.Id, fmt.Sprintf("Library Panel in Folder%v", i))
 					resp := sc.service.createHandler(sc.reqContext, cmd)
 					result := validateAndUnMarshalResponse(t, resp)
@@ -401,8 +401,8 @@ func TestLibraryPanelPermissions(t *testing.T) {
 				resp := sc.service.createHandler(sc.reqContext, cmd)
 				result := validateAndUnMarshalResponse(t, resp)
 				for i, folderCase := range folderCases {
-					folder := createFolderWithACL(t, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
-					dashboard := createDashboard(t, sc.user, "Some Folder Dash", folder.Id)
+					folder := createFolderWithACL(t, sc.sqlStore, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
+					dashboard := createDashboard(t, sc.sqlStore, sc.user, "Some Folder Dash", folder.Id)
 					sc.reqContext.ReplaceAllParams(map[string]string{":uid": result.Result.UID, ":dashboardId": strconv.FormatInt(dashboard.Id, 10)})
 					resp = sc.service.connectHandler(sc.reqContext)
 					require.Equal(t, 200, resp.Status())
@@ -434,7 +434,7 @@ func TestLibraryPanelPermissions(t *testing.T) {
 			func(t *testing.T, sc scenarioContext) {
 				var results []libraryPanel
 				for i, folderCase := range folderCases {
-					folder := createFolderWithACL(t, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
+					folder := createFolderWithACL(t, sc.sqlStore, fmt.Sprintf("Folder%v", i), sc.user, folderCase)
 					cmd := getCreateCommand(folder.Id, fmt.Sprintf("Library Panel in Folder%v", i))
 					resp := sc.service.createHandler(sc.reqContext, cmd)
 					result := validateAndUnMarshalResponse(t, resp)

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)
 	})