diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-05-13 15:21:32 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-05-13 15:21:32 +0200 |
| commit | 7a5d329e49cc7018cbfa14d37589f51860f66cf0 (patch) | |
| tree | 50be9a5eea1b2415bb541aff0c8cb33c0f47b8e4 /src/api/s3/copy.rs | |
| parent | f82b938033f1a01a136315b5f37ecb89b78bca0c (diff) | |
| download | garage-7a5d329e49cc7018cbfa14d37589f51860f66cf0.tar.gz garage-7a5d329e49cc7018cbfa14d37589f51860f66cf0.zip | |
More error refactoring
Diffstat (limited to 'src/api/s3/copy.rs')
| -rw-r--r-- | src/api/s3/copy.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/s3/copy.rs b/src/api/s3/copy.rs index abd90f4a..2468678e 100644 --- a/src/api/s3/copy.rs +++ b/src/api/s3/copy.rs @@ -19,7 +19,7 @@ use garage_model::s3::object_table::*; use garage_model::s3::version_table::*; use crate::s3::error::*; -use crate::helpers::{parse_bucket_key, resolve_bucket}; +use crate::helpers::{parse_bucket_key}; use crate::s3::put::{decode_upload_id, get_headers}; use crate::s3::xml::{self as s3_xml, xmlns_tag}; @@ -413,7 +413,7 @@ async fn get_copy_source( let copy_source = percent_encoding::percent_decode_str(copy_source).decode_utf8()?; let (source_bucket, source_key) = parse_bucket_key(©_source, None)?; - let source_bucket_id = resolve_bucket(garage, &source_bucket.to_string(), api_key).await?; + let source_bucket_id = garage.bucket_helper().resolve_bucket(&source_bucket.to_string(), api_key).await?; if !api_key.allow_read(&source_bucket_id) { return Err(Error::Forbidden(format!( |