feat: add http timeouts/retries, config search, and integration tests

Author: Jonathan D.A. Jewell

crates/opm-cli/Cargo.toml

@@ -15,3 +15,5 @@ reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
 
 [dev-dependencies]
 assert_cmd = "2"
+mockito = "1"
+tempfile = "3"

crates/opm-cli/src/clients/checky_monkey.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::clients::http;
 
-pub fn analyze(path: &str, base_url: &str, token: Option<&str>) -> Result<()> {
+pub fn analyze(path: &str, base_url: &str, token: Option<&str>, opts: &http::HttpOptions) -> Result<()> {
     let body = format!("{\"path\":\"{path}\"}");
-    http::post_json(base_url, "/analyze", token, &body)
+    http::post_json(base_url, "/analyze", token, &body, opts)
 }

crates/opm-cli/src/clients/cicd_hyper_a.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::clients::http;
 
-pub fn publish(path: &str, base_url: &str, token: Option<&str>) -> Result<()> {
+pub fn publish(path: &str, base_url: &str, token: Option<&str>, opts: &http::HttpOptions) -> Result<()> {
     let body = format!("{\"path\":\"{path}\"}");
-    http::post_json(base_url, "/publish", token, &body)
+    http::post_json(base_url, "/publish", token, &body, opts)
 }

crates/opm-cli/src/clients/claim_forge.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::clients::http;
 
-pub fn attest(path: &str, base_url: &str, token: Option<&str>) -> Result<()> {
-    let body = format!("{{\"path\":\"{path}\"}}");
-    http::post_json(base_url, "/attest", token, &body)
+pub fn attest(path: &str, base_url: &str, token: Option<&str>, opts: &http::HttpOptions) -> Result<()> {
+    let body = format!("{\"path\":\"{path}\"}");
+    http::post_json(base_url, "/attest", token, &body, opts)
 }

crates/opm-cli/src/clients/http.rs

@@ -3,9 +3,20 @@
 use anyhow::{Context, Result};
 use reqwest::blocking::Client;
 use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION, CONTENT_TYPE};
+use std::time::Duration;
 
-pub fn post_json(base: &str, path: &str, token: Option<&str>, body: &str) -> Result<()> {
-    let client = Client::new();
+#[derive(Debug, Clone)]
+pub struct HttpOptions {
+    pub timeout_ms: u64,
+    pub retries: u32,
+    pub backoff_ms: u64,
+}
+
+pub fn post_json(base: &str, path: &str, token: Option<&str>, body: &str, opts: &HttpOptions) -> Result<()> {
+    let client = Client::builder()
+        .timeout(Duration::from_millis(opts.timeout_ms))
+        .build()
+        .context("http client")?;
     let mut headers = HeaderMap::new();
     headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
 
@@ -15,16 +26,29 @@ pub fn post_json(base: &str, path: &str, token: Option<&str>, body: &str) -> Res
     }
 
     let url = format!("{}{}", base.trim_end_matches('/'), path);
-    let resp = client
-        .post(url)
-        .headers(headers)
-        .body(body.to_string())
-        .send()
-        .context("opm http post")?;
+    let attempts = opts.retries.saturating_add(1);
+    for attempt in 0..attempts {
+        let resp = client
+            .post(url.clone())
+            .headers(headers.clone())
+            .body(body.to_string())
+            .send();
 
-    if !resp.status().is_success() {
-        return Err(anyhow::anyhow!("http error: {}", resp.status()));
-    }
+        match resp {
+            Ok(resp) if resp.status().is_success() => return Ok(()),
+            Ok(resp) => {
+                if attempt + 1 == attempts {
+                    return Err(anyhow::anyhow!("http error: {}", resp.status()));
+                }
+            }
+            Err(err) => {
+                if attempt + 1 == attempts {
+                    return Err(anyhow::anyhow!("http error: {err}"));
+                }
+            }
+        }
 
+        std::thread::sleep(Duration::from_millis(opts.backoff_ms * (attempt as u64 + 1)));
+    }
     Ok(())
 }

crates/opm-cli/src/clients/oikos.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::clients::http;
 
-pub fn score(package: &str, base_url: &str, token: Option<&str>) -> Result<()> {
+pub fn score(package: &str, base_url: &str, token: Option<&str>, opts: &http::HttpOptions) -> Result<()> {
     let body = format!("{\"package\":\"{package}\"}");
-    http::post_json(base_url, "/score", token, &body)
+    http::post_json(base_url, "/score", token, &body, opts)
 }

crates/opm-cli/src/clients/palimpsest_license.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::clients::http;
 
-pub fn audit(path: &str, base_url: &str, token: Option<&str>) -> Result<()> {
+pub fn audit(path: &str, base_url: &str, token: Option<&str>, opts: &http::HttpOptions) -> Result<()> {
     let body = format!("{\"path\":\"{path}\"}");
-    http::post_json(base_url, "/audit", token, &body)
+    http::post_json(base_url, "/audit", token, &body, opts)
 }

crates/opm-cli/src/config.rs

@@ -4,6 +4,24 @@ use serde::Deserialize;
 use std::fs;
 use std::path::Path;
 
+#[derive(Debug, Deserialize, Clone)]
+#[serde(default)]
+pub struct HttpConfig {
+    pub timeout_ms: u64,
+    pub retries: u32,
+    pub backoff_ms: u64,
+}
+
+impl Default for HttpConfig {
+    fn default() -> Self {
+        Self {
+            timeout_ms: 3000,
+            retries: 2,
+            backoff_ms: 200,
+        }
+    }
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct ServiceConfig {
     pub base_url: String,
@@ -12,6 +30,8 @@ pub struct ServiceConfig {
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct OpmConfig {
+    #[serde(default)]
+    pub http: HttpConfig,
     pub claim_forge: ServiceConfig,
     pub checky_monkey: ServiceConfig,
     pub palimpsest_license: ServiceConfig,
@@ -22,6 +42,7 @@ pub struct OpmConfig {
 impl OpmConfig {
     pub fn example() -> Self {
         Self {
+            http: HttpConfig::default(),
             claim_forge: ServiceConfig {
                 base_url: "http://127.0.0.1:7001".to_string(),
                 token: None,
@@ -50,4 +71,24 @@ impl OpmConfig {
         let cfg = toml::from_str(&data)?;
         Ok(cfg)
     }
+
+    pub fn load() -> anyhow::Result<Self> {
+        if let Ok(path) = std::env::var("OPM_CONFIG") {
+            return Self::load_from(path);
+        }
+
+        let local = Path::new("opm.toml");
+        if local.exists() {
+            return Self::load_from(local);
+        }
+
+        if let Ok(home) = std::env::var("HOME") {
+            let path = Path::new(&home).join(".config/opm/opm.toml");
+            if path.exists() {
+                return Self::load_from(path);
+            }
+        }
+
+        Err(anyhow::anyhow!("opm config not found"))
+    }
 }

crates/opm-cli/src/wiring.rs

@@ -7,20 +7,30 @@ use crate::config::OpmConfig;
 
 pub fn publish(path: &str) -> Result<()> {
     println!("opm publish (stub) for {path}");
-    let cfg = OpmConfig::load_from("opm.toml").unwrap_or_else(|_| OpmConfig::example());
-    clients::claim_forge::attest(path, &cfg.claim_forge.base_url, cfg.claim_forge.token.as_deref())?;
-    clients::checky_monkey::analyze(path, &cfg.checky_monkey.base_url, cfg.checky_monkey.token.as_deref())?;
-    clients::palimpsest_license::audit(path, &cfg.palimpsest_license.base_url, cfg.palimpsest_license.token.as_deref())?;
-    clients::cicd_hyper_a::publish(path, &cfg.cicd_hyper_a.base_url, cfg.cicd_hyper_a.token.as_deref())?;
+    let cfg = OpmConfig::load().unwrap_or_else(|_| OpmConfig::example());
+    let opts = clients::http::HttpOptions {
+        timeout_ms: cfg.http.timeout_ms,
+        retries: cfg.http.retries,
+        backoff_ms: cfg.http.backoff_ms,
+    };
+    clients::claim_forge::attest(path, &cfg.claim_forge.base_url, cfg.claim_forge.token.as_deref(), &opts)?;
+    clients::checky_monkey::analyze(path, &cfg.checky_monkey.base_url, cfg.checky_monkey.token.as_deref(), &opts)?;
+    clients::palimpsest_license::audit(path, &cfg.palimpsest_license.base_url, cfg.palimpsest_license.token.as_deref(), &opts)?;
+    clients::cicd_hyper_a::publish(path, &cfg.cicd_hyper_a.base_url, cfg.cicd_hyper_a.token.as_deref(), &opts)?;
     Ok(())
 }
 
 pub fn audit(package: &str) -> Result<()> {
     println!("opm audit (stub) for {package}");
-    let cfg = OpmConfig::load_from("opm.toml").unwrap_or_else(|_| OpmConfig::example());
-    clients::claim_forge::attest(package, &cfg.claim_forge.base_url, cfg.claim_forge.token.as_deref())?;
-    clients::checky_monkey::analyze(package, &cfg.checky_monkey.base_url, cfg.checky_monkey.token.as_deref())?;
-    clients::oikos::score(package, &cfg.oikos.base_url, cfg.oikos.token.as_deref())?;
+    let cfg = OpmConfig::load().unwrap_or_else(|_| OpmConfig::example());
+    let opts = clients::http::HttpOptions {
+        timeout_ms: cfg.http.timeout_ms,
+        retries: cfg.http.retries,
+        backoff_ms: cfg.http.backoff_ms,
+    };
+    clients::claim_forge::attest(package, &cfg.claim_forge.base_url, cfg.claim_forge.token.as_deref(), &opts)?;
+    clients::checky_monkey::analyze(package, &cfg.checky_monkey.base_url, cfg.checky_monkey.token.as_deref(), &opts)?;
+    clients::oikos::score(package, &cfg.oikos.base_url, cfg.oikos.token.as_deref(), &opts)?;
     Ok(())
 }
 

crates/opm-cli/tests/audit_flow.rs

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: PMPL-1.0
+
+use assert_cmd::Command;
+use mockito::Server;
+use std::io::Write;
+use tempfile::NamedTempFile;
+
+#[test]
+fn audit_hits_pipeline_endpoints() {
+    let mut server = Server::new();
+
+    let _attest = server.mock("POST", "/attest").with_status(200).create();
+    let _analyze = server.mock("POST", "/analyze").with_status(200).create();
+    let _score = server.mock("POST", "/score").with_status(200).create();
+
+    let mut file = NamedTempFile::new().expect("tmp config");
+    let cfg = format!(
+        "[http]\nretries = 0\n\n[claim_forge]\nbase_url = \"{}\"\n\n[checky_monkey]\nbase_url = \"{}\"\n\n[palimpsest_license]\nbase_url = \"{}\"\n\n[cicd_hyper_a]\nbase_url = \"{}\"\n\n[oikos]\nbase_url = \"{}\"\n",
+        server.url(),
+        server.url(),
+        server.url(),
+        server.url(),
+        server.url()
+    );
+    file.write_all(cfg.as_bytes()).expect("write config");
+
+    let mut cmd = Command::cargo_bin("opm").expect("binary builds");
+    cmd.env("OPM_CONFIG", file.path());
+    cmd.arg("audit").arg("example-lib");
+    cmd.assert().success();
+}