DRY up aws error catching

Cargo.toml

@@ -32,7 +32,7 @@ directories = "6.0"
 futures-core = "0.3.31"
 futures-util = "0.3.31"
 indexmap = { version = "2.1.0", features = ["serde"] }
-miette = { version = "7", features = ["fancy"] }
+miette = { version = "7.5", features = ["fancy"] }
 mockall = "0.13.1"
 multitool-sdk = { git = "https://github.com/wack/multitool-rust-sdk.git", branch = "trunk" }
 pingora = { version = "0.3", features = ["lb", "proxy"], optional = true }

src/adapters/ingresses/apig.rs

@@ -1,10 +1,12 @@
 use async_trait::async_trait;
 use bon::bon;
-use miette::{Result, miette};
+use miette::{Result, WrapErr, miette};
 use tracing::{debug, info};
 
 use crate::{
-    Shutdownable, WholePercent, subsystems::ShutdownResult, utils::load_default_aws_config,
+    Shutdownable, WholePercent,
+    subsystems::ShutdownResult,
+    utils::{load_default_aws_config, map_aws_error},
 };
 
 use aws_sdk_apigateway::{
@@ -201,26 +203,8 @@ impl Ingress for AwsApiGateway {
             .principal("apigateway.amazonaws.com")
             .send()
             .await
-            .map_err(|err| {
-                let error_message = match err {
-                    SdkError::ServiceError(service_err) => {
-                        // Extract the specific service error details
-                        format!(
-                            "{}",
-                            service_err
-                                .err()
-                                .meta()
-                                .message()
-                                .unwrap_or("No error message found")
-                        )
-                    }
-                    _ => format!("{:?}", err),
-                };
-                miette!(
-                    "Failed to add invoke permission to Lambda: {}",
-                    error_message
-                )
-            })?;
+            .map_err(map_aws_error)
+            .wrap_err_with(|| "Failed to add invoke permission to Lambda")?;
 
         // Update our API Gateway to point at our new lambda version
         let patch_op = PatchOperation::builder()

src/adapters/platforms/lambda.rs

@@ -1,10 +1,13 @@
 use async_trait::async_trait;
 use bon::bon;
-use miette::{Result, miette};
+use miette::{Result, WrapErr, miette};
 use tracing::info;
 
 use crate::{
-    Shutdownable, artifacts::LambdaZip, subsystems::ShutdownResult, utils::load_default_aws_config,
+    Shutdownable,
+    artifacts::LambdaZip,
+    subsystems::ShutdownResult,
+    utils::{load_default_aws_config, map_aws_error},
 };
 use aws_sdk_lambda::{client::Client, error::SdkError, primitives::Blob, types::FunctionCode};
 
@@ -58,23 +61,8 @@ impl Platform for LambdaPlatform {
             .zip_file(zip_file.clone())
             .send()
             .await
-            .map_err(|err| {
-                let error_message = match err {
-                    SdkError::ServiceError(service_err) => {
-                        // Extract the specific service error details
-                        format!(
-                            "{}",
-                            service_err
-                                .err()
-                                .meta()
-                                .message()
-                                .unwrap_or("No error message found")
-                        )
-                    }
-                    _ => format!("{:?}", err),
-                };
-                miette!("Failed to deploy Lambda: {}", error_message)
-            })?;
+            .map_err(map_aws_error)
+            .wrap_err("Failed to deploy lambda")?;
 
         let function_arn = res
             .function_arn()

src/cmd/run.rs

@@ -9,9 +9,13 @@ use crate::subsystems::CONTROLLER_SUBSYSTEM_NAME;
 use crate::{
     ControllerSubsystem, adapters::BackendClient, artifacts::LambdaZip, config::RunSubcommand,
 };
-use miette::Result;
+use miette::{Diagnostic, Result};
+use thiserror::Error;
 use tokio::runtime::Runtime;
 use tokio::time::Duration;
+use tokio_graceful_shutdown::errors::GracefulShutdownError::ShutdownTimeout;
+use tokio_graceful_shutdown::errors::GracefulShutdownError::SubsystemsFailed;
+use tokio_graceful_shutdown::errors::SubsystemError;
 use tokio_graceful_shutdown::{IntoSubsystem as _, SubsystemBuilder, Toplevel};
 use tracing::{debug, info};
 
@@ -30,6 +34,21 @@ pub struct Run {
     backend: BackendClient,
 }
 
+#[derive(Debug, Error, Diagnostic)]
+#[error("Rollout failed to complete successfully.")]
+pub struct RunError {
+    #[related]
+    subsystem_errors: Vec<SubsystemError>,
+}
+
+impl<T: IntoIterator<Item = SubsystemError>> From<T> for RunError {
+    fn from(subsystem_errors: T) -> Self {
+        Self {
+            subsystem_errors: subsystem_errors.into_iter().collect(),
+        }
+    }
+}
+
 impl Run {
     pub fn new(terminal: Terminal, args: RunSubcommand) -> Result<Self> {
         let fs = FileSystem::new().unwrap();
@@ -105,7 +124,12 @@ impl Run {
             .catch_signals()
             .handle_shutdown_requests(Duration::from_millis(DEFAULT_SHUTDOWN_TIMEOUT))
             .await
-            .map_err(Into::into)
+            .map_err(|err| match err {
+                SubsystemsFailed(errs) => RunError::from(errs),
+                ShutdownTimeout(errs) => RunError::from(errs),
+            })?;
+
+            Ok(())
         })
     }
 

src/terminal/mod.rs

@@ -38,7 +38,7 @@ impl Terminal {
         miette::set_hook(Box::new(move |_| {
             if allow_color {
                 // TODO: Add brand colors using ``::new_themed()`
-                Box::new(GraphicalReportHandler::new())
+                Box::new(GraphicalReportHandler::new().with_cause_chain())
             } else {
                 Box::new(DebugReportHandler)
             }