Don't prettify run result json

Author: prasmussen

src/docker_run/api/mod.rs

@@ -108,9 +108,24 @@ pub struct SuccessResponse {
     body: Vec<u8>,
 }
 
+pub enum JsonFormat {
+    Minimal,
+    Pretty,
+}
+
+
+pub fn prepare_json_response<T: serde::Serialize>(body: &T, format: JsonFormat) -> Result<SuccessResponse, ErrorResponse> {
+    let json_to_vec = match format {
+        JsonFormat::Minimal => {
+            serde_json::to_vec
+        }
+
+        JsonFormat::Pretty => {
+            serde_json::to_vec_pretty
+        }
+    };
 
-pub fn prepare_json_response<T: serde::Serialize>(body: &T) -> Result<SuccessResponse, ErrorResponse> {
-    match serde_json::to_vec_pretty(body) {
+    match json_to_vec(body) {
         Ok(data) => {
             Ok(SuccessResponse{
                 status_code: 200,

src/docker_run/api/root.rs

@@ -18,5 +18,5 @@ pub fn handle(_: &config::Config, _: &mut tiny_http::Request) -> Result<api::Suc
         name: "docker-run".to_string(),
         version: VERSION.unwrap_or("unknown").to_string(),
         description: "Api for running code in transient docker containers".to_string(),
-    })
+    }, api::JsonFormat::Pretty)
 }

src/docker_run/api/run.rs

@@ -24,7 +24,7 @@ pub fn handle(config: &config::Config, request: &mut tiny_http::Request) -> Resu
         limits: config.run.clone(),
     }).map_err(handle_error)?;
 
-    api::prepare_json_response(&run_result)
+    api::prepare_json_response(&run_result, api::JsonFormat::Minimal)
 }
 
 fn handle_error(err: run::Error) -> api::ErrorResponse {

src/docker_run/api/version.rs

@@ -18,7 +18,7 @@ pub fn handle(config: &config::Config, request: &mut tiny_http::Request) -> Resu
     let data = get_version_info(&config.unix_socket)
         .map_err(handle_error)?;
 
-    api::prepare_json_response(&data)
+    api::prepare_json_response(&data, api::JsonFormat::Pretty)
 }