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

Storage: fix delete folder (#52860)

Browse Source
This commit is contained in:
Artur Wierzbicki 2022-07-28 13:27:26 +04:00 committed by GitHub
parent 8d6d5f2fdc
commit 9e841ef21d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/store/service.go
View File

@ -331,7 +331,7 @@ func (s *standardStorageService) DeleteFolder(ctx context.Context, user *models.
if storagePath == "" { if storagePath == "" {
storagePath = filestorage.Delimiter storagePath = filestorage.Delimiter
} }
return root.Store().DeleteFolder(ctx, storagePath, &filestorage.DeleteFolderOptions{Force: true, AccessFilter: guardian.getPathFilter(ActionFilesDelete)}) return root.Store().DeleteFolder(ctx, storagePath, &filestorage.DeleteFolderOptions{Force: cmd.Force, AccessFilter: guardian.getPathFilter(ActionFilesDelete)})
} }
func (s *standardStorageService) CreateFolder(ctx context.Context, user *models.SignedInUser, cmd *CreateFolderCmd) error { func (s *standardStorageService) CreateFolder(ctx context.Context, user *models.SignedInUser, cmd *CreateFolderCmd) error {

22
pkg/services/store/service_test.go
View File

@ -176,14 +176,26 @@ func TestShouldDelegateFolderCreation(t *testing.T) {
func TestShouldDelegateFolderDeletion(t *testing.T) { func TestShouldDelegateFolderDeletion(t *testing.T) {
service, mockStorage, storageName := setupUploadStore(t, nil) service, mockStorage, storageName := setupUploadStore(t, nil)
cmds := []*DeleteFolderCmd{
mockStorage.On("DeleteFolder", mock.Anything, "/", mock.Anything).Return(nil) {
Path: storageName,
err := service.DeleteFolder(context.Background(), dummyUser, &DeleteFolderCmd{ Force: false,
},
{
Path: storageName, Path: storageName,
Force: true, Force: true,
}) }}
ctx := context.Background()
for _, cmd := range cmds {
mockStorage.On("DeleteFolder", ctx, "/", &filestorage.DeleteFolderOptions{
Force: cmd.Force,
AccessFilter: allowAllPathFilter,
}).Once().Return(nil)
err := service.DeleteFolder(ctx, dummyUser, cmd)
require.NoError(t, err) require.NoError(t, err)
}
} }
func TestShouldUploadSvg(t *testing.T) { func TestShouldUploadSvg(t *testing.T) {