mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Storage: fix delete folder (#52860)
This commit is contained in:
parent
8d6d5f2fdc
commit
9e841ef21d
@ -331,7 +331,7 @@ func (s *standardStorageService) DeleteFolder(ctx context.Context, user *models.
|
||||
if storagePath == "" {
|
||||
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 {
|
||||
|
@ -176,14 +176,26 @@ func TestShouldDelegateFolderCreation(t *testing.T) {
|
||||
|
||||
func TestShouldDelegateFolderDeletion(t *testing.T) {
|
||||
service, mockStorage, storageName := setupUploadStore(t, nil)
|
||||
|
||||
mockStorage.On("DeleteFolder", mock.Anything, "/", mock.Anything).Return(nil)
|
||||
|
||||
err := service.DeleteFolder(context.Background(), dummyUser, &DeleteFolderCmd{
|
||||
cmds := []*DeleteFolderCmd{
|
||||
{
|
||||
Path: storageName,
|
||||
Force: false,
|
||||
},
|
||||
{
|
||||
Path: storageName,
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
func TestShouldUploadSvg(t *testing.T) {
|
||||
|
Loading…
Reference in New Issue
Block a user