From 38b03bf2291d8509f0a21bf723d6eced15e2af74 Mon Sep 17 00:00:00 2001
From: Paul Yu <paul.d.yu@gmail.com>
Date: Tue, 16 May 2023 00:05:59 -0700
Subject: [PATCH 1/2] feat: configure database username and load from env or
 file

---
 docker-compose.yml |  2 ++
 src/database.rs    | 35 ++++++++++++++++++++++++++++++++---
 src/main.rs        | 27 +++++++++++++--------------
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3896cf9..233ec40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
     image: postgres:15.0-alpine
     container_name: azure-voting-db
     environment:
+      POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "mypassword"
     ports:
       - "5432:5432"
@@ -13,6 +14,7 @@ services:
     container_name: azure-voting-app
     environment:
       DATABASE_SERVER: "azure-voting-db"
+      DATABASE_USER: "postgres"
       DATABASE_PASSWORD: "mypassword"
       FIRST_VALUE: "Puppies"
       SECOND_VALUE: "Kittens"
diff --git a/src/database.rs b/src/database.rs
index 2622160..49bd290 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -10,9 +10,38 @@ pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
 
 pub fn setup() -> Pool<ConnectionManager<PgConnection>> {
     dotenv().ok();
-    let database_password = env::var("DATABASE_PASSWORD").expect("DATABASE_PASSWORD must be set");
-    let database_server = env::var("DATABASE_SERVER").expect("DATABASE_SERVER must be set");
-    let database_url = format!("postgres://postgres:{}@{}",database_password, database_server);
+
+    // first try to get database connection details from environment variables
+    // if that fails, try to get them from a file in /mnt/secrets
+    // if that fails, panic
+    let database_user = match env::var("DATABASE_USER") {
+        Ok(user) => user,
+        Err(_) => {
+            std::fs::read_to_string("/mnt/secrets-store/database-user")
+                .expect("Failed to read database-user from /mnt/secrets-store")
+        }
+    };
+
+    let database_password = match env::var("DATABASE_PASSWORD") {
+        Ok(password) => password,
+        Err(_) => {
+            std::fs::read_to_string("/mnt/secrets-store/database-password")
+                .expect("Failed to read database-password from /mnt/secrets-store")
+        }
+    };
+
+    let database_server = match env::var("DATABASE_SERVER") {
+        Ok(server) => server,
+        Err(_) => {
+            std::fs::read_to_string("/mnt/secrets-store/database-server")
+                .expect("Failed to read database-server from /mnt/secrets-store")
+        }
+    };
+
+    let database_url = format!(
+        "postgres://{}:{}@{}",
+        database_user, database_password, database_server
+    );
 
     info!("Establishing database connection");
     let mut connection: PgConnection;
diff --git a/src/main.rs b/src/main.rs
index 331e859..7e1729d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,7 +22,6 @@ use std::env::var;
 use std::fmt;
 use std::sync::Mutex;
 
-
 lazy_static! {
     static ref FIRST_VALUE: String = var("FIRST_VALUE").unwrap_or("Dogs".to_string());
     static ref SECOND_VALUE: String = var("SECOND_VALUE").unwrap_or("Cats".to_string());
@@ -48,18 +47,14 @@ impl fmt::Display for VoteValue {
 impl VoteValue {
     fn source_value(input: &str) -> VoteValue {
         if input == *FIRST_VALUE {
-            return VoteValue::FirstValue
-        }
-        else if input == *SECOND_VALUE {
-            return VoteValue::SecondValue
-        }
-        else if input == "Reset" {
-            return VoteValue::Reset
-        }
-        else {
+            return VoteValue::FirstValue;
+        } else if input == *SECOND_VALUE {
+            return VoteValue::SecondValue;
+        } else if input == "Reset" {
+            return VoteValue::Reset;
+        } else {
             panic!("Failed to match the vote type from {}", input);
         };
-           
     }
 }
 
@@ -88,7 +83,7 @@ async fn submit(
 
     info!("Vote is: {}", &form.vote);
     info!("Debug Vote is: {:?}", &form.vote);
-    
+
     let vote = VoteValue::source_value(&form.vote);
 
     match vote {
@@ -166,12 +161,16 @@ async fn main() -> std::io::Result<()> {
 
     // Load up the dog votes
     let first_value_query = votes.filter(vote_value.eq(FIRST_VALUE.clone()));
-    let first_value_result = first_value_query.select(count(vote_value)).first(&mut connection);
+    let first_value_result = first_value_query
+        .select(count(vote_value))
+        .first(&mut connection);
     let first_value_count = first_value_result.unwrap_or(0);
 
     // Load up the cat votes
     let second_value_query = votes.filter(vote_value.eq(SECOND_VALUE.clone()));
-    let second_value_result = second_value_query.select(count(vote_value)).first(&mut connection);
+    let second_value_result = second_value_query
+        .select(count(vote_value))
+        .first(&mut connection);
     let second_value_count = second_value_result.unwrap_or(0);
 
     // Note: web::Data created _outside_ HttpServer::new closure

From 671ad804a3b7d6d3b9cf0156f0a6b2dc41e8f8eb Mon Sep 17 00:00:00 2001
From: Paul Yu <paul.d.yu@gmail.com>
Date: Wed, 17 May 2023 17:21:43 +0000
Subject: [PATCH 2/2] feat: fallback to postgres as username if missing

---
 src/database.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/database.rs b/src/database.rs
index 49bd290..bc8b715 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -18,7 +18,7 @@ pub fn setup() -> Pool<ConnectionManager<PgConnection>> {
         Ok(user) => user,
         Err(_) => {
             std::fs::read_to_string("/mnt/secrets-store/database-user")
-                .expect("Failed to read database-user from /mnt/secrets-store")
+                .unwrap_or_else(|_| "postgres".to_string())
         }
     };