diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-02-01 17:48:25 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-02-01 17:48:25 +0000 |
| commit | d601f311865b8159a7bf1801dd8f43021d0b443b (patch) | |
| tree | 07e4268d09a6bead4c4e5a2a4f122471a7a5d23b /src/api/s3/encryption.rs | |
| parent | 9330fd79d3466051394f6d419a247d46da8f5151 (diff) | |
| parent | e4de7bdfd5e6acc05309f59d7f77755f0807e8e4 (diff) | |
| download | garage-d601f311865b8159a7bf1801dd8f43021d0b443b.tar.gz garage-d601f311865b8159a7bf1801dd8f43021d0b443b.zip | |
Merge pull request 'split garage_api in garage_api_{common,s3,k2v,admin}' (#947) from split-garage-api into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/947
Diffstat (limited to 'src/api/s3/encryption.rs')
| -rw-r--r-- | src/api/s3/encryption.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/api/s3/encryption.rs b/src/api/s3/encryption.rs index 2e6ed65c..b38d7792 100644 --- a/src/api/s3/encryption.rs +++ b/src/api/s3/encryption.rs @@ -28,9 +28,10 @@ use garage_util::migrate::Migrate; use garage_model::garage::Garage; use garage_model::s3::object_table::{ObjectVersionEncryption, ObjectVersionMetaInner}; -use crate::common_error::*; -use crate::s3::checksum::Md5Checksum; -use crate::s3::error::Error; +use garage_api_common::common_error::*; + +use crate::checksum::Md5Checksum; +use crate::error::Error; const X_AMZ_SERVER_SIDE_ENCRYPTION_CUSTOMER_ALGORITHM: HeaderName = HeaderName::from_static("x-amz-server-side-encryption-customer-algorithm"); |