From 8ef42c9609bcefc642cc9739acb921dffba49b89 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 14 Jun 2023 17:13:41 +0200
Subject: admin docs: reformatting, key admin: add check

---
 src/api/admin/cluster.rs | 18 +++++++++---------
 src/api/admin/key.rs     |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/api/admin')

diff --git a/src/api/admin/cluster.rs b/src/api/admin/cluster.rs
index ae4a1cc3..c8107b82 100644
--- a/src/api/admin/cluster.rs
+++ b/src/api/admin/cluster.rs
@@ -1,7 +1,7 @@
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-use hyper::{Body, Request, Response, StatusCode};
+use hyper::{Body, Request, Response};
 use serde::{Deserialize, Serialize};
 
 use garage_util::crdt::*;
@@ -161,8 +161,8 @@ struct GetClusterStatusResponse {
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 struct ApplyClusterLayoutResponse {
-    message: Vec<String>,
-    layout: GetClusterLayoutResponse,
+	message: Vec<String>,
+	layout: GetClusterLayoutResponse,
 }
 
 #[derive(Serialize)]
@@ -238,7 +238,7 @@ pub async fn handle_update_cluster_layout(
 	garage.system.update_cluster_layout(&layout).await?;
 
 	let res = format_cluster_layout(&layout);
-    Ok(json_ok_response(&res)?)
+	Ok(json_ok_response(&res)?)
 }
 
 pub async fn handle_apply_cluster_layout(
@@ -253,10 +253,10 @@ pub async fn handle_apply_cluster_layout(
 	garage.system.update_cluster_layout(&layout).await?;
 
 	let res = ApplyClusterLayoutResponse {
-        message: msg,
-        layout: format_cluster_layout(&layout),
-    };
-    Ok(json_ok_response(&res)?)
+		message: msg,
+		layout: format_cluster_layout(&layout),
+	};
+	Ok(json_ok_response(&res)?)
 }
 
 pub async fn handle_revert_cluster_layout(
@@ -270,7 +270,7 @@ pub async fn handle_revert_cluster_layout(
 	garage.system.update_cluster_layout(&layout).await?;
 
 	let res = format_cluster_layout(&layout);
-    Ok(json_ok_response(&res)?)
+	Ok(json_ok_response(&res)?)
 }
 
 // ----
diff --git a/src/api/admin/key.rs b/src/api/admin/key.rs
index 0d1f799b..8d1c6890 100644
--- a/src/api/admin/key.rs
+++ b/src/api/admin/key.rs
@@ -93,7 +93,8 @@ pub async fn handle_import_key(
 		&req.access_key_id,
 		&req.secret_access_key,
 		req.name.as_deref().unwrap_or("Imported key"),
-	);
+	)
+	.ok_or_bad_request("Invalid key format")?;
 	garage.key_table.insert(&imported_key).await?;
 
 	key_info_results(garage, imported_key, false).await
-- 
cgit v1.2.3