New buckets for 0.6.0: make bucket id a SK and not a HK, CLI updates

4 files changed, 51 insertions, 22 deletions

diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index bca1bc5a..b1eb6915 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -38,7 +38,7 @@ pub enum AdminRpc {
 
 	// Replies
 	Ok(String),
-	BucketList(Vec<BucketAlias>),
+	BucketList(Vec<Bucket>),
 	BucketInfo(Bucket, HashMap<String, Key>),
 	KeyList(Vec<(String, String)>),
 	KeyInfo(Key, HashMap<Uuid, Bucket>),
@@ -76,12 +76,12 @@ impl AdminRpcHandler {
 	}
 
 	async fn handle_list_buckets(&self) -> Result<AdminRpc, Error> {
-		let bucket_aliases = self
+		let buckets = self
 			.garage
-			.bucket_alias_table
+			.bucket_table
 			.get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000)
 			.await?;
-		Ok(AdminRpc::BucketList(bucket_aliases))
+		Ok(AdminRpc::BucketList(buckets))
 	}
 
 	async fn handle_bucket_info(&self, query: &BucketOpt) -> Result<AdminRpc, Error> {
@@ -536,7 +536,7 @@ impl AdminRpcHandler {
 			.items()
 			.iter()
 		{
-			if let Some(b) = self.garage.bucket_table.get(id, &EmptyKey).await? {
+			if let Some(b) = self.garage.bucket_table.get(&EmptyKey, id).await? {
 				relevant_buckets.insert(*id, b);
 			}
 		}
diff --git a/src/garage/cli/cmd.rs b/src/garage/cli/cmd.rs
index 515f2143..a90277a0 100644
--- a/src/garage/cli/cmd.rs
+++ b/src/garage/cli/cmd.rs
@@ -165,24 +165,13 @@ pub async fn cmd_admin(
 			println!("{}", msg);
 		}
 		AdminRpc::BucketList(bl) => {
-			println!("List of buckets:");
-			let mut table = vec![];
-			for alias in bl {
-				if let Some(alias_bucket) = alias.state.get() {
-					table.push(format!("\t{}\t{:?}", alias.name(), alias_bucket));
-				}
-			}
-			format_table(table);
-			println!("Buckets that don't have a global alias (i.e. that only exist in the namespace of an access key) are not shown.");
+			print_bucket_list(bl);
 		}
 		AdminRpc::BucketInfo(bucket, rk) => {
 			print_bucket_info(&bucket, &rk);
 		}
 		AdminRpc::KeyList(kl) => {
-			println!("List of keys:");
-			for key in kl {
-				println!("{}\t{}", key.0, key.1);
-			}
+			print_key_list(kl);
 		}
 		AdminRpc::KeyInfo(key, rb) => {
 			print_key_info(&key, &rb);
diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs
index 8d31a4c5..7a7d0e9b 100644
--- a/src/garage/cli/util.rs
+++ b/src/garage/cli/util.rs
@@ -7,6 +7,46 @@ use garage_util::error::*;
 use garage_model::bucket_table::*;
 use garage_model::key_table::*;
 
+pub fn print_bucket_list(bl: Vec<Bucket>) {
+	println!("List of buckets:");
+
+	let mut table = vec![];
+	for bucket in bl {
+		let aliases = bucket
+			.aliases()
+			.iter()
+			.filter(|(_, _, active)| *active)
+			.map(|(name, _, _)| name.to_string())
+			.collect::<Vec<_>>();
+		let local_aliases_n = match bucket
+			.local_aliases()
+			.iter()
+			.filter(|(_, _, active)| *active)
+			.count()
+		{
+			0 => "".into(),
+			1 => "1 local alias".into(),
+			n => format!("{} local aliases", n),
+		};
+		table.push(format!(
+			"\t{}\t{}\t{}",
+			aliases.join(","),
+			local_aliases_n,
+			hex::encode(bucket.id)
+		));
+	}
+	format_table(table);
+}
+
+pub fn print_key_list(kl: Vec<(String, String)>) {
+	println!("List of keys:");
+	let mut table = vec![];
+	for key in kl {
+		table.push(format!("\t{}\t{}", key.0, key.1));
+	}
+	format_table(table);
+}
+
 pub fn print_key_info(key: &Key, relevant_buckets: &HashMap<Uuid, Bucket>) {
 	let bucket_global_aliases = |b: &Uuid| {
 		if let Some(bucket) = relevant_buckets.get(b) {
@@ -99,7 +139,7 @@ pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap<String, Key>)
 						.get(key_id)
 						.map(|k| k.name.get().as_str())
 						.unwrap_or("");
-					table.push(format!("\t{}\t{} ({})", alias, key_id, key_name));
+					table.push(format!("\t{} ({})\t{}", key_id, key_name, alias));
 				}
 			}
 			format_table(table);
@@ -115,7 +155,7 @@ pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap<String, Key>)
 					.map(|k| k.name.get().as_str())
 					.unwrap_or("");
 				table.push(format!(
-					"\t{}{}{}\t{} ({})",
+					"\t{}{}{}\t{}\t{}",
 					rflag, wflag, oflag, k, key_name
 				));
 			}
diff --git a/src/garage/main.rs b/src/garage/main.rs
index 60a13ac7..870455e1 100644
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -139,8 +139,8 @@ async fn cli_command(opt: Opt) -> Result<(), Error> {
 	let admin_rpc_endpoint = netapp.endpoint::<AdminRpc, ()>(ADMIN_RPC_PATH.into());
 
 	match cli_command_dispatch(opt.cmd, &system_rpc_endpoint, &admin_rpc_endpoint, id).await {
-		Err(HelperError::Internal(i)) => Err(i),
-		Err(HelperError::BadRequest(b)) => Err(Error::Message(format!("bad request: {}", b))),
+		Err(HelperError::Internal(i)) => Err(Error::Message(format!("Internal error: {}", i))),
+		Err(HelperError::BadRequest(b)) => Err(Error::Message(b)),
 		Ok(x) => Ok(x),
 	}
 }