From 0d582f2fdaa98123b5b8a7fede526bb34a4d787e Mon Sep 17 00:00:00 2001 From: Echo Date: Mon, 18 May 2026 02:06:25 +0000 Subject: [PATCH] style: apply cargo fmt formatting --- src/enroll/identity.rs | 21 ++++++++++++--------- src/enroll/mod.rs | 5 ++++- tests/e2e/test_enrollment_e2e.rs | 6 +----- tests/integration/enrollment_test.rs | 6 +----- tests/unit/enroll_identity.rs | 26 +++++++++++++++----------- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/enroll/identity.rs b/src/enroll/identity.rs index 96f4651..7e75152 100644 --- a/src/enroll/identity.rs +++ b/src/enroll/identity.rs @@ -165,10 +165,7 @@ pub fn get_primary_ip(report_interface: Option<&str>, report_ip: Option<&str>) - // Validate it parses as IPv4 if let Ok(addr) = ip.parse::() { if !addr.is_loopback() { - tracing::info!( - ip = ip, - "Using explicitly configured report_ip" - ); + tracing::info!(ip = ip, "Using explicitly configured report_ip"); return Ok(ip.to_string()); } tracing::warn!( @@ -375,7 +372,10 @@ mod tests { Ok(ip) => { assert!(!ip.is_empty(), "Primary IP should not be empty"); let parsed: Ipv4Addr = ip.parse().expect("Primary IP should be valid IPv4"); - assert!(!is_container_bridge(&parsed), "Auto-detected IP should not be Docker bridge"); + assert!( + !is_container_bridge(&parsed), + "Auto-detected IP should not be Docker bridge" + ); } Err(_) => { eprintln!("NOTE: No routable IPs found — likely running inside a Docker container"); @@ -386,8 +386,7 @@ mod tests { #[test] fn test_get_primary_ip_explicit_override() { // Explicit IP should be returned as-is - let ip = get_primary_ip(None, Some("10.99.99.1")) - .expect("Failed with explicit IP"); + let ip = get_primary_ip(None, Some("10.99.99.1")).expect("Failed with explicit IP"); assert_eq!(ip, "10.99.99.1"); } @@ -398,7 +397,9 @@ mod tests { match get_primary_ip(None, Some("127.0.0.1")) { Ok(ip) => assert_ne!(ip, "127.0.0.1"), Err(_) => { - eprintln!("NOTE: Loopback rejected but no routable IPs for fallback — Docker container"); + eprintln!( + "NOTE: Loopback rejected but no routable IPs for fallback — Docker container" + ); } } } @@ -410,7 +411,9 @@ mod tests { match get_primary_ip(None, Some("not-an-ip")) { Ok(ip) => assert!(!ip.is_empty()), Err(_) => { - eprintln!("NOTE: Invalid IP rejected but no routable IPs for fallback — Docker container"); + eprintln!( + "NOTE: Invalid IP rejected but no routable IPs for fallback — Docker container" + ); } } } diff --git a/src/enroll/mod.rs b/src/enroll/mod.rs index fe5122a..8e32f1a 100644 --- a/src/enroll/mod.rs +++ b/src/enroll/mod.rs @@ -15,7 +15,10 @@ pub use client::{ EnrollmentClient, EnrollmentRequest, EnrollmentResponse, EnrollmentStatusResponse, PkiBundle, }; /// Re-export identity extraction functions. -pub use identity::{get_fqdn, get_ip_addresses, get_ip_for_interface, get_machine_id, get_os_details, get_primary_ip, is_container_bridge, is_link_local}; +pub use identity::{ + get_fqdn, get_ip_addresses, get_ip_for_interface, get_machine_id, get_os_details, + get_primary_ip, is_container_bridge, is_link_local, +}; /// Run the full enrollment flow against the manager at the given URL. /// diff --git a/tests/e2e/test_enrollment_e2e.rs b/tests/e2e/test_enrollment_e2e.rs index 6239036..f9d8603 100644 --- a/tests/e2e/test_enrollment_e2e.rs +++ b/tests/e2e/test_enrollment_e2e.rs @@ -85,11 +85,7 @@ fn build_tls_config(cert_dir: &std::path::Path) -> TlsConfig { /// Uses a test report_ip so enrollment works inside Docker containers /// where the only IPs are in the 172.16.0.0/12 bridge range (filtered). fn build_client(base_url: &str) -> EnrollmentClient { - EnrollmentClient::with_ip_overrides( - base_url, - None, - Some("192.168.1.10".to_string()), - ) + EnrollmentClient::with_ip_overrides(base_url, None, Some("192.168.1.10".to_string())) } // ============================================================================= diff --git a/tests/integration/enrollment_test.rs b/tests/integration/enrollment_test.rs index 32e0d84..1306986 100644 --- a/tests/integration/enrollment_test.rs +++ b/tests/integration/enrollment_test.rs @@ -36,11 +36,7 @@ async fn create_mock_manager() -> (MockServer, String) { /// Uses a test report_ip so enrollment works inside Docker containers /// where the only IPs are in the 172.16.0.0/12 bridge range (filtered). fn build_client(base_url: &str) -> EnrollmentClient { - EnrollmentClient::with_ip_overrides( - base_url, - None, - Some("192.168.1.10".to_string()), - ) + EnrollmentClient::with_ip_overrides(base_url, None, Some("192.168.1.10".to_string())) } // ============================================================================= diff --git a/tests/unit/enroll_identity.rs b/tests/unit/enroll_identity.rs index a156380..dbd83ed 100644 --- a/tests/unit/enroll_identity.rs +++ b/tests/unit/enroll_identity.rs @@ -4,8 +4,8 @@ //! Verifies machine-id, FQDN, IP address collection, and OS detail parsing. use linux_patch_api::enroll::identity::{ - get_fqdn, get_ip_addresses, get_machine_id, get_os_details, - get_primary_ip, is_container_bridge, is_link_local, + get_fqdn, get_ip_addresses, get_machine_id, get_os_details, get_primary_ip, + is_container_bridge, is_link_local, }; use linux_patch_api::enroll::EnrollmentRequest; use serde_json::Value; @@ -367,7 +367,10 @@ fn test_enrollment_payload_construction() { let os_details = get_os_details().expect("Failed to get OS details"); // In Docker containers, all IPs may be in 172.16.0.0/12 (filtered), so use fallback - let primary_ip = ip_addrs.first().cloned().unwrap_or_else(|| "127.0.0.1".to_string()); + let primary_ip = ip_addrs + .first() + .cloned() + .unwrap_or_else(|| "127.0.0.1".to_string()); let request = EnrollmentRequest { machine_id, @@ -559,8 +562,7 @@ fn test_is_not_link_local() { fn test_get_ip_addresses_excludes_docker_bridge() { let addrs = get_ip_addresses().expect("Failed to get IP addresses"); for addr in &addrs { - let parsed: std::net::Ipv4Addr = - addr.parse().expect("Should parse as IPv4"); + let parsed: std::net::Ipv4Addr = addr.parse().expect("Should parse as IPv4"); assert!( !is_container_bridge(&parsed), "IP '{}' is in Docker bridge range 172.16.0.0/12 — should be excluded", @@ -573,8 +575,7 @@ fn test_get_ip_addresses_excludes_docker_bridge() { fn test_get_ip_addresses_excludes_link_local() { let addrs = get_ip_addresses().expect("Failed to get IP addresses"); for addr in &addrs { - let parsed: std::net::Ipv4Addr = - addr.parse().expect("Should parse as IPv4"); + let parsed: std::net::Ipv4Addr = addr.parse().expect("Should parse as IPv4"); assert!( !is_link_local(&parsed), "IP '{}' is link-local 169.254.0.0/16 — should be excluded", @@ -603,8 +604,7 @@ fn test_get_primary_ip_auto_detect_no_bridge() { #[test] fn test_get_primary_ip_explicit_override() { - let ip = get_primary_ip(None, Some("10.99.99.1")) - .expect("Failed with explicit IP"); + let ip = get_primary_ip(None, Some("10.99.99.1")).expect("Failed with explicit IP"); assert_eq!(ip, "10.99.99.1"); } @@ -614,7 +614,9 @@ fn test_get_primary_ip_rejects_loopback_override() { match get_primary_ip(None, Some("127.0.0.1")) { Ok(ip) => assert_ne!(ip, "127.0.0.1"), Err(_) => { - eprintln!("NOTE: Loopback rejected but no routable IPs for fallback — Docker container"); + eprintln!( + "NOTE: Loopback rejected but no routable IPs for fallback — Docker container" + ); } } } @@ -625,7 +627,9 @@ fn test_get_primary_ip_invalid_override_falls_back() { match get_primary_ip(None, Some("not-an-ip")) { Ok(ip) => assert!(!ip.is_empty()), Err(_) => { - eprintln!("NOTE: Invalid IP rejected but no routable IPs for fallback — Docker container"); + eprintln!( + "NOTE: Invalid IP rejected but no routable IPs for fallback — Docker container" + ); } } }