kaiyou/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Releases Activity

Merge pull request 'Properly return HTTP 204 when deleting non-existent object (fix #227)' (#384) from deleteobject-204 into main

Browse source 
Reviewed-on: Deuxfleurs/garage#384
This commit is contained in:
Alex 2022-09-14 17:16:39 +02:00
commit 89b8087ba8
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/api/s3/delete.rs
View file

@ -64,14 +64,13 @@ pub async fn handle_delete(
bucket_id: Uuid, bucket_id: Uuid,
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let (_deleted_version, delete_marker_version) = match handle_delete_internal(&garage, bucket_id, key).await {
handle_delete_internal(&garage, bucket_id, key).await?; Ok(_) | Err(Error::NoSuchKey) => Ok(Response::builder()
Ok(Response::builder()
.header("x-amz-version-id", hex::encode(delete_marker_version))
.status(StatusCode::NO_CONTENT) .status(StatusCode::NO_CONTENT)
.body(Body::from(vec![])) .body(Body::from(vec![]))
.unwrap()) .unwrap()),
Err(e) => Err(e),
}
} }
pub async fn handle_delete_objects( pub async fn handle_delete_objects(

9
src/garage/tests/s3/objects.rs
View file

@ -263,4 +263,13 @@ async fn test_deleteobject() {
.unwrap(); .unwrap();
assert!(l.contents.is_none()); assert!(l.contents.is_none());
// Deleting a non-existing object shouldn't be a problem
ctx.client
.delete_object()
.bucket(&bucket)
.key("l-0")
.send()
.await
.unwrap();
} }