alemi/postwoman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: also fill header vars from env

Browse source
This commit is contained in:
əlemi 2023-06-15 16:42:05 +02:00
parent 2dd2e6e0ec
commit 527af4e54f
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/model/request.rs
View file

@ -2,6 +2,16 @@ use std::str::FromStr;
use postman_collection::{v1_0_0, v2_0_0, v2_1_0};
fn fill_from_env(mut txt: String) -> String {
for (k, v) in std::env::vars() {
let key = format!("{{{{{}}}}}", k);
if txt.contains(&key) {
txt = txt.replace(&key, &v);
}
}
txt
}
pub trait IntoRequest {
fn make_request(&self) -> reqwest::Request;
}
@ -25,12 +35,7 @@ impl IntoRequest for v2_1_0::RequestClass {
_ => "http://localhost".into(),
};
for (k, v) in std::env::vars() {
let key = format!("{{{{{}}}}}", k);
if url_str.contains(&key) {
url_str = url_str.replace(&key, &v);
}
}
url_str = fill_from_env(url_str);
let url = reqwest::Url::from_str(&url_str).unwrap();
@ -39,7 +44,9 @@ impl IntoRequest for v2_1_0::RequestClass {
match &self.header {
Some(v2_1_0::HeaderUnion::HeaderArray(x)) => {
for h in x {
out = out.header(h.key.clone(), h.value.clone()); // TODO avoid cloning
let k = fill_from_env(h.key.clone());
let v = fill_from_env(h.value.clone());
out = out.header(k, v); // TODO avoid cloning
}
},
_ => {},