diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-01-04 18:59:17 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-01-04 18:59:17 +0100 |
| commit | 677ab60cc117677bf53dc4887a6ff1c094e17cd0 (patch) | |
| tree | deed8c5e3a0e22fa0d1d987d4ca1313fd5c54fb7 /src/api/s3_bucket.rs | |
| parent | df35feba18787cac06b2a87e3426752fb78da2d5 (diff) | |
| download | garage-677ab60cc117677bf53dc4887a6ff1c094e17cd0.tar.gz garage-677ab60cc117677bf53dc4887a6ff1c094e17cd0.zip | |
Small changes in key model and refactoringnew-buckets
Diffstat (limited to 'src/api/s3_bucket.rs')
| -rw-r--r-- | src/api/s3_bucket.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/api/s3_bucket.rs b/src/api/s3_bucket.rs index 50aeb173..27208ffa 100644 --- a/src/api/s3_bucket.rs +++ b/src/api/s3_bucket.rs @@ -38,8 +38,8 @@ pub fn handle_get_bucket_versioning() -> Result<Response<Body>, Error> { } pub async fn handle_list_buckets(garage: &Garage, api_key: &Key) -> Result<Response<Body>, Error> { - let key_state = api_key.state.as_option().ok_or_internal_error( - "Key should not be in deleted state at this point (internal error)", + let key_p = api_key.params().ok_or_internal_error( + "Key should not be in deleted state at this point (in handle_list_buckets)", )?; // Collect buckets user has access to @@ -74,7 +74,7 @@ pub async fn handle_list_buckets(garage: &Garage, api_key: &Key) -> Result<Respo } } - for (alias, _, id_opt) in key_state.local_aliases.items() { + for (alias, _, id_opt) in key_p.local_aliases.items() { if let Some(id) = id_opt { aliases.insert(alias.clone(), *id); } @@ -83,7 +83,7 @@ pub async fn handle_list_buckets(garage: &Garage, api_key: &Key) -> Result<Respo // Generate response let list_buckets = s3_xml::ListAllMyBucketsResult { owner: s3_xml::Owner { - display_name: s3_xml::Value(api_key.name.get().to_string()), + display_name: s3_xml::Value(key_p.name.get().to_string()), id: s3_xml::Value(api_key.key_id.to_string()), }, buckets: s3_xml::BucketList { |