From 9347ac3cb9478e91a9a6149e44304eafd8e1f8fa Mon Sep 17 00:00:00 2001
From: Frank Yang <yangpoan@gmail.com>
Date: Fri, 4 Nov 2022 20:08:10 +0800
Subject: [PATCH] feat(healthz): add version

Signed-off-by: Frank Yang <yangpoan@gmail.com>
---
 src/invoice/api.rs   | 6 ++++++
 src/invoice/mod.rs   | 3 ++-
 src/server/routes.rs | 9 +++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/invoice/api.rs b/src/invoice/api.rs
index 2bc5fed..483706f 100644
--- a/src/invoice/api.rs
+++ b/src/invoice/api.rs
@@ -25,6 +25,12 @@ pub struct MissingParcelsResponse {
     pub missing: Vec<Label>,
 }
 
+#[derive(Deserialize, Serialize)]
+pub struct HealthResponse {
+    pub status: String,
+    pub version: String,
+}
+
 /// A string error message returned from the server
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ErrorResponse {
diff --git a/src/invoice/mod.rs b/src/invoice/mod.rs
index 057a8ef..34f3ebb 100644
--- a/src/invoice/mod.rs
+++ b/src/invoice/mod.rs
@@ -19,7 +19,8 @@ pub(crate) use api::DeviceAuthorizationExtraFields;
 pub(crate) use api::LoginParams;
 #[doc(inline)]
 pub use api::{
-    ErrorResponse, InvoiceCreateResponse, KeyOptions, MissingParcelsResponse, QueryOptions,
+    ErrorResponse, HealthResponse, InvoiceCreateResponse, KeyOptions, MissingParcelsResponse,
+    QueryOptions,
 };
 #[doc(inline)]
 pub use bindle_spec::BindleSpec;
diff --git a/src/server/routes.rs b/src/server/routes.rs
index 446ed4c..3e26001 100644
--- a/src/server/routes.rs
+++ b/src/server/routes.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use warp::Filter;
 
-use crate::{server::filters, signature::KeyRing};
+use crate::{invoice::HealthResponse, server::filters, signature::KeyRing};
 
 /// A helper function that aggregates all routes into a complete API filter. If you only wish to
 /// serve specific endpoints or versions, you can assemble them with the individual submodules
@@ -22,7 +22,12 @@ where
     Authn: crate::authn::Authenticator + Clone + Send + Sync + 'static,
     Authz: crate::authz::Authorizer + Clone + Send + Sync + 'static,
 {
-    let health = warp::path("healthz").map(|| "OK");
+    let health = warp::path("healthz").map(|| {
+        warp::reply::json(&HealthResponse {
+            status: "OK".to_string(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
+        })
+    });
 
     // Use an Arc to avoid a possibly expensive clone of the keyring on every API call
     let wrapped_keyring = Arc::new(keyring);