Added EnvVar and modified functions

Cargo.lock

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

Cargo.toml

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

src/environment.rs

@@ -49,7 +49,8 @@ pub async fn get_icarus_base_api_url() -> crate::EnvVar {
 pub async fn get_icarus_auth_base_api_url() -> crate::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::keys::ICARUS_AUTH_BASE_API_URL;
-    let value = std::env::var(key).expect(key);
+    let value = std::env::var(key)
+        .expect(key);
 
     crate::init_envvar(key, &value)
 }
@@ -90,15 +91,13 @@ pub async fn get_allowed_origins() -> crate::EnvVar {
     let key = crate::keys::ALLOWED_ORIGINS;
     let value = std::env::var(key).expect(key);
 
-    let mut envvar = crate::init_envvar(key, &value);
+    crate::init_envvar(key, &value)
-    crate::init_delimiter(&mut envvar, ',');
-
-    envvar
 }
 
 /// Get environment not specified in the code
 pub async fn get_env(environment: &str) -> crate::EnvVar {
     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);
 

src/lib.rs

@@ -1,43 +1,15 @@
 pub mod environment;
 pub mod keys;
-pub mod utility;
 
 #[derive(Debug, Default, Clone)]
 pub struct EnvVar {
     pub key: String,
     pub value: String,
-    pub has_delimiter: bool,
-    pub delimiter: char,
 }
 
 pub fn init_envvar(key: &str, value: &str) -> EnvVar {
     EnvVar {
         key: key.to_string(),
         value: value.to_string(),
-        has_delimiter: false,
-        ..Default::default()
-    }
-}
-
-pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
-    let mut amount_of_delimiters_found: i32 = 0;
-
-    for v in envvar.value.chars() {
-        if v == delimiter {
-            amount_of_delimiters_found += 1;
-        }
-    }
-
-    let has_delimiter = if amount_of_delimiters_found >= 1 {
-        true
-    } else {
-        false
-    };
-
-    if has_delimiter {
-        envvar.has_delimiter = has_delimiter;
-        envvar.delimiter = delimiter;
-    } else {
-        envvar.has_delimiter = has_delimiter;
     }
 }

src/utility.rs

@@ -1,15 +0,0 @@
-/// Take the Environment variable and delimitize it. If the value has a delimiter,
-/// extract it into some strings
-pub fn delimitize(var: &crate::EnvVar) -> Result<Vec<String>, std::io::Error> {
-    if var.has_delimiter {
-        Ok(var
-            .value
-            .split(var.delimiter)
-            .map(|c| c.parse::<String>().unwrap())
-            .collect())
-    } else {
-        Err(std::io::Error::other(
-            "Environment variable does not have a delimiter",
-        ))
-    }
-}

tests/test.rs

@@ -4,7 +4,7 @@ mod tests {
     fn test_dburl() {
         let result = async_std::task::block_on(icarus_envy::environment::get_db_url());
         assert_eq!(
-            result.value, "postgres://myuser:password@localhost:5432/my_db",
+            result, "postgres://myuser:password@localhost:5432/my_db",
             "DATABASE_URL does not match {:?}",
             result
         );
@@ -14,7 +14,7 @@ mod tests {
     fn test_get_secret_main_key() {
         let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key());
         assert_eq!(
-            result.value, "Somesupersecretpassword!!!45345435",
+            result, "Somesupersecretpassword!!!45345435",
             "SECRET_MAIN_KEY does not match {:?}",
             result
         )
@@ -24,7 +24,7 @@ mod tests {
     fn test_get_service_passphrase() {
         let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
         assert_eq!(
-            result.value, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
+            result, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
             "SERVICE_PASSPHRASE does not match {:?}",
             result
         )
@@ -34,7 +34,7 @@ mod tests {
     fn test_get_secret_key() {
         let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());
         assert_eq!(
-            result.value, "AmIGoodEnoughForYou?",
+            result, "AmIGoodEnoughForYou?",
             "SECRET_KEY does not match {:?}",
             result
         )
@@ -44,7 +44,7 @@ mod tests {
     fn test_get_root_directory() {
         let result = async_std::task::block_on(icarus_envy::environment::get_root_directory());
         assert_eq!(
-            result.value, "/path/to/root",
+            result, "/path/to/root",
             "ROOT_DIRECTORY does not match {:?}",
             result
         )
@@ -54,7 +54,7 @@ mod tests {
     fn test_get_icarus_base_api_url() {
         let result = async_std::task::block_on(icarus_envy::environment::get_icarus_base_api_url());
         assert_eq!(
-            result.value, "https://icarus.com",
+            result, "https://icarus.com",
             "ICARUS_BASE_API_URL does not match {:?}",
             result
         )
@@ -64,7 +64,7 @@ mod tests {
     fn test_get_app_env() {
         let result = async_std::task::block_on(icarus_envy::environment::get_app_env());
         assert_eq!(
-            result.value,
+            result,
             "development",
             "{} does not match {:?}",
             icarus_envy::keys::APP_ENV,
@@ -76,7 +76,7 @@ mod tests {
     fn test_get_backend_port() {
         let result = async_std::task::block_on(icarus_envy::environment::get_backend_port());
         assert_eq!(
-            result.value,
+            result,
             "8001",
             "{} does not match {:?}",
             icarus_envy::keys::BACKEND_PORT,
@@ -87,7 +87,7 @@ mod tests {
     fn test_get_frontend_url() {
         let result = async_std::task::block_on(icarus_envy::environment::get_frontend_url());
         assert_eq!(
-            result.value,
+            result,
             "http://localhost:4200",
             "{} does not match {:?}",
             icarus_envy::keys::FRONTEND_URL,
@@ -98,7 +98,7 @@ mod tests {
     fn test_get_rust_log() {
         let result = async_std::task::block_on(icarus_envy::environment::get_rust_log());
         assert_eq!(
-            result.value,
+            result,
             "debug",
             "{} does not match {:?}",
             icarus_envy::keys::RUST_LOG,
@@ -109,34 +109,13 @@ mod tests {
     fn test_get_allowed_origins() {
         let result = async_std::task::block_on(icarus_envy::environment::get_allowed_origins());
         assert_eq!(
-            result.value,
+            result,
             "https://soaricarus.com,https://www.soaricarus.com",
             "{} does not match {:?}",
             icarus_envy::keys::ALLOWED_ORIGINS,
             result
-        );
-
-        assert_eq!(
-            result.has_delimiter, true,
-            "The {} variable has an issue finding the delimiter",
-            result.key
-        );
-
-        match icarus_envy::utility::delimitize(&result) {
-            Ok(allowed_origins) => {
-                assert_eq!(
-                    allowed_origins.len(),
-                    2,
-                    "The amount of allowed origins does not match. {} {}",
-                    allowed_origins.len(),
-                    2
         )
     }
-            Err(err) => {
-                assert!(false, "Error: {:?}", err)
-            }
-        }
-    }
 
     #[test]
     fn test_get_env() {
@@ -153,11 +132,7 @@ mod tests {
 
         for (key, value) in keys.iter() {
             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
-            )
         }
     }
 }