Folders: Split legacy out of folder.Service (and remove folder.FolderStore) (#110734)

pkg/services/dashboards/service/dashboard_service.go

@@ -83,7 +83,6 @@ type DashboardServiceImpl struct {
 	cfg                    *setting.Cfg
 	log                    log.Logger
 	dashboardStore         dashboards.Store
-	folderStore            folder.FolderStore
 	folderService          folder.Service
 	orgService             org.Service
 	features               featuremgmt.FeatureToggles
@@ -373,7 +372,6 @@ var _ registry.BackgroundService = (*DashboardServiceImpl)(nil)
 func ProvideDashboardServiceImpl(
 	cfg *setting.Cfg,
 	dashboardStore dashboards.Store,
-	folderStore folder.FolderStore,
 	features featuremgmt.FeatureToggles,
 	folderPermissionsService accesscontrol.FolderPermissionsService,
 	ac accesscontrol.AccessControl,
@@ -396,7 +394,6 @@ func ProvideDashboardServiceImpl(
 		folderPermissions:         folderPermissionsService,
 		ac:                        ac,
 		acService:                 acService,
-		folderStore:               folderStore,
 		folderService:             folderSvc,
 		orgService:                orgService,
 		k8sclient:                 k8sClient,

pkg/services/dashboards/service/dashboard_service_test.go

@@ -2094,7 +2094,6 @@ func TestSetDefaultPermissionsAfterCreate(t *testing.T) {
 
 				// Setup mocks and service
 				dashboardStore := &dashboards.FakeDashboardStore{}
-				folderStore := foldertest.FakeFolderStore{}
 				features := featuremgmt.WithFeatures()
 				if tc.featureKubernetesDashboards {
 					features = featuremgmt.WithFeatures(featuremgmt.FlagKubernetesDashboards)
@@ -2107,7 +2106,6 @@ func TestSetDefaultPermissionsAfterCreate(t *testing.T) {
 					cfg:                       setting.NewCfg(),
 					log:                       log.New("test-logger"),
 					dashboardStore:            dashboardStore,
-					folderStore:               &folderStore,
 					features:                  features,
 					dashboardPermissions:      permService,
 					folderPermissions:         permService,