feat: Report bridge status via __heartbeat__

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.55-buster as builder
+FROM rust:1.58-buster as builder
 ARG CRATE
 
 ADD . /app

autoendpoint/src/routers/adm/router.rs

@@ -36,10 +36,12 @@ impl AdmRouter {
         ddb: Box<dyn DbClient>,
     ) -> Result<Self, AdmError> {
         let profiles = settings.profiles()?;
-        let clients = profiles
+
+        let clients: HashMap<String, AdmClient> = profiles
             .into_iter()
             .map(|(name, profile)| (name, AdmClient::new(&settings, profile, http.clone())))
             .collect();
+        trace!("Initialized {} ADM clients", clients.len());
 
         Ok(Self {
             settings,
@@ -49,6 +51,11 @@ impl AdmRouter {
             clients,
         })
     }
+
+    /// if we have any clients defined, this connection is "active"
+    pub fn active(&self) -> bool {
+        !self.clients.is_empty()
+    }
 }
 
 #[async_trait(?Send)]

autoendpoint/src/routers/apns/router.rs

@@ -58,11 +58,12 @@ impl ApnsRouter {
     ) -> Result<Self, ApnsError> {
         let channels = settings.channels()?;
 
-        let clients = futures::stream::iter(channels)
+        let clients: HashMap<String, ApnsClientData> = futures::stream::iter(channels)
             .then(|(name, settings)| Self::create_client(name, settings))
             .try_collect()
             .await?;
 
+        trace!("Initialized {} APNs clients", clients.len());
         Ok(Self {
             clients,
             settings,
@@ -165,6 +166,11 @@ impl ApnsRouter {
                 .for_each(Self::convert_value_float_to_int);
         }
     }
+
+    /// if we have any clients defined, this connection is "active"
+    pub fn active(&self) -> bool {
+        !self.clients.is_empty()
+    }
 }
 
 #[async_trait(?Send)]

autoendpoint/src/routers/fcm/router.rs

@@ -39,7 +39,6 @@ impl FcmRouter {
         let clients = Self::create_clients(&settings, credentials, http.clone())
             .await
             .map_err(FcmError::OAuthClientBuild)?;
-
         Ok(Self {
             settings,
             endpoint_url,
@@ -63,9 +62,14 @@ impl FcmRouter {
                 FcmClient::new(settings, credential, http.clone()).await?,
             );
         }
-
+        trace!("Initialized {} FCM clients", clients.len());
         Ok(clients)
     }
+
+    /// if we have any clients defined, this connection is "active"
+    pub fn active(&self) -> bool {
+        !self.clients.is_empty()
+    }
 }
 
 #[async_trait(?Send)]
@@ -204,6 +208,7 @@ mod tests {
     async fn successful_routing_no_data() {
         let ddb = MockDbClient::new().into_boxed_arc();
         let router = make_router(String::from_utf8(make_service_key()).unwrap(), ddb).await;
+        assert!(router.active());
         let _token_mock = mock_token_endpoint();
         let fcm_mock = mock_fcm_endpoint_builder()
             .match_body(

autoendpoint/src/routes/health.rs

@@ -18,7 +18,12 @@ pub async fn health_route(state: Data<ServerState>) -> Json<serde_json::Value> {
         "status": "OK",
         "version": env!("CARGO_PKG_VERSION"),
         "router_table": router_health,
-        "message_table": message_health
+        "message_table": message_health,
+        "routers": {
+            "adm": state.adm_router.active(),
+            "apns": state.apns_router.active(),
+            "fcm": state.fcm_router.active(),
+        }
     }))
 }
 

autoendpoint/src/tags.rs

@@ -12,21 +12,12 @@ use serde::{
 };
 use serde_json::value::Value;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct Tags {
     pub tags: HashMap<String, String>,
     pub extra: HashMap<String, String>,
 }
 
-impl Default for Tags {
-    fn default() -> Tags {
-        Tags {
-            tags: HashMap::new(),
-            extra: HashMap::new(),
-        }
-    }
-}
-
 impl Serialize for Tags {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

autopush-common/src/db/models.rs

@@ -250,7 +250,7 @@ mod tests {
     #[test]
     fn test_parse_sort_key_ver1() {
         let chid = Uuid::new_v4();
-        let chidmessageid = format!("01:{}:mytopic", chid.to_hyphenated().to_string());
+        let chidmessageid = format!("01:{}:mytopic", chid.to_hyphenated());
         let key = DynamoDbNotification::parse_sort_key(&chidmessageid).unwrap();
         assert_eq!(key.topic, Some("mytopic".to_string()));
         assert_eq!(key.channel_id, chid);
@@ -261,11 +261,7 @@ mod tests {
     fn test_parse_sort_key_ver2() {
         let chid = Uuid::new_v4();
         let sortkey_timestamp = us_since_epoch();
-        let chidmessageid = format!(
-            "02:{}:{}",
-            sortkey_timestamp,
-            chid.to_hyphenated().to_string()
-        );
+        let chidmessageid = format!("02:{}:{}", sortkey_timestamp, chid.to_hyphenated());
         let key = DynamoDbNotification::parse_sort_key(&chidmessageid).unwrap();
         assert_eq!(key.topic, None);
         assert_eq!(key.channel_id, chid);