Update icarus_models (#38)

Reviewed-on: #38
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.env.docker.sample

@@ -0,0 +1,6 @@
+SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
+POSTGRES_AUTH_USER=icarus_op
+POSTGRES_AUTH_PASSWORD=password
+POSTGRES_AUTH_DB=icarus_auth_db
+POSTGRES_AUTH_HOST=auth_db
+DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}

.env.sample

@@ -1,6 +1,6 @@
 SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-POSTGRES_USER=icarus_op_test
-POSTGRES_PASSWORD=password
-POSTGRES_DB=icarus_auth_test_db
-POSTGRES_HOST=localhost
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}
+POSTGRES_AUTH_USER=icarus_op_test
+POSTGRES_AUTH_PASSWORD=password
+POSTGRES_AUTH_DB=icarus_auth_test_db
+POSTGRES_AUTH_HOST=localhost
+DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}

Cargo.toml

@@ -19,7 +19,7 @@ argon2 = { version = "0.5.3", features = ["std"] } # Use the latest 0.5.x versio
 rand = { version = "0.9" }
 time = { version = "0.3.41", features = ["macros", "serde"] }
 josekit = { version = "0.10.1" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.1" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
 
 [dev-dependencies]
 http-body-util = { version = "0.1.3" }

READEME.md

@@ -1,20 +0,0 @@
-
-
-# Getting started
-Take notice of the .env.sample file and create copies without the .sample in the name.
-
-`.env.sample` -> `.env`
-
-Ensure that all variables are populated and is correct.
-
-## Docker
-
-Build the images
-```
-docker compose build --ssh default auth_api
-```
-
-Bring it up
-```
-docker compose up -d --force-recreate auth_api
-```

README.md

@@ -0,0 +1,26 @@
+
+
+# Getting Started
+Copy the `.env.sample` file to `.env` and ensure that the variables are populated. This project
+can be used with regular hosting or with docker. For the sake of getting up to speed quickly,
+Docker will be covered. Make sure docker is running and your ssh identity has been loaded.
+
+Build image
+```
+docker compose build
+```
+
+Start images
+```
+docker compose up -d --force-recreate
+```
+
+Bring it down
+```
+docker compose down -v
+```
+
+Pruning
+```
+docker system prune -a
+```

docker-compose.yaml

@@ -3,7 +3,9 @@ version: '3.8' # Use a recent version
 services:
   # Your Rust Application Service
   auth_api:
-    build: . # Tells docker-compose to build the Dockerfile in the current directory
+    build: # Tells docker-compose to build the Dockerfile in the current directory
+      context: .
+      ssh: ["default"]  # Uses host's SSH agent
     container_name: icarus_auth # Optional: Give the container a specific name
     ports:
       # Map host port 8000 to container port 3000 (adjust as needed)
@@ -21,9 +23,9 @@ services:
     container_name: icarus_auth_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_USER:-icarus_op}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_DB:-icarus_auth}
+      POSTGRES_USER: ${POSTGRES_AUTH_USER:-icarus_op}
+      POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
+      POSTGRES_DB: ${POSTGRES_AUTH_DB:-icarus_auth_db}
     volumes:
       # Persist database data using a named volume
       - postgres_data:/var/lib/postgresql/data
@@ -40,4 +42,4 @@ services:
 # Define the named volume for data persistence
 volumes:
   postgres_data:
-    driver: local # Use the default local driver
+    driver: local # Use the default local driver

docker_run.txt

@@ -1,13 +0,0 @@
-
-# Docker stuff
-#Build app
-docker compose build --ssh default auth_api
-
-# Rebuild and bring up
-docker compose up -d --force-recreate auth_api
-
-# Bring it down
-docker compose down -v
-
-# Pruning
-docker system prune -a

src/main.rs

@@ -74,6 +74,7 @@ mod tests {
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
+            dotenvy::dotenv().ok(); // Load .env file if it exists
             let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present");
             let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
             sqlx::PgPool::connect_with(tm_options).await