Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

more complete admin API #298

Merged
lx merged 48 commits from admin-api into main 2022-05-24 10:16:40 +00:00
Conversation 0 Commits 48 Files changed 65 +2 -6
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e4e1f8f0d6 - Show all commits

4
src/api/admin/api_server.rs
View file

@ -154,10 +154,6 @@ impl ApiHandler for AdminApiServer {
Endpoint::BucketDenyKey => { Endpoint::BucketDenyKey => {
handle_bucket_change_key_perm(&self.garage, req, false).await handle_bucket_change_key_perm(&self.garage, req, false).await
} }
_ => Err(Error::NotImplemented(format!(
"Admin endpoint {} not implemented yet",
endpoint.name()
))),
} }
} }
} }

4
src/api/admin/bucket.rs
View file

@ -349,14 +349,14 @@ pub async fn handle_delete_bucket(
for ((key_id, alias), _, active) in state.local_aliases.items().iter() { for ((key_id, alias), _, active) in state.local_aliases.items().iter() {
if *active { if *active {
helper helper
.unset_local_bucket_alias(bucket.id, &key_id, &alias) .unset_local_bucket_alias(bucket.id, key_id, alias)
.await?; .await?;
} }
} }
// 3. delete all global aliases // 3. delete all global aliases
for (alias, _, active) in state.aliases.items().iter() { for (alias, _, active) in state.aliases.items().iter() {
if *active { if *active {
helper.purge_global_bucket_alias(bucket.id, &alias).await?; helper.purge_global_bucket_alias(bucket.id, alias).await?;
} }
} }