IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nested Folders: Decrease max nested folders depth (#78133)

Browse Source 
* Nested Folders: Decrease allowed nested folders depth

* Fix folder height check in Move
This commit is contained in:
Tania 2023-11-15 01:25:40 -08:00 committed by GitHub
parent 20f541d7e7
commit 1d1d42c984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/folder/folderimpl/folder.go
View File

@ -698,8 +698,8 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
return nil, err return nil, err
} }
// current folder height + current folder + parent folder + parent folder depth should be less than or equal 8 // height of the folder that is being moved + this current folder itself + depth of the NewParent folder should be less than or equal MaxNestedFolderDepth
if folderHeight+len(parents)+2 > folder.MaxNestedFolderDepth { if folderHeight+len(parents)+1 > folder.MaxNestedFolderDepth {
return nil, folder.ErrMaximumDepthReached.Errorf("failed to move folder") return nil, folder.ErrMaximumDepthReached.Errorf("failed to move folder")
} }
@ -961,7 +961,7 @@ func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID str
return fmt.Errorf("failed to get parents: %w", err) return fmt.Errorf("failed to get parents: %w", err)
} }
if len(ancestors) == folder.MaxNestedFolderDepth { if len(ancestors) >= folder.MaxNestedFolderDepth {
return folder.ErrMaximumDepthReached.Errorf("failed to validate parent folder") return folder.ErrMaximumDepthReached.Errorf("failed to validate parent folder")
} }

2
pkg/services/folder/model.go
View File

@ -20,7 +20,7 @@ var ErrTargetRegistrySrvConflict = errutil.Internal("folder.target-registry-srv-
const ( const (
GeneralFolderUID = "general" GeneralFolderUID = "general"
RootFolderUID = "" RootFolderUID = ""
MaxNestedFolderDepth = 8 MaxNestedFolderDepth = 4
) )
var ErrFolderNotFound = errutil.NotFound("folder.notFound") var ErrFolderNotFound = errutil.NotFound("folder.notFound")