Compare commits
4 Commits
v0.3.5-21-
...
a45e43b278
Author | SHA1 | Date | |
---|---|---|---|
a45e43b278
|
|||
a06f828c8a
|
|||
43e0fa8b7e
|
|||
d6bf9c8d71
|
7
.env
7
.env
@@ -1,5 +1,3 @@
|
||||
RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
|
||||
MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
|
||||
SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
|
||||
SECRET_KEY=AmIGoodEnoughForYou?
|
||||
SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
|
||||
@@ -11,8 +9,3 @@ 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
|
||||
|
@@ -1,5 +1,3 @@
|
||||
RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
|
||||
MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
|
||||
SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
|
||||
SECRET_KEY=AmIGoodEnoughForYou?
|
||||
SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
|
||||
@@ -11,8 +9,3 @@ 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
|
||||
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
|
||||
|
||||
[[package]]
|
||||
name = "icarus_envy"
|
||||
version = "0.3.5"
|
||||
version = "0.3.3"
|
||||
dependencies = [
|
||||
"async-std",
|
||||
"const_format",
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "icarus_envy"
|
||||
version = "0.3.5"
|
||||
version = "0.3.3"
|
||||
edition = "2024"
|
||||
rust-version = "1.88"
|
||||
|
||||
|
@@ -58,10 +58,3 @@ pub async fn get_allowed_origins() -> String {
|
||||
dotenvy::dotenv().ok();
|
||||
std::env::var(crate::keys::ALLOWED_ORIGINS).expect(crate::keys::error::ALLOWED_ORIGINS)
|
||||
}
|
||||
|
||||
/// Get environment not specified in the code
|
||||
pub async fn get_env(environment: &str) -> String {
|
||||
dotenvy::dotenv().ok();
|
||||
let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR);
|
||||
std::env::var(environment).expect(&my_error)
|
||||
}
|
||||
|
18
src/keys.rs
18
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
|
||||
|
@@ -59,80 +59,4 @@ mod tests {
|
||||
result
|
||||
)
|
||||
}
|
||||
|
||||
#[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![
|
||||
(
|
||||
"RANDOM_ENV_KEY",
|
||||
"YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe",
|
||||
),
|
||||
(
|
||||
"MODNAR_ENV_KEY",
|
||||
"FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain",
|
||||
),
|
||||
];
|
||||
|
||||
for (key, value) in keys.iter() {
|
||||
let result = async_std::task::block_on(icarus_envy::environment::get_env(key));
|
||||
assert_eq!(result, *value, "{:?} does not match {:?}", key, result)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user