Compare commits

..

5 Commits

Author SHA1 Message Date
1113e90e34 Version bump
All checks were successful
Rust Build / Check (pull_request) Successful in 35s
Release Tagging / release (pull_request) Successful in 38s
Rust Build / Test Suite (pull_request) Successful in 44s
Rust Build / Rustfmt (pull_request) Successful in 37s
Rust Build / Clippy (pull_request) Successful in 38s
Rust Build / build (pull_request) Successful in 40s
2025-09-29 15:19:07 -04:00
2216f27df1 Code formatting
All checks were successful
Release Tagging / release (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 37s
Rust Build / Check (pull_request) Successful in 52s
Rust Build / Test Suite (pull_request) Successful in 1m6s
Rust Build / Clippy (pull_request) Successful in 36s
Rust Build / build (pull_request) Successful in 40s
2025-09-29 15:16:36 -04:00
fa4ee845c5 Added test 2025-09-29 15:16:12 -04:00
8a55df3e14 Added env variables 2025-09-29 15:15:45 -04:00
a8ec7cae78 Added general environment function
All checks were successful
Rust Build / build (pull_request) Successful in 32s
Release Tagging / release (pull_request) Successful in 39s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 36s
Rust Build / Rustfmt (pull_request) Successful in 33s
Rust Build / Clippy (pull_request) Successful in 41s
2025-09-28 19:20:34 -04:00
8 changed files with 45 additions and 166 deletions

5
.env
View File

@@ -11,8 +11,3 @@ POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com ICARUS_BASE_API_URL=https://icarus.com
ICARUS_AUTH_BASE_API_URL=https://auth.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

View File

@@ -11,8 +11,3 @@ POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com ICARUS_BASE_API_URL=https://icarus.com
ICARUS_AUTH_BASE_API_URL=https://auth.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

2
Cargo.lock generated
View File

@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
[[package]] [[package]]
name = "icarus_envy" name = "icarus_envy"
version = "0.3.6" version = "0.3.4"
dependencies = [ dependencies = [
"async-std", "async-std",
"const_format", "const_format",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "icarus_envy" name = "icarus_envy"
version = "0.3.6" version = "0.3.4"
edition = "2024" edition = "2024"
rust-version = "1.88" rust-version = "1.88"

View File

@@ -1,104 +1,67 @@
pub async fn get_db_url() -> crate::EnvVar { pub async fn get_db_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::DB_URL; std::env::var(crate::keys::DB_URL).expect(crate::keys::error::DB_URL)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_secret_main_key() -> crate::EnvVar { pub async fn get_secret_main_key() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::SECRET_MAIN_KEY; std::env::var(crate::keys::SECRET_MAIN_KEY).expect(crate::keys::error::SECRET_MAIN_KEY)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_service_passphrase() -> crate::EnvVar { pub async fn get_service_passphrase() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::SERVICE_PASSPHRASE; std::env::var(crate::keys::SERVICE_PASSPHRASE).expect(crate::keys::error::SERVICE_LOGIN)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_secret_key() -> crate::EnvVar { pub async fn get_secret_key() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::SECRET_KEY; std::env::var(crate::keys::SECRET_KEY).expect(crate::keys::error::SECRET_KEY)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_root_directory() -> crate::EnvVar { pub async fn get_root_directory() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::ROOT_DIRECTORY; std::env::var(crate::keys::ROOT_DIRECTORY).expect(crate::keys::error::ROOT_DIRECTORY)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_icarus_base_api_url() -> crate::EnvVar { pub async fn get_icarus_base_api_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::ICARUS_BASE_API_URL; std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_icarus_auth_base_api_url() -> crate::EnvVar { pub async fn get_icarus_auth_base_api_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::ICARUS_AUTH_BASE_API_URL; std::env::var(crate::keys::ICARUS_AUTH_BASE_API_URL)
let value = std::env::var(key).expect(key); .expect(crate::keys::error::ICARUS_AUTH_BASE_API_URL)
crate::init_envvar(key, &value)
} }
pub async fn get_app_env() -> crate::EnvVar { pub async fn get_app_env() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::APP_ENV; std::env::var(crate::keys::APP_ENV).expect(crate::keys::error::APP_ENV)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_backend_port() -> crate::EnvVar { pub async fn get_backend_port() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::BACKEND_PORT; std::env::var(crate::keys::BACKEND_PORT).expect(crate::keys::error::BACKEND_PORT)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_frontend_url() -> crate::EnvVar { pub async fn get_frontend_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::FRONTEND_URL; std::env::var(crate::keys::FRONTEND_URL).expect(crate::keys::error::FRONTEND_URL)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_rust_log() -> crate::EnvVar { pub async fn get_rust_log() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::RUST_LOG; std::env::var(crate::keys::RUST_LOG).expect(crate::keys::error::RUST_LOG)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
pub async fn get_allowed_origins() -> crate::EnvVar { pub async fn get_allowed_origins() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
let key = crate::keys::ALLOWED_ORIGINS; std::env::var(crate::keys::ALLOWED_ORIGINS).expect(crate::keys::error::ALLOWED_ORIGINS)
let value = std::env::var(key).expect(key);
crate::init_envvar(key, &value)
} }
/// Get environment not specified in the code /// Get environment not specified in the code
pub async fn get_env(environment: &str) -> crate::EnvVar { pub async fn get_env(environment: &str) -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
// let key = crate::keys::
let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR); let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR);
let value = std::env::var(environment).expect(&my_error); std::env::var(environment).expect(&my_error)
crate::init_envvar(environment, &value)
} }

View File

@@ -1,24 +1,24 @@
/// Environment key for Database management // Environment key for Database management
pub const DB_URL: &str = "DATABASE_URL"; pub const DB_URL: &str = "DATABASE_URL";
/// Environment key for secret main key // Environment key for secret main key
/// Used for the icarus app // Used for the icarus app
pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY"; 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"; pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE";
/// Environment key for secret key // Environment key for secret key
/// Generic use of secret key that could be found in various apps // Generic use of secret key that could be found in various apps
pub const SECRET_KEY: &str = "SECRET_KEY"; 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"; 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"; 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"; pub const ICARUS_AUTH_BASE_API_URL: &str = "ICARUS_AUTH_BASE_API_URL";
/// Environment key for App status /// Environment key for App status

View File

@@ -1,15 +1,2 @@
pub mod environment; pub mod environment;
pub mod keys; pub mod keys;
#[derive(Debug, Default, Clone)]
pub struct EnvVar {
pub key: String,
pub value: String,
}
pub fn init_envvar(key: &str, value: &str) -> EnvVar {
EnvVar {
key: key.to_string(),
value: value.to_string(),
}
}

View File

@@ -4,7 +4,7 @@ mod tests {
fn test_dburl() { fn test_dburl() {
let result = async_std::task::block_on(icarus_envy::environment::get_db_url()); let result = async_std::task::block_on(icarus_envy::environment::get_db_url());
assert_eq!( assert_eq!(
result.value, "postgres://myuser:password@localhost:5432/my_db", result, "postgres://myuser:password@localhost:5432/my_db",
"DATABASE_URL does not match {:?}", "DATABASE_URL does not match {:?}",
result result
); );
@@ -14,7 +14,7 @@ mod tests {
fn test_get_secret_main_key() { fn test_get_secret_main_key() {
let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key()); let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key());
assert_eq!( assert_eq!(
result.value, "Somesupersecretpassword!!!45345435", result, "Somesupersecretpassword!!!45345435",
"SECRET_MAIN_KEY does not match {:?}", "SECRET_MAIN_KEY does not match {:?}",
result result
) )
@@ -24,7 +24,7 @@ mod tests {
fn test_get_service_passphrase() { fn test_get_service_passphrase() {
let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase()); let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
assert_eq!( assert_eq!(
result.value, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO", result, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
"SERVICE_PASSPHRASE does not match {:?}", "SERVICE_PASSPHRASE does not match {:?}",
result result
) )
@@ -34,7 +34,7 @@ mod tests {
fn test_get_secret_key() { fn test_get_secret_key() {
let result = async_std::task::block_on(icarus_envy::environment::get_secret_key()); let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());
assert_eq!( assert_eq!(
result.value, "AmIGoodEnoughForYou?", result, "AmIGoodEnoughForYou?",
"SECRET_KEY does not match {:?}", "SECRET_KEY does not match {:?}",
result result
) )
@@ -44,7 +44,7 @@ mod tests {
fn test_get_root_directory() { fn test_get_root_directory() {
let result = async_std::task::block_on(icarus_envy::environment::get_root_directory()); let result = async_std::task::block_on(icarus_envy::environment::get_root_directory());
assert_eq!( assert_eq!(
result.value, "/path/to/root", result, "/path/to/root",
"ROOT_DIRECTORY does not match {:?}", "ROOT_DIRECTORY does not match {:?}",
result result
) )
@@ -54,69 +54,12 @@ mod tests {
fn test_get_icarus_base_api_url() { fn test_get_icarus_base_api_url() {
let result = async_std::task::block_on(icarus_envy::environment::get_icarus_base_api_url()); let result = async_std::task::block_on(icarus_envy::environment::get_icarus_base_api_url());
assert_eq!( assert_eq!(
result.value, "https://icarus.com", result, "https://icarus.com",
"ICARUS_BASE_API_URL does not match {:?}", "ICARUS_BASE_API_URL does not match {:?}",
result result
) )
} }
#[test]
fn test_get_app_env() {
let result = async_std::task::block_on(icarus_envy::environment::get_app_env());
assert_eq!(
result.value,
"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.value,
"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.value,
"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.value,
"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.value,
"https://soaricarus.com,https://www.soaricarus.com",
"{} does not match {:?}",
icarus_envy::keys::ALLOWED_ORIGINS,
result
)
}
#[test] #[test]
fn test_get_env() { fn test_get_env() {
let keys = vec![ let keys = vec![
@@ -132,11 +75,7 @@ mod tests {
for (key, value) in keys.iter() { for (key, value) in keys.iter() {
let result = async_std::task::block_on(icarus_envy::environment::get_env(key)); let result = async_std::task::block_on(icarus_envy::environment::get_env(key));
assert_eq!( assert_eq!(result, *value, "{:?} does not match {:?}", key, result)
result.value, *value,
"{:?} does not match {:?}",
key, result
)
} }
} }
} }