Convert pagerduty bins to the concrete error type

Author: jtgeibel

src/bin/monitor.rs

@@ -8,18 +8,18 @@
 
 mod on_call;
 
-use cargo_registry::{db, schema::*, util::AppResult};
+use cargo_registry::{db, schema::*, util::Error};
 use diesel::prelude::*;
 
-fn main() -> AppResult<()> {
+fn main() -> Result<(), Error> {
     let conn = db::connect_now()?;
 
     check_stalled_background_jobs(&conn)?;
     check_spam_attack(&conn)?;
     Ok(())
 }
 
-fn check_stalled_background_jobs(conn: &PgConnection) -> AppResult<()> {
+fn check_stalled_background_jobs(conn: &PgConnection) -> Result<(), Error> {
     use cargo_registry::schema::background_jobs::dsl::*;
     use diesel::dsl::*;
 
@@ -55,7 +55,7 @@ fn check_stalled_background_jobs(conn: &PgConnection) -> AppResult<()> {
     Ok(())
 }
 
-fn check_spam_attack(conn: &PgConnection) -> AppResult<()> {
+fn check_spam_attack(conn: &PgConnection) -> Result<(), Error> {
     use cargo_registry::models::krate::canon_crate_name;
     use diesel::dsl::*;
     use diesel::sql_types::Bool;
@@ -116,7 +116,7 @@ fn check_spam_attack(conn: &PgConnection) -> AppResult<()> {
     Ok(())
 }
 
-fn log_and_trigger_event(event: on_call::Event) -> AppResult<()> {
+fn log_and_trigger_event(event: on_call::Event) -> Result<(), Error> {
     match event {
         on_call::Event::Trigger {
             ref description, ..

src/bin/on_call/mod.rs

@@ -1,4 +1,4 @@
-use cargo_registry::util::{internal, AppResult};
+use cargo_registry::util::Error;
 
 use reqwest::{header, StatusCode as Status};
 
@@ -25,7 +25,7 @@ impl Event {
     ///
     /// If the variant is `Trigger`, this will page whoever is on call
     /// (potentially waking them up at 3 AM).
-    pub fn send(self) -> AppResult<()> {
+    pub fn send(self) -> Result<(), Error> {
         let api_token = dotenv::var("PAGERDUTY_API_TOKEN")?;
         let service_key = dotenv::var("PAGERDUTY_INTEGRATION_KEY")?;
 
@@ -43,14 +43,15 @@ impl Event {
             s if s.is_success() => Ok(()),
             Status::BAD_REQUEST => {
                 let error = response.json::<InvalidEvent>()?;
-                Err(internal(&format_args!("pagerduty error: {:?}", error)))
+                Err(format!("pagerduty error: {:?}", error))
             }
-            Status::FORBIDDEN => Err(internal("rate limited by pagerduty")),
-            n => Err(internal(&format_args!(
+            Status::FORBIDDEN => Err("rate limited by pagerduty".to_string()),
+            n => Err(format!(
                 "Got a non 200 response code from pagerduty: {} with {:?}",
                 n, response
-            ))),
+            )),
         }
+        .map_err(Into::into)
     }
 }
 

src/bin/test-pagerduty.rs

@@ -11,7 +11,9 @@ mod on_call;
 
 use std::env::args;
 
-fn main() {
+use cargo_registry::util::Error;
+
+fn main() -> Result<(), Error> {
     let args = args().collect::<Vec<_>>();
 
     let event_type = &*args[1];
@@ -32,5 +34,5 @@ fn main() {
         },
         _ => panic!("Event type must be trigger, acknowledge, or resolve"),
     };
-    event.send().unwrap()
+    event.send()
 }

src/util/errors/concrete.rs

@@ -3,8 +3,11 @@ use std::{error, fmt};
 #[derive(Debug)]
 pub enum Error {
     DbConnect(diesel::result::ConnectionError),
+    DbQuery(diesel::result::Error),
+    DotEnv(dotenv::Error),
     Internal(String),
     JobEnqueue(swirl::EnqueueError),
+    Reqwest(reqwest::Error),
 }
 
 impl error::Error for Error {}
@@ -13,8 +16,11 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Error::DbConnect(inner) => inner.fmt(f),
+            Error::DbQuery(inner) => inner.fmt(f),
+            Error::DotEnv(inner) => inner.fmt(f),
             Error::Internal(inner) => inner.fmt(f),
             Error::JobEnqueue(inner) => inner.fmt(f),
+            Error::Reqwest(inner) => inner.fmt(f),
         }
     }
 }
@@ -25,6 +31,18 @@ impl From<diesel::result::ConnectionError> for Error {
     }
 }
 
+impl From<diesel::result::Error> for Error {
+    fn from(err: diesel::result::Error) -> Self {
+        Error::DbQuery(err)
+    }
+}
+
+impl From<dotenv::Error> for Error {
+    fn from(err: dotenv::Error) -> Self {
+        Error::DotEnv(err)
+    }
+}
+
 impl From<String> for Error {
     fn from(err: String) -> Self {
         Error::Internal(err)
@@ -36,3 +54,9 @@ impl From<swirl::EnqueueError> for Error {
         Error::JobEnqueue(err)
     }
 }
+
+impl From<reqwest::Error> for Error {
+    fn from(err: reqwest::Error) -> Self {
+        Error::Reqwest(err)
+    }
+}