From f1d0a985e47eddb961d220c0e13b846a6fc32780 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Sun, 5 Apr 2026 00:48:13 -0300 Subject: [PATCH] fix: remove duplicate code block from secrets mod --- src/core/secrets/mod.rs | 55 ----------------------------------------- 1 file changed, 55 deletions(-) diff --git a/src/core/secrets/mod.rs b/src/core/secrets/mod.rs index 98eb5cf3..188e3485 100644 --- a/src/core/secrets/mod.rs +++ b/src/core/secrets/mod.rs @@ -942,61 +942,6 @@ impl SecretsManager { } } - // ============ TENANT-AWARE METHODS (org_id -> tenant -> secrets) ============ - if !self.enabled { - return Self::get_from_env(path); - } - - if let Some(cached) = self.get_cached_sync(path) { - return Ok(cached); - } - - let client = self - .client - .as_ref() - .ok_or_else(|| anyhow!("No Vault client"))?; - - let url = format!("{}/v1/secret/data/{}", self.addr, path); - let resp = ureq::get(&url) - .set("X-Vault-Token", &self.token) - .call() - .map_err(|e| anyhow!("Vault HTTP error: {}", e))?; - - let body: serde_json::Value = resp.into_json() - .map_err(|e| anyhow!("Vault JSON parse error: {}", e))?; - - if let Some(data) = body.get("data").and_then(|d| d.get("data")) { - if let Some(map) = data.as_object() { - let result: HashMap = map.iter() - .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string()))) - .collect(); - - self.cache_secret_sync(path, result.clone()); - return Ok(result); - } - } - - Self::get_from_env(path) - } - - fn get_cached_sync(&self, path: &str) -> Option> { - let cache = self.cache.read().ok()?; - let entry = cache.get(path)?; - if entry.1.elapsed() < self.cache_ttl { - Some(entry.0.clone()) - } else { - None - } - } - - fn cache_secret_sync(&self, path: &str, data: HashMap) { - if self.cache_ttl > 0 { - if let Ok(mut cache) = self.cache.write() { - cache.insert(path.to_string(), (data, std::time::Instant::now())); - } - } - } - // ============ TENANT-AWARE METHODS (org_id -> tenant -> secrets) ============ /// Get database config for an organization (resolves tenant from org, then gets infra)