From 86c5050c7bd5164bc6e773fc404195023f7f7aaa Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 29 Sep 2025 20:38:53 +0000 Subject: [PATCH] Refactoring (#21) Reviewed-on: https://git.kundeng.us/phoenix/icarus_envy/pulls/21 Co-authored-by: phoenix Co-committed-by: phoenix --- .env | 5 +++++ .env.sample | 5 +++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/keys.rs | 18 ++++++++-------- tests/test.rs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 81ad4ab..e7a9a26 100644 --- a/.env +++ b/.env @@ -11,3 +11,8 @@ POSTGRES_MAIN_HOST=localhost DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} ICARUS_BASE_API_URL=https://icarus.com ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com +APP_ENV=development +BACKEND_PORT=8001 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com diff --git a/.env.sample b/.env.sample index 81ad4ab..e7a9a26 100644 --- a/.env.sample +++ b/.env.sample @@ -11,3 +11,8 @@ POSTGRES_MAIN_HOST=localhost DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} ICARUS_BASE_API_URL=https://icarus.com ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com +APP_ENV=development +BACKEND_PORT=8001 +FRONTEND_URL=http://localhost:4200 +RUST_LOG=debug +ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com diff --git a/Cargo.lock b/Cargo.lock index 395075d..3e4dcd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "icarus_envy" -version = "0.3.4" +version = "0.3.5" dependencies = [ "async-std", "const_format", diff --git a/Cargo.toml b/Cargo.toml index f5c8a7b..b0ad5a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_envy" -version = "0.3.4" +version = "0.3.5" edition = "2024" rust-version = "1.88" diff --git a/src/keys.rs b/src/keys.rs index 1f0b1d6..e396db0 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -1,24 +1,24 @@ -// Environment key for Database management +/// Environment key for Database management pub const DB_URL: &str = "DATABASE_URL"; -// Environment key for secret main key -// Used for the icarus app +/// Environment key for secret main key +/// Used for the icarus app pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY"; -// Environment key for service logins +/// Environment key for service logins pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE"; -// Environment key for secret key -// Generic use of secret key that could be found in various apps +/// Environment key for secret key +/// Generic use of secret key that could be found in various apps pub const SECRET_KEY: &str = "SECRET_KEY"; -// Environment key for root directory for the icarus app +/// Environment key for root directory for the icarus app pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY"; -// Environment key for icarus api url +/// Environment key for icarus api url pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL"; -// Environment key for icarus auth api url +/// Environment key for icarus auth api url pub const ICARUS_AUTH_BASE_API_URL: &str = "ICARUS_AUTH_BASE_API_URL"; /// Environment key for App status diff --git a/tests/test.rs b/tests/test.rs index 794aadb..e657583 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -60,6 +60,63 @@ mod tests { ) } + #[test] + fn test_get_app_env() { + let result = async_std::task::block_on(icarus_envy::environment::get_app_env()); + assert_eq!( + result, + "development", + "{} does not match {:?}", + icarus_envy::keys::APP_ENV, + result + ) + } + + #[test] + fn test_get_backend_port() { + let result = async_std::task::block_on(icarus_envy::environment::get_backend_port()); + assert_eq!( + result, + "8001", + "{} does not match {:?}", + icarus_envy::keys::BACKEND_PORT, + result + ) + } + #[test] + fn test_get_frontend_url() { + let result = async_std::task::block_on(icarus_envy::environment::get_frontend_url()); + assert_eq!( + result, + "http://localhost:4200", + "{} does not match {:?}", + icarus_envy::keys::FRONTEND_URL, + result + ) + } + #[test] + fn test_get_rust_log() { + let result = async_std::task::block_on(icarus_envy::environment::get_rust_log()); + assert_eq!( + result, + "debug", + "{} does not match {:?}", + icarus_envy::keys::RUST_LOG, + result + ) + } + #[test] + fn test_get_allowed_origins() { + let result = async_std::task::block_on(icarus_envy::environment::get_allowed_origins()); + assert_eq!( + result, + "https://soaricarus.com,https://www.soaricarus.com", + "{} does not match {:?}", + icarus_envy::keys::ALLOWED_ORIGINS, + result + ) + } + #[test] fn test_get_env() { let keys = vec![