public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nested folders: Fix error response codes (#66943)

Browse Source 
* Nested folders: Fix error response codes

Fix error handling
This commit is contained in:
Sofia Papagiannaki
2023-04-20 17:47:51 +03:00
committed by GitHub
parent 7688ac6712
commit 24696d593b
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/folder.go
+2 -2
View File
@@ -558,7 +558,7 @@ func (s *Service) Move(ctx context.Context, cmd *folder.MoveFolderCommand) (*fol
// current folder height + current folder + parent folder + parent folder depth should be less than or equal 8
if folderHeight+len(parents)+2 > folder.MaxNestedFolderDepth {
return nil, folder.ErrMaximumDepthReached
return nil, folder.ErrMaximumDepthReached.Errorf("failed to move folder")
}
// if the current folder is already a parent of newparent, we should return error
@@ -775,7 +775,7 @@ func (s *Service) validateParent(ctx context.Context, orgID int64, parentUID str
}
if len(ancestors) == folder.MaxNestedFolderDepth {
return folder.ErrMaximumDepthReached
return folder.ErrMaximumDepthReached.Errorf("failed to validate parent folder")
}
// Create folder under itself is not allowed
pkg/services/folder/folderimpl/sqlstore.go
+1 -1
View File
@@ -284,7 +284,7 @@ func (ss *sqlStore) getParentsMySQL(ctx context.Context, cmd folder.GetParentsQu
folders = append(folders, f)
uid = f.ParentUID
if len(folders) > folder.MaxNestedFolderDepth {
return folder.ErrFolderTooDeep
return folder.ErrMaximumDepthReached.Errorf("failed to get parent folders iteratively")
}
}
return nil
pkg/services/folder/model.go
-1
View File
@@ -11,7 +11,6 @@ var ErrMaximumDepthReached = errutil.NewBase(errutil.StatusBadRequest, "folder.m
var ErrBadRequest = errutil.NewBase(errutil.StatusBadRequest, "folder.bad-request")
var ErrDatabaseError = errutil.NewBase(errutil.StatusInternal, "folder.database-error")
var ErrInternal = errutil.NewBase(errutil.StatusInternal, "folder.internal")
var ErrFolderTooDeep = errutil.NewBase(errutil.StatusInternal, "folder.too-deep")
var ErrCircularReference = errutil.NewBase(errutil.StatusBadRequest, "folder.circular-reference", errutil.WithPublicMessage("Circular reference detected"))
var ErrTargetRegistrySrvConflict = errutil.NewBase(errutil.StatusInternal, "folder.target-registry-srv-conflict")