eliott/garage
1
0
Fork 0
mirror of https://github.com/kharonsec/garage.git synced 2026-04-25 20:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rework bucket value get, relateted to or_func_call

Browse Source 
this avoid bucket_website_config value compute if not needed
This commit is contained in:
Gwen Lg
2026-01-28 11:07:46 +01:00
committed by Alex
parent bbb62dfa85
commit f6414210fa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/garage/cli/remote/bucket.rs
View File

@@ -295,13 +295,20 @@ impl Cli {
));
}
// Destructure becket info to allow separate use of `id` and `website_config`
let GetBucketInfoResponse {
id: bucket_id,
website_config: bucket_website_config,
..
} = bucket;
let wa = if opt.allow {
UpdateBucketWebsiteAccess {
enabled: true,
index_document: Some(opt.index_document.clone()),
error_document: opt
.error_document
.or(bucket.website_config.and_then(|x| x.error_document.clone())),
.or_else(|| bucket_website_config.and_then(|x| x.error_document.clone())),
}
} else {
UpdateBucketWebsiteAccess {
@@ -313,7 +320,7 @@ impl Cli {
let res = self
.api_request(UpdateBucketRequest {
id: bucket.id,
id: bucket_id,
body: UpdateBucketRequestBody {
website_access: Some(wa),
quotas: None,