Merge 6f1dc71 into 9907f1e

Author: konkerama

Cargo.lock

@@ -9,7 +9,6 @@ axum = "0.6.20"
 tower-http = { version = "0.4.0", features = ["cors","trace"] }
 tracing-subscriber = "0.3.17"
 chrono = { version = "0.4.23", features = ["serde"] }
-dotenv = "0.15.0"
 mongodb = { version = "2.3.1", features = ["bson-chrono-0_4"] }
 serde = { version = "1.0.152", features = ["derive"] }
 sqlx = {version="0.7.1", features = ["runtime-async-std-native-tls", "postgres", "uuid", "chrono"]}
@@ -24,6 +23,7 @@ tracing = "0.1.37"
 futures = { version = "0.3.25", default-features = false, features = ["async-await"] }
 hyper = {version="0.14.27", features = ["full"] }
 autometrics = { version = "0.6.0", features = ["prometheus-exporter"] }
+dotenvy = "0.15.7"
 
 [dev-dependencies]
 mime = "0.3"

Cargo.toml

@@ -80,4 +80,3 @@ curl -X DELETE http://localhost:8000/api/mongo/<id> -s | jq
 
 - error handling using `thiserror`
 - implement tracing using opentelemetry
-- modify dependency loading with dotenv file rather than env vars

README.md

@@ -0,0 +1,9 @@
+ME_CONFIG_MONGODB_ADMINUSERNAME=username
+ME_CONFIG_MONGODB_ADMINPASSWORD=password
+ME_CONFIG_MONGODB_SERVER=localhost
+MONGO_INITDB_DATABASE=rust_mongodb
+MONGODB_NOTE_COLLECTION=notes
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
+POSTGRES_URL=postgres

dev.env

@@ -4,25 +4,16 @@ services:
   rust:
     build:
       context: .
-      # dockerfile: Dockerfile
     depends_on:
       - mongodb
       - liquibase
-    # image: sample-python-container:latest
     ports:
       - 8000:8000
     restart: unless-stopped
     environment:
       - ENV=dev
-      - ME_CONFIG_MONGODB_ADMINUSERNAME=username
-      - ME_CONFIG_MONGODB_ADMINPASSWORD=password
-      - ME_CONFIG_MONGODB_SERVER=mongodb
-      - MONGO_INITDB_DATABASE=rust_mongodb
-      - MONGODB_NOTE_COLLECTION=notes
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=postgres
-      - POSTGRES_URL=postgres
+    volumes:
+      - ./dev.env:/.env
   liquibase:
     depends_on:
       - postgres

docker-compose.yaml

@@ -0,0 +1,9 @@
+ME_CONFIG_MONGODB_ADMINUSERNAME=username
+ME_CONFIG_MONGODB_ADMINPASSWORD=password
+ME_CONFIG_MONGODB_SERVER=localhost
+MONGO_INITDB_DATABASE=rust_mongodb
+MONGODB_NOTE_COLLECTION=notes
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
+POSTGRES_URL=localhost

local.env

@@ -10,6 +10,7 @@ mod schema;
 pub use self::error::{Error, Result};
 
 use autometrics::prometheus_exporter;
+use dotenvy::dotenv;
 use mongo::MONGO;
 use pg::PG;
 use route::create_router;
@@ -23,6 +24,8 @@ async fn main() {
     if std::env::var_os("RUST_LOG").is_none() {
         std::env::set_var("RUST_LOG", "app=info,tower_http=trace");
     }
+    dotenv().expect(".env file not found");
+
     let pg = PG::init().await.unwrap();
     let mongo = MONGO::init().await.unwrap();
 
@@ -78,6 +81,7 @@ mod tests {
     }
 
     async fn api_call(method: Method, uri: &str, body: Body) -> (StatusCode, serde_json::Value) {
+        dotenv().expect(".env file not found");
         let app = init().await;
         let response = app
             .oneshot(

local.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-source local.sh
+cp local.env .env
 docker compose -f docker-compose-local.yaml up --force-recreate -V -d
 
 sleep 5 
@@ -8,4 +8,6 @@ cargo sqlx prepare --database-url "postgresql://postgres:postgres@localhost:5432
 
 cargo test
 
+rm .env
+
 docker compose -f docker-compose-local.yaml down