diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-22 15:45:45 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-22 15:45:45 +0100 |
| commit | 59f61c966ae5fbc9442a5fc179ad55b7370b6892 (patch) | |
| tree | 1149518e5feb0a7bc101992d8a0a3cf430cb9039 /src/api/s3/api_server.rs | |
| parent | 75e591727d9cfda0133200604872a38419c178a1 (diff) | |
| parent | 74d0c47f21ae2f9998a7dcbca3a27e3cc51e70b6 (diff) | |
| download | garage-59f61c966ae5fbc9442a5fc179ad55b7370b6892.tar.gz garage-59f61c966ae5fbc9442a5fc179ad55b7370b6892.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/api/s3/api_server.rs')
| -rw-r--r-- | src/api/s3/api_server.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/api/s3/api_server.rs b/src/api/s3/api_server.rs index 7fac6261..08405923 100644 --- a/src/api/s3/api_server.rs +++ b/src/api/s3/api_server.rs @@ -148,7 +148,14 @@ impl ApiHandler for S3ApiServer { // Special code path for CreateBucket API endpoint if let Endpoint::CreateBucket {} = endpoint { - return handle_create_bucket(&garage, req, content_sha256, api_key, bucket_name).await; + return handle_create_bucket( + &garage, + req, + content_sha256, + &api_key.key_id, + bucket_name, + ) + .await; } let bucket_id = garage @@ -261,7 +268,7 @@ impl ApiHandler for S3ApiServer { Ok(response) } Endpoint::DeleteBucket {} => { - handle_delete_bucket(&garage, bucket_id, bucket_name, api_key).await + handle_delete_bucket(&garage, bucket_id, bucket_name, &api_key.key_id).await } Endpoint::GetBucketLocation {} => handle_get_bucket_location(garage), Endpoint::GetBucketVersioning {} => handle_get_bucket_versioning(), |