feat: proper error handling for startup

Author: jacobtread

lambdas/http/src/main.rs

@@ -39,16 +39,13 @@ async fn main() -> Result<(), Error> {
 
     tracing::init_default_subscriber();
 
-    let app = app()
-        .await
-        // TODO: Handle
-        .unwrap();
+    let app = app().await?;
 
     run_with_streaming_response(app).await
 }
 
 // TODO: Needs a db_cache.close_all() cleanup logic when the program exits
-async fn app() -> Result<Router, Box<dyn std::error::Error>> {
+async fn app() -> Result<Router, Box<dyn std::error::Error + Send + Sync>> {
     let max_file_size_bytes = match std::env::var("DOCBOX_MAX_FILE_SIZE_BYTES") {
         Ok(value) => value.parse::<i32>()?,
         // Default max file size in bytes (100MB)

lambdas/presigned-cleanup/src/event_handler.rs

@@ -22,7 +22,7 @@ pub struct Dependencies {
     pub storage: StorageLayerFactory,
 }
 
-async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error>> {
+async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error + Send + Sync>> {
     let aws_config = aws_config().await;
 
     // Create secrets manager
@@ -48,11 +48,7 @@ async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error>> {
 pub(crate) async fn outer_function_handler(
     event: LambdaEvent<EventBridgeEvent>,
 ) -> Result<(), Error> {
-    let dependencies = DEPENDENCIES
-        .get_or_try_init(dependencies)
-        .await
-        // TODO: Map error
-        .unwrap();
+    let dependencies = DEPENDENCIES.get_or_try_init(dependencies).await?;
     function_handler(event, dependencies).await
 }
 

lambdas/upload-completion/src/event_handler.rs

@@ -31,7 +31,7 @@ pub struct Dependencies {
     pub processing: ProcessingLayer,
 }
 
-async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error>> {
+async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error + Send + Sync>> {
     // Create the converter
     let converter_config = OfficeConverterConfig::from_env();
     let converter = OfficeConverter::from_config(converter_config)?;
@@ -87,33 +87,32 @@ async fn dependencies() -> Result<Dependencies, Box<dyn std::error::Error>> {
 }
 
 pub(crate) async fn outer_function_handler(event: LambdaEvent<S3Event>) -> Result<(), Error> {
-    let dependencies = DEPENDENCIES
-        .get_or_try_init(dependencies)
-        .await
-        // TODO: Map error type
-        .unwrap();
+    let dependencies = DEPENDENCIES.get_or_try_init(dependencies).await?;
     function_handler(event, dependencies).await
 }
 
 async fn function_handler(
     event: LambdaEvent<S3Event>,
     dependencies: &Dependencies,
 ) -> Result<(), Error> {
-    // Extract some useful information from the request
-    let payload = event.payload;
-    tracing::info!("Payload: {:?}", payload);
+    let (bucket_name, object_key) = match get_object_parts(&event.payload) {
+        Some(value) => value,
+        None => return Ok(()),
+    };
+
+    handle_file_uploaded(dependencies, bucket_name, object_key).await;
+    Ok(())
+}
 
-    // TODO: Replace unwraps with errors
-    let record = payload.records.first().unwrap();
+fn get_object_parts(payload: &S3Event) -> Option<(String, String)> {
+    let record = payload.records.first()?;
     let bucket = &record.s3.bucket;
     let object = &record.s3.object;
 
-    let bucket_name = bucket.name.as_ref().unwrap().clone();
-    let object_key = object.key.as_ref().unwrap().clone();
-
-    handle_file_uploaded(dependencies, bucket_name, object_key).await;
+    let bucket_name = bucket.name.as_ref()?.clone();
+    let object_key = object.key.as_ref()?.clone();
 
-    Ok(())
+    Some((bucket_name, object_key))
 }
 
 /// Handle file upload notifications