require the server configuration when connecting to the database

Author: pietroalbini

src/admin/delete_crate.rs

@@ -14,7 +14,7 @@ pub struct Opts {
 }
 
 pub fn run(opts: Opts) {
-    let conn = db::connect_now().unwrap();
+    let conn = db::connect_now(&Default::default()).unwrap();
     conn.transaction::<_, diesel::result::Error, _>(|| {
         delete(opts, &conn);
         Ok(())

src/admin/delete_version.rs

@@ -21,7 +21,7 @@ pub struct Opts {
 }
 
 pub fn run(opts: Opts) {
-    let conn = db::connect_now().unwrap();
+    let conn = db::connect_now(&Default::default()).unwrap();
     conn.transaction::<_, diesel::result::Error, _>(|| {
         delete(opts, &conn);
         Ok(())

src/admin/migrate.rs

@@ -11,13 +11,13 @@ diesel_migrations::embed_migrations!("./migrations");
 pub struct Opts;
 
 pub fn run(_opts: Opts) -> Result<(), Error> {
-    let db_config = crate::config::DatabasePools::full_from_environment();
+    let config = crate::config::Server::default();
 
     // TODO: Refactor logic so that we can also check things from App::new() here.
     // If the app will panic due to bad configuration, it is better to error in the release phase
     // to avoid launching dynos that will fail.
 
-    if db_config.are_all_read_only() {
+    if config.db.are_all_read_only() {
         // TODO: Check `any_pending_migrations()` with a read-only connection and error if true.
         // It looks like this requires changes upstream to make this pub in `migration_macros`.
 
@@ -29,13 +29,14 @@ pub fn run(_opts: Opts) -> Result<(), Error> {
         return Ok(());
     }
 
-    println!("==> migrating the database");
     // The primary is online, access directly via `DATABASE_URL`.
-    let conn = crate::db::connect_now()?;
+    let conn = crate::db::connect_now(&config)?;
+
+    println!("==> migrating the database");
     embedded_migrations::run_with_output(&conn, &mut std::io::stdout())?;
 
     println!("==> synchronizing crate categories");
-    crate::boot::categories::sync(CATEGORIES_TOML).unwrap();
+    crate::boot::categories::sync_with_connection(CATEGORIES_TOML, &conn).unwrap();
 
     Ok(())
 }

src/admin/populate.rs

@@ -14,7 +14,7 @@ pub struct Opts {
 }
 
 pub fn run(opts: Opts) {
-    let conn = db::connect_now().unwrap();
+    let conn = db::connect_now(&Default::default()).unwrap();
     conn.transaction(|| update(opts, &conn)).unwrap();
 }
 

src/admin/render_readmes.rs

@@ -40,7 +40,7 @@ pub struct Opts {
 
 pub fn run(opts: Opts) -> anyhow::Result<()> {
     let base_config = Arc::new(config::Base::from_environment());
-    let conn = db::connect_now().unwrap();
+    let conn = db::connect_now(&Default::default()).unwrap();
 
     let start_time = Utc::now();
 

src/admin/transfer_crates.rs

@@ -21,7 +21,7 @@ pub struct Opts {
 }
 
 pub fn run(opts: Opts) {
-    let conn = db::connect_now().unwrap();
+    let conn = db::connect_now(&Default::default()).unwrap();
     conn.transaction::<_, diesel::result::Error, _>(|| {
         transfer(opts, &conn);
         Ok(())

src/admin/verify_token.rs

@@ -13,7 +13,7 @@ pub struct Opts {
 }
 
 pub fn run(opts: Opts) -> AppResult<()> {
-    let conn = db::connect_now()?;
+    let conn = db::connect_now(&Default::default())?;
     let user = User::find_by_api_token(&conn, &opts.api_token)?;
     println!("The token belongs to user {}", user.gh_login);
     Ok(())

src/app.rs

@@ -100,7 +100,7 @@ impl App {
         let thread_pool = Arc::new(ScheduledThreadPool::new(db_helper_threads));
 
         let primary_database = if config.use_test_database_pool {
-            DieselPool::new_test(&config.db.primary.url)
+            DieselPool::new_test(&config, &config.db.primary.url)
         } else {
             let primary_db_connection_config = ConnectionConfig {
                 statement_timeout: db_connection_timeout,
@@ -116,6 +116,7 @@ impl App {
 
             DieselPool::new(
                 &config.db.primary.url,
+                &config,
                 primary_db_config,
                 instance_metrics
                     .database_time_to_obtain_connection
@@ -126,7 +127,7 @@ impl App {
 
         let replica_database = if let Some(pool_config) = config.db.replica.as_ref() {
             if config.use_test_database_pool {
-                Some(DieselPool::new_test(&pool_config.url))
+                Some(DieselPool::new_test(&config, &pool_config.url))
             } else {
                 let replica_db_connection_config = ConnectionConfig {
                     statement_timeout: db_connection_timeout,
@@ -143,6 +144,7 @@ impl App {
                 Some(
                     DieselPool::new(
                         &pool_config.url,
+                        &config,
                         replica_db_config,
                         instance_metrics
                             .database_time_to_obtain_connection

src/bin/background-worker.rs

@@ -24,11 +24,10 @@ use std::time::Duration;
 fn main() {
     println!("Booting runner");
 
-    let db_config = config::DatabasePools::full_from_environment();
-    let base_config = config::Base::from_environment();
-    let uploader = base_config.uploader();
+    let config = config::Server::default();
+    let uploader = config.base.uploader();
 
-    if db_config.are_all_read_only() {
+    if config.db.are_all_read_only() {
         loop {
             println!(
                 "Cannot run background jobs with a read-only pool. Please scale background_worker \
@@ -38,7 +37,7 @@ fn main() {
         }
     }
 
-    let db_url = db::connection_url(&db_config.primary.url);
+    let db_url = db::connection_url(&config, &config.db.primary.url);
 
     let job_start_timeout = dotenv::var("BACKGROUND_JOB_TIMEOUT")
         .unwrap_or_else(|_| "30".into())

src/bin/enqueue-job.rs

@@ -7,7 +7,7 @@ use swirl::schema::background_jobs::dsl::*;
 use swirl::Job;
 
 fn main() -> Result<()> {
-    let conn = db::connect_now()?;
+    let conn = db::connect_now(&Default::default())?;
     let mut args = std::env::args().skip(1);
 
     let job = args.next().unwrap_or_default();