From a8ec7cae7880488547426247542b6b7adfae353b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 28 Sep 2025 19:20:34 -0400 Subject: [PATCH 1/5] Added general environment function --- src/environment.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/environment.rs b/src/environment.rs index 37e0d27..3c51a96 100644 --- a/src/environment.rs +++ b/src/environment.rs @@ -58,3 +58,10 @@ 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) +} -- 2.43.0 From 8a55df3e14bbdfbc3b7adb6945eca53f60fe7643 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 29 Sep 2025 15:15:45 -0400 Subject: [PATCH 2/5] Added env variables --- .env | 2 ++ .env.sample | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.env b/.env index 4905119..81ad4ab 100644 --- a/.env +++ b/.env @@ -1,3 +1,5 @@ +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 diff --git a/.env.sample b/.env.sample index 4905119..81ad4ab 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,5 @@ +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 -- 2.43.0 From fa4ee845c5349dc8d4b4a60f86afcf66584621f7 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 29 Sep 2025 15:16:12 -0400 Subject: [PATCH 3/5] Added test --- tests/test.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test.rs b/tests/test.rs index 23aaebc..518b1f6 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -59,4 +59,14 @@ mod tests { 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) + } + } } -- 2.43.0 From 2216f27df11547f0033a0083c98254aeff874840 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 29 Sep 2025 15:16:36 -0400 Subject: [PATCH 4/5] Code formatting --- tests/test.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/test.rs b/tests/test.rs index 518b1f6..794aadb 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -62,7 +62,16 @@ mod tests { #[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")]; + 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)); -- 2.43.0 From 1113e90e343f265c6e57f5da8d39487311398ba4 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 29 Sep 2025 15:19:07 -0400 Subject: [PATCH 5/5] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c44952c..395075d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "icarus_envy" -version = "0.3.3" +version = "0.3.4" dependencies = [ "async-std", "const_format", diff --git a/Cargo.toml b/Cargo.toml index d288dfd..f5c8a7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_envy" -version = "0.3.3" +version = "0.3.4" edition = "2024" rust-version = "1.88" -- 2.43.0