EnvConfig - use Env. variable for seeding the dbs

Author: elpiel

docs/config/ganache.toml

@@ -47,8 +47,6 @@ admins = [
     '0x80690751969B234697e9059e04ed72195c3507fa'
 ]
 
-seed_db = true
-
 [platform]
 # This should be changed for tests and use the wiremock url
 url = "https://platform.adex.network"

docs/config/prod.toml

@@ -28,8 +28,6 @@ validators_whitelist = []
 # Galya (for analytics)
 admins = ['0x5d6A3F1AD7b124ecDFDf4841D9bB246eD5fBF04c']
 
-seed_db = false
-
 [platform]
 # This should be changed for tests and use the wiremock url
 url = "https://platform.adex.network"

primitives/src/config.rs

@@ -182,7 +182,6 @@ pub struct Config {
     pub chains: HashMap<String, ChainInfo>,
     pub platform: PlatformConfig,
     pub limits: Limits,
-    pub seed_db: bool,
 }
 
 impl Config {

sentry/src/application.rs

@@ -73,6 +73,10 @@ pub struct EnvConfig {
     /// Defaults to locally running Redis server: [`DEFAULT_REDIS_URL`]
     #[serde(deserialize_with = "redis_url", default = "default_redis_url")]
     pub redis_url: ConnectionInfo,
+    /// Whether or not to seed the database in [`Environment::Development`].
+    #[serde(default)]
+    pub seed_db: bool,
+    
 }
 
 impl EnvConfig {

sentry/src/main.rs

@@ -5,16 +5,20 @@ use std::{env, net::SocketAddr, path::PathBuf};
 
 use clap::{crate_version, value_parser, Arg, Command};
 
+use redis::aio::MultiplexedConnection;
 use slog::info;
 
 use adapter::{primitives::AdapterTypes, Adapter};
 use primitives::{
-    config::configuration, postgres::POSTGRES_CONFIG, test_util::DUMMY_AUTH,
-    util::logging::new_logger, ValidatorId,
+    config::{configuration, Environment},
+    postgres::POSTGRES_CONFIG,
+    test_util::DUMMY_AUTH,
+    util::logging::new_logger,
+    ValidatorId,
 };
 use sentry::{
-    application::{seed_dummy, seed_ethereum, EnableTls},
-    db::{postgres_connection, redis_connection, setup_migrations, CampaignRemaining},
+    application::{seed_dummy, seed_ethereum, EnableTls, EnvConfig},
+    db::{postgres_connection, redis_connection, setup_migrations, CampaignRemaining, DbPool},
     platform::PlatformApi,
     Application,
 };
@@ -127,20 +131,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let logger = new_logger("sentry");
-    let redis = redis_connection(env_config.redis_url).await?;
-    info!(&logger, "Checking connection and applying migrations...");
-    // Check connection and setup migrations before setting up Postgres
-    tokio::task::block_in_place(|| {
-        // Migrations are blocking, so we need to wrap it with block_in_place
-        // otherwise we get a tokio error
-        setup_migrations(env_config.env)
-    });
 
-    // use the environmental variables to setup the Postgres connection
-    let postgres = match postgres_connection(POSTGRES_CONFIG.clone()).await {
-        Ok(pool) => pool,
-        Err(build_err) => panic!("Failed to build postgres database pool: {build_err}"),
-    };
+    let (redis, postgres) = setup_databases(&logger, &env_config).await?;
 
     let campaign_remaining = CampaignRemaining::new(redis.clone());
 
@@ -163,10 +155,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 platform_api,
             );
 
-            if config.seed_db {
-                redis::cmd("FLUSHDB")
-                    .query_async::<_, String>(&mut redis.clone())
-                    .await?;
+            if env_config.seed_db && Environment::Development == env_config.env {
                 seed_ethereum(app.clone()).await?;
             }
 
@@ -183,10 +172,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 platform_api,
             );
 
-            if config.seed_db {
-                redis::cmd("FLUSHDB")
-                    .query_async::<_, String>(&mut redis.clone())
-                    .await?;
+            if env_config.seed_db && Environment::Development == env_config.env {
                 seed_dummy(app.clone()).await?;
             }
 
@@ -196,3 +182,38 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+
+/// Setup the databases before use in the application:
+///
+/// 1. Runs migrations on `postgres` but if [`Environment::Development`] then it runs them down first.
+/// 2. Flushes `redis` if [`Environment::Development`].
+async fn setup_databases(
+    logger: &slog::Logger,
+    env_config: &EnvConfig,
+) -> Result<(MultiplexedConnection, DbPool), Box<dyn std::error::Error>> {
+    let redis = redis_connection(env_config.redis_url.clone()).await?;
+
+    info!(&logger, "Checking connection and applying migrations...");
+    // Check connection and setup migrations before setting up Postgres
+    tokio::task::block_in_place(|| {
+        // Migrations are blocking, so we need to wrap it with block_in_place
+        // otherwise we get a tokio error
+        setup_migrations(env_config.env)
+    });
+
+    // clearing up redis
+    if Environment::Development == env_config.env {
+        info!(&logger, "Flushing redis...");
+        redis::cmd("FLUSHDB")
+            .query_async::<_, String>(&mut redis.clone())
+            .await?;
+    }
+
+    // use the environmental variables to setup the Postgres connection
+    let postgres = match postgres_connection(POSTGRES_CONFIG.clone()).await {
+        Ok(pool) => pool,
+        Err(build_err) => panic!("Failed to build postgres database pool: {build_err}"),
+    };
+
+    Ok((redis, postgres))
+}