TrueCloudLab
/
frostfs-s3-gw
15
2
Fork 16
Code Issues 21 Pull Requests 9 Actions Packages Projects Releases 9 Activity

Fix DeleteObject handler 

DeleteObject should remove all objects with passed nice name

Signed-off-by: Evgeniy Kulikov <kim@nspcc.ru>
remotes/KirillovDenis/bugfix/681-fix_acl_parsing
Evgeniy Kulikov 2020-08-20 22:41:52 +03:00
parent 34f6eb7d55
commit 0bea843d90
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/layer/layer.go
View File

@ -371,19 +371,25 @@ func (n *layer) CopyObject(ctx context.Context, p *CopyObjectParams) (*ObjectInf
}) })
} }
// DeleteObject from the storage. // DeleteObject removes all objects with passed nice name.
func (n *layer) DeleteObject(ctx context.Context, bucket, object string) error { func (n *layer) DeleteObject(ctx context.Context, bucket, object string) error {
cid, err := refs.CIDFromString(bucket) cid, err := refs.CIDFromString(bucket)
if err != nil { if err != nil {
return err return err
} }
oid, err := n.objectFindID(ctx, cid, object, false) ids, err := n.objectFindIDs(ctx, cid, object)
if err != nil { if err != nil {
return err return errors.Wrap(err, "could not find object")
} }
return n.objectDelete(ctx, delParams{addr: refs.Address{CID: cid, ObjectID: oid}}) for _, id := range ids {
if err = n.objectDelete(ctx, delParams{addr: refs.Address{CID: cid, ObjectID: id}}); err != nil {
return errors.Wrapf(err, "could not remove object: %s => %s", object, id)
}
}
return nil
} }
// DeleteObjects from the storage. // DeleteObjects from the storage.