Compare commits
5 Commits
v0.4.0-25-
...
v0.3.6-24-
Author | SHA1 | Date | |
---|---|---|---|
3cddc77542
|
|||
c5ad65c93e
|
|||
951b0ec508
|
|||
72d37722c0
|
|||
515b228250
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icarus_envy"
|
name = "icarus_envy"
|
||||||
version = "0.4.0"
|
version = "0.3.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"const_format",
|
"const_format",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_envy"
|
name = "icarus_envy"
|
||||||
version = "0.4.0"
|
version = "0.3.6"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.88"
|
rust-version = "1.88"
|
||||||
|
|
||||||
|
@@ -90,15 +90,13 @@ pub async fn get_allowed_origins() -> crate::EnvVar {
|
|||||||
let key = crate::keys::ALLOWED_ORIGINS;
|
let key = crate::keys::ALLOWED_ORIGINS;
|
||||||
let value = std::env::var(key).expect(key);
|
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
|
/// Get environment not specified in the code
|
||||||
pub async fn get_env(environment: &str) -> crate::EnvVar {
|
pub async fn get_env(environment: &str) -> crate::EnvVar {
|
||||||
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);
|
let value = std::env::var(environment).expect(&my_error);
|
||||||
|
|
||||||
|
28
src/lib.rs
28
src/lib.rs
@@ -1,43 +1,15 @@
|
|||||||
pub mod environment;
|
pub mod environment;
|
||||||
pub mod keys;
|
pub mod keys;
|
||||||
pub mod utility;
|
|
||||||
|
|
||||||
#[derive(Debug, Default, Clone)]
|
#[derive(Debug, Default, Clone)]
|
||||||
pub struct EnvVar {
|
pub struct EnvVar {
|
||||||
pub key: String,
|
pub key: String,
|
||||||
pub value: String,
|
pub value: String,
|
||||||
pub has_delimiter: bool,
|
|
||||||
pub delimiter: char,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn init_envvar(key: &str, value: &str) -> EnvVar {
|
pub fn init_envvar(key: &str, value: &str) -> EnvVar {
|
||||||
EnvVar {
|
EnvVar {
|
||||||
key: key.to_string(),
|
key: key.to_string(),
|
||||||
value: value.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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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",
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
@@ -114,28 +114,7 @@ mod tests {
|
|||||||
"{} does not match {:?}",
|
"{} does not match {:?}",
|
||||||
icarus_envy::keys::ALLOWED_ORIGINS,
|
icarus_envy::keys::ALLOWED_ORIGINS,
|
||||||
result
|
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]
|
#[test]
|
||||||
|
Reference in New Issue
Block a user