Remove folderID from service tests (#80615)

* Remove folderID from service tests * Remove folderID from ngalert migration tests * Remove tests related to folderIDs * Roll back change Before removing FolderID from this test, we need to adjust the code * Remove FolderID from publicdashboard pkg * Add back annotations test
2025-02-25 18:55:37 -06:00 · 2024-01-26 16:36:35 +01:00
parent 04396c001a
commit f44592a97a
13 changed files with 144 additions and 604 deletions
--- a/pkg/services/sqlstore/permissions/dashboard_test.go
+++ b/pkg/services/sqlstore/permissions/dashboard_test.go
@@ -63,14 +63,6 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 			},
 			expectedResult: 110,
 		},
-		{
-			desc:       "Should be able to view dashboards under the root with folders:uid:general scope",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should not be able to view editable dashboards under the root with folders:uid:general scope if missing write action",
 			permission: dashboardaccess.PERMISSION_EDIT,
@@ -79,15 +71,6 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 			},
 			expectedResult: 0,
 		},
-		{
-			desc:       "Should be able to view editable dashboards under the root with folders:uid:general scope if has write action",
-			permission: dashboardaccess.PERMISSION_EDIT,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-				{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should be able to view a subset of dashboards with dashboard scopes",
 			permission: dashboardaccess.PERMISSION_VIEW,
@@ -101,15 +84,6 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
 			},
 			expectedResult: 6,
 		},
-		{
-			desc:       "Should be able to view a subset of dashboards with dashboard action and folder scope",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:8"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:10"},
-			},
-			expectedResult: 20,
-		},
 		{
 			desc:       "Should be able to view all folders with folder wildcard",
 			permission: dashboardaccess.PERMISSION_VIEW,
@@ -274,24 +248,6 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 			},
 			expectedResult: 6,
 		},
-		{
-			desc:       "Should be able to view a subset of dashboards with dashboard action and folder scope",
-			permission: dashboardaccess.PERMISSION_VIEW,
-
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:8"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:10"},
-			},
-			expectedResult: 20,
-		},
-		{
-			desc:       "Should be able to view dashboards under the root with folders:uid:general scope",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should not be able to view editable dashboards under the root with folders:uid:general scope if missing write action",
 			permission: dashboardaccess.PERMISSION_EDIT,
@@ -300,15 +256,6 @@ func TestIntegration_DashboardPermissionFilter_WithSelfContainedPermissions(t *t
 			},
 			expectedResult: 0,
 		},
-		{
-			desc:       "Should be able to view editable dashboards under the root with folders:uid:general scope if has write action",
-			permission: dashboardaccess.PERMISSION_EDIT,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-				{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID)},
-			},
-			expectedResult: 10,
-		},
 		{
 			desc:       "Should be able to view all folders with folder wildcard",
 			permission: dashboardaccess.PERMISSION_VIEW,
@@ -466,26 +413,6 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
 		},
-		{
-			desc:       "Should be able to view dashboards under inherited folders if nested folders are enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view dashboards under inherited folders if nested folders are not enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"dashboard under parent folder"},
-		},
 		{
 			desc:       "Should be able to view inherited folders if nested folders are enabled",
 			queryType:  searchstore.TypeFolder,
@@ -506,26 +433,6 @@ func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
 			features:       []any{},
 			expectedResult: []string{"parent"},
 		},
-		{
-			desc:       "Should be able to view inherited dashboards and folders if nested folders are enabled",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"parent", "subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view inherited dashboards and folders if nested folders are not enabled",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			permissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"parent", "dashboard under parent folder"},
-		},
 	}

 	origNewGuardian := guardian.New
@@ -619,26 +526,6 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 			features:       []any{featuremgmt.FlagNestedFolders},
 			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
 		},
-		{
-			desc:       "Should be able to view dashboards under inherited folders if nested folders are enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboardaccess.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view dashboards under inherited folders if nested folders are not enabled",
-			queryType:  searchstore.TypeDashboard,
-			permission: dashboardaccess.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"dashboard under parent folder"},
-		},
 		{
 			desc:       "Should be able to view inherited folders if nested folders are enabled",
 			queryType:  searchstore.TypeFolder,
@@ -659,40 +546,6 @@ func TestIntegration_DashboardNestedPermissionFilter_WithSelfContainedPermission
 			features:       []any{},
 			expectedResult: []string{"parent"},
 		},
-		{
-			desc:       "Should be able to view inherited dashboards and folders if nested folders are enabled",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"parent", "subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
-		{
-			desc:       "Should not be able to view inherited dashboards and folders if nested folders are not enabled",
-			permission: dashboardaccess.PERMISSION_VIEW,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-			},
-			features:       []any{},
-			expectedResult: []string{"parent", "dashboard under parent folder"},
-		},
-		{
-			desc:       "Should be able to edit inherited dashboards and folders if nested folders are enabled",
-			permission: dashboardaccess.PERMISSION_EDIT,
-			signedInUserPermissions: []accesscontrol.Permission{
-				{Action: dashboards.ActionFoldersRead, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsCreate, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:subfolder"},
-				{Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
-				{Action: dashboards.ActionDashboardsWrite, Scope: "folders:uid:parent"},
-			},
-			features:       []any{featuremgmt.FlagNestedFolders},
-			expectedResult: []string{"subfolder", "dashboard under parent folder", "dashboard under subfolder"},
-		},
 	}

 	origNewGuardian := guardian.New
@@ -776,15 +629,15 @@ func setupTest(t *testing.T, numFolders, numDashboards int, permissions []access
 				folderID = i % (numFolders + 1)
 			}
 			dashes = append(dashes, dashboards.Dashboard{
-				OrgID:    1,
-				IsFolder: false,
-				FolderID: int64(folderID), // nolint:staticcheck
-				UID:      str,
-				Slug:     str,
-				Title:    str,
-				Data:     simplejson.New(),
-				Created:  time.Now(),
-				Updated:  time.Now(),
+				OrgID:     1,
+				IsFolder:  false,
+				FolderUID: strconv.Itoa(folderID),
+				UID:       str,
+				Slug:      str,
+				Title:     str,
+				Data:      simplejson.New(),
+				Created:   time.Now(),
+				Updated:   time.Now(),
 			})
 		}

@@ -867,7 +720,6 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 	// create dashboard under parent folder
 	_, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  parent.ID, // nolint:staticcheck
 		FolderUID: parent.UID,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"title": "dashboard under parent folder",
@@ -878,7 +730,6 @@ func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol
 	// create dashboard under subfolder
 	_, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
 		OrgID:     orgID,
-		FolderID:  subfolder.ID, // nolint:staticcheck
 		FolderUID: subfolder.UID,
 		Dashboard: simplejson.NewFromAny(map[string]any{
 			"title": "dashboard under subfolder",