From 04c7f7609e5bc3fadf95c53b37a9e6e12c4e539c Mon Sep 17 00:00:00 2001
From: Toby Vincent <tobyv@tobyvin.dev>
Date: Fri, 27 Sep 2024 12:30:35 -0500
Subject: fix: correct healthcheck output format

---
 assets/index.js | 4 ++--
 src/api.rs      | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/assets/index.js b/assets/index.js
index 173ed72..246364f 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -33,11 +33,11 @@ function updateStatus(check) {
 			statusElm.setAttribute("class", "ok");
 			break;
 		case "fail":
-			issuesElm.textContent = `${check.output} issues detected`;
+			issuesElm.textContent = check.output;
 			statusElm.setAttribute("class", "error");
 			break;
 		case "warn":
-			issuesElm.textContent = `${check.output} warnings detected`;
+			issuesElm.textContent = check.output;
 			statusElm.setAttribute("class", "warning");
 			break;
 		default:
diff --git a/src/api.rs b/src/api.rs
index 8cf66ea..8dfd2ca 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use axum::{extract::State, response::IntoResponse, Json};
 use serde::{Deserialize, Serialize};
 
-use crate::{service::Services, Error, Status};
+use crate::{service::Services, Status};
 
 pub mod services;
 
@@ -13,11 +13,11 @@ pub fn router() -> axum::Router<Services> {
     axum::Router::new()
         .route("/healthcheck", get(healthcheck))
         .merge(services::router())
-        .fallback(fallback)
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct Health {
+    #[serde(flatten)]
     pub status: Status,
     pub checks: HashMap<String, Status>,
 }
@@ -55,7 +55,3 @@ pub async fn healthcheck(State(services): State<Services>) -> Health {
 
     Health { status, checks }
 }
-
-pub async fn fallback(uri: axum::http::Uri) -> Error {
-    Error::RouteNotFound(uri)
-}
-- 
cgit v1.2.3-70-g09d2