Compare commits
7 Commits
v0.5.0-mai
...
v0.4.0-25-
Author | SHA1 | Date | |
---|---|---|---|
50e77edddc
|
|||
101547dbf4
|
|||
797430c9d2
|
|||
218b0f60a9
|
|||
c06d546ae7
|
|||
d9e43a80e4
|
|||
a7a2a8080e
|
@@ -90,13 +90,15 @@ pub async fn get_allowed_origins() -> crate::EnvVar {
|
||||
let key = crate::keys::ALLOWED_ORIGINS;
|
||||
let value = std::env::var(key).expect(key);
|
||||
|
||||
crate::init_envvar(key, &value)
|
||||
let mut envvar = 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);
|
||||
|
||||
|
24
src/lib.rs
24
src/lib.rs
@@ -1,15 +1,39 @@
|
||||
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 = amount_of_delimiters_found >= 1;
|
||||
|
||||
if has_delimiter {
|
||||
envvar.has_delimiter = has_delimiter;
|
||||
envvar.delimiter = delimiter;
|
||||
} else {
|
||||
envvar.has_delimiter = has_delimiter;
|
||||
}
|
||||
}
|
||||
|
15
src/utility.rs
Normal file
15
src/utility.rs
Normal file
@@ -0,0 +1,15 @@
|
||||
/// 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,8 +114,29 @@ mod tests {
|
||||
"{} 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() {
|
||||
|
Reference in New Issue
Block a user