diff options
author | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-01 19:07:17 +0100 |
---|---|---|
committer | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-01 19:07:17 +0100 |
commit | fe937c290195e5451f9e533e02664548817e6e13 (patch) | |
tree | 318ba12ff76dc3e435a01a246188c6a964e572f2 /src/api/s3/delete.rs | |
parent | 3192088aac0e1795401304a8dec715cd343538cf (diff) | |
parent | d601f311865b8159a7bf1801dd8f43021d0b443b (diff) | |
download | garage-fe937c290195e5451f9e533e02664548817e6e13.tar.gz garage-fe937c290195e5451f9e533e02664548817e6e13.zip |
Merge branch 'main' into next-v2
Diffstat (limited to 'src/api/s3/delete.rs')
-rw-r--r-- | src/api/s3/delete.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/api/s3/delete.rs b/src/api/s3/delete.rs index 57f6f948..b799e67a 100644 --- a/src/api/s3/delete.rs +++ b/src/api/s3/delete.rs @@ -5,12 +5,13 @@ use garage_util::data::*; use garage_model::s3::object_table::*; -use crate::helpers::*; -use crate::s3::api_server::{ReqBody, ResBody}; -use crate::s3::error::*; -use crate::s3::put::next_timestamp; -use crate::s3::xml as s3_xml; -use crate::signature::verify_signed_content; +use garage_api_common::helpers::*; +use garage_api_common::signature::verify_signed_content; + +use crate::api_server::{ReqBody, ResBody}; +use crate::error::*; +use crate::put::next_timestamp; +use crate::xml as s3_xml; async fn handle_delete_internal(ctx: &ReqCtx, key: &str) -> Result<(Uuid, Uuid), Error> { let ReqCtx { |