worker: plumb Emails through the environment

Author: LawnGnome

src/bin/background-worker.rs

@@ -16,12 +16,12 @@
 extern crate tracing;
 
 use crates_io::cloudfront::CloudFront;
-use crates_io::config;
 use crates_io::db::DieselPool;
 use crates_io::fastly::Fastly;
 use crates_io::storage::Storage;
 use crates_io::worker::swirl::Runner;
 use crates_io::worker::{Environment, RunnerExt};
+use crates_io::{config, Emails};
 use crates_io::{db, ssh};
 use crates_io_env_vars::{var, var_parsed};
 use crates_io_index::RepositoryConfig;
@@ -73,6 +73,7 @@ fn main() -> anyhow::Result<()> {
         .build()
         .expect("Couldn't build client");
 
+    let emails = Emails::from_environment(&config);
     let fastly = Fastly::from_environment(client);
 
     let connection_pool = r2d2::Pool::builder()
@@ -88,6 +89,7 @@ fn main() -> anyhow::Result<()> {
         fastly,
         storage,
         connection_pool.clone(),
+        emails,
     );
 
     let environment = Arc::new(environment);

src/email.rs

@@ -1,5 +1,5 @@
 use std::path::PathBuf;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};
 
 use crate::util::errors::{server_error, AppResult};
 
@@ -12,7 +12,7 @@ use lettre::transport::smtp::SmtpTransport;
 use lettre::{Message, Transport};
 use rand::distributions::{Alphanumeric, DistString};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Emails {
     backend: EmailBackend,
 }
@@ -48,7 +48,7 @@ impl Emails {
     pub fn new_in_memory() -> Self {
         Self {
             backend: EmailBackend::Memory {
-                mails: Mutex::new(Vec::new()),
+                mails: Arc::new(Mutex::new(Vec::new())),
             },
         }
     }
@@ -204,6 +204,7 @@ Source type: {source}\n",
     }
 }
 
+#[derive(Clone)]
 enum EmailBackend {
     /// Backend used in production to send mails using SMTP.
     Smtp {
@@ -214,7 +215,7 @@ enum EmailBackend {
     /// Backend used locally during development, will store the emails in the provided directory.
     FileSystem { path: PathBuf },
     /// Backend used during tests, will keep messages in memory to allow tests to retrieve them.
-    Memory { mails: Mutex<Vec<StoredEmail>> },
+    Memory { mails: Arc<Mutex<Vec<StoredEmail>>> },
 }
 
 // Custom Debug implementation to avoid showing the SMTP password.

src/tests/util/test_app.rs

@@ -272,6 +272,7 @@ impl TestAppBuilder {
                 None,
                 app.storage.clone(),
                 app.primary_database.clone(),
+                app.emails.clone(),
             );
 
             let runner = Runner::new(app.primary_database.clone(), Arc::new(environment))

src/worker/environment.rs

@@ -2,6 +2,7 @@ use crate::cloudfront::CloudFront;
 use crate::db::DieselPool;
 use crate::fastly::Fastly;
 use crate::storage::Storage;
+use crate::Emails;
 use crates_io_index::{Repository, RepositoryConfig};
 use parking_lot::{Mutex, MutexGuard};
 use std::ops::{Deref, DerefMut};
@@ -15,6 +16,7 @@ pub struct Environment {
     fastly: Option<Fastly>,
     pub storage: Arc<Storage>,
     pub connection_pool: DieselPool,
+    pub emails: Emails,
 }
 
 impl Environment {
@@ -24,6 +26,7 @@ impl Environment {
         fastly: Option<Fastly>,
         storage: Arc<Storage>,
         connection_pool: DieselPool,
+        emails: Emails,
     ) -> Self {
         Self {
             repository_config,
@@ -32,6 +35,7 @@ impl Environment {
             fastly,
             storage,
             connection_pool,
+            emails,
         }
     }