fix: use env vars for blocking Vault HTTP call
Some checks failed
BotServer CI/CD / build (push) Failing after 5m54s
Some checks failed
BotServer CI/CD / build (push) Failing after 5m54s
This commit is contained in:
parent
f1d0a985e4
commit
985ba63e38
1 changed files with 9 additions and 7 deletions
|
|
@ -896,14 +896,16 @@ impl SecretsManager {
|
||||||
return Ok(cached);
|
return Ok(cached);
|
||||||
}
|
}
|
||||||
|
|
||||||
let client = self
|
let vault_addr = std::env::var("VAULT_ADDR").unwrap_or_default();
|
||||||
.client
|
let vault_token = std::env::var("VAULT_TOKEN").unwrap_or_default();
|
||||||
.as_ref()
|
|
||||||
.ok_or_else(|| anyhow!("No Vault client"))?;
|
|
||||||
|
|
||||||
let url = format!("{}/v1/secret/data/{}", self.addr, path);
|
if vault_addr.is_empty() || vault_token.is_empty() {
|
||||||
|
return Self::get_from_env(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = format!("{}/v1/secret/data/{}", vault_addr, path);
|
||||||
let resp = ureq::get(&url)
|
let resp = ureq::get(&url)
|
||||||
.set("X-Vault-Token", &self.token)
|
.set("X-Vault-Token", &vault_token)
|
||||||
.call()
|
.call()
|
||||||
.map_err(|e| anyhow!("Vault HTTP error: {}", e))?;
|
.map_err(|e| anyhow!("Vault HTTP error: {}", e))?;
|
||||||
|
|
||||||
|
|
@ -927,7 +929,7 @@ impl SecretsManager {
|
||||||
fn get_cached_sync(&self, path: &str) -> Option<HashMap<String, String>> {
|
fn get_cached_sync(&self, path: &str) -> Option<HashMap<String, String>> {
|
||||||
let cache = self.cache.read().ok()?;
|
let cache = self.cache.read().ok()?;
|
||||||
let entry = cache.get(path)?;
|
let entry = cache.get(path)?;
|
||||||
if entry.1.elapsed() < self.cache_ttl {
|
if entry.1.elapsed() < std::time::Duration::from_secs(self.cache_ttl) {
|
||||||
Some(entry.0.clone())
|
Some(entry.0.clone())
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue