4 files changed, 14 insertions, 37 deletions
diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs
index 849d28ac..7f9a813f 100644
--- a/src/api/admin/bucket.rs
+++ b/src/api/admin/bucket.rs
@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 
 use garage_util::crdt::*;
 use garage_util::data::*;
-use garage_util::error::Error as GarageError;
 use garage_util::time::*;
 
 use garage_table::*;
@@ -19,7 +18,7 @@ use garage_model::permission::*;
 use crate::admin::error::*;
 use crate::admin::key::ApiBucketKeyPerm;
 use crate::common_error::CommonError;
-use crate::helpers::parse_json_body;
+use crate::helpers::{json_ok_response, parse_json_body};
 
 pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let buckets = garage
@@ -60,10 +59,7 @@ pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>,
 		})
 		.collect::<Vec<_>>();
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 #[derive(Serialize)]
@@ -197,10 +193,7 @@ async fn bucket_info_results(
 				.collect::<Vec<_>>(),
 		};
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 #[derive(Serialize)]
diff --git a/src/api/admin/cluster.rs b/src/api/admin/cluster.rs
index 3401be42..6d01317d 100644
--- a/src/api/admin/cluster.rs
+++ b/src/api/admin/cluster.rs
@@ -7,14 +7,13 @@ use serde::{Deserialize, Serialize};
 
 use garage_util::crdt::*;
 use garage_util::data::*;
-use garage_util::error::Error as GarageError;
 
 use garage_rpc::layout::*;
 
 use garage_model::garage::Garage;
 
 use crate::admin::error::*;
-use crate::helpers::parse_json_body;
+use crate::helpers::{json_ok_response, parse_json_body};
 
 pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = GetClusterStatusResponse {
@@ -39,10 +38,7 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
 		layout: get_cluster_layout(garage),
 	};
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 pub async fn handle_connect_cluster_nodes(
@@ -66,18 +62,13 @@ pub async fn handle_connect_cluster_nodes(
 		})
 		.collect::<Vec<_>>();
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 pub async fn handle_get_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = get_cluster_layout(garage);
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+
+	Ok(json_ok_response(&res)?)
 }
 
 fn get_cluster_layout(garage: &Arc<Garage>) -> GetClusterLayoutResponse {
diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs
index c4613cb3..ed1a07bd 100644
--- a/src/api/admin/error.rs
+++ b/src/api/admin/error.rs
@@ -72,8 +72,9 @@ impl ApiError for Error {
 		}
 	}
 
-	fn add_http_headers(&self, _header_map: &mut HeaderMap<HeaderValue>) {
-		// nothing
+	fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
+		use hyper::header;
+		header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
 	}
 
 	fn http_body(&self, garage_region: &str, path: &str) -> Body {
diff --git a/src/api/admin/key.rs b/src/api/admin/key.rs
index f30b5dbb..2bbabb7b 100644
--- a/src/api/admin/key.rs
+++ b/src/api/admin/key.rs
@@ -4,15 +4,13 @@ use std::sync::Arc;
 use hyper::{Body, Request, Response, StatusCode};
 use serde::{Deserialize, Serialize};
 
-use garage_util::error::Error as GarageError;
-
 use garage_table::*;
 
 use garage_model::garage::Garage;
 use garage_model::key_table::*;
 
 use crate::admin::error::*;
-use crate::helpers::parse_json_body;
+use crate::helpers::{json_ok_response, parse_json_body};
 
 pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = garage
@@ -32,10 +30,7 @@ pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Er
 		})
 		.collect::<Vec<_>>();
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 #[derive(Serialize)]
@@ -221,10 +216,7 @@ async fn key_info_results(garage: &Arc<Garage>, key: Key) -> Result<Response<Bod
 			.collect::<Vec<_>>(),
 	};
 
-	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
-	Ok(Response::builder()
-		.status(StatusCode::OK)
-		.body(Body::from(resp_json))?)
+	Ok(json_ok_response(&res)?)
 }
 
 #[derive(Serialize)]