Version bump

.env

@@ -11,8 +11,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

.env.sample

@@ -11,8 +11,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

Cargo.lock

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

Cargo.toml

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

src/environment.rs

@@ -1,105 +1,67 @@
-pub async fn get_db_url() -> crate::EnvVar {
+pub async fn get_db_url() -> String {
     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();
-    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();
-    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();
-    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();
-    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();
-    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();
-    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(crate::keys::error::ICARUS_AUTH_BASE_API_URL)
-        .expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub async fn get_app_env() -> crate::EnvVar {
+pub async fn get_app_env() -> String {
     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();
-    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();
-    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();
-    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();
-    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
-pub async fn get_env(environment: &str) -> crate::EnvVar {
+pub async fn get_env(environment: &str) -> String {
     dotenvy::dotenv().ok();
-    // let key = crate::keys::
     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)
 }

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
+// 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";
 
-/// Environment key for service logins
+// Environment key for service logins
 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";
 
-/// 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

src/lib.rs

@@ -1,15 +1,2 @@
 pub mod environment;
 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(),
-    }
-}

tests/test.rs

@@ -60,63 +60,6 @@ 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![