From 6c92dd24f790da66e710e11e6d148a136812aea6 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Sat, 23 Aug 2025 15:48:21 -0400 Subject: [PATCH] chore: cargo fmt --- examples/nanodc/src/main.rs | 4 +++- examples/okd_pxe/src/main.rs | 9 +++++++-- harmony/src/domain/data/mod.rs | 4 ++-- harmony/src/modules/http.rs | 7 ++++++- opnsense-config-xml/src/data/caddy.rs | 2 +- opnsense-config-xml/src/data/mod.rs | 2 +- opnsense-config/src/config/config.rs | 3 ++- opnsense-config/src/config/shell/ssh.rs | 6 +----- opnsense-config/src/modules/dnsmasq.rs | 10 ++++------ opnsense-config/src/modules/mod.rs | 4 ++-- 10 files changed, 29 insertions(+), 22 deletions(-) diff --git a/examples/nanodc/src/main.rs b/examples/nanodc/src/main.rs index d1cc726..10ba715 100644 --- a/examples/nanodc/src/main.rs +++ b/examples/nanodc/src/main.rs @@ -126,7 +126,9 @@ async fn main() { let tftp_score = TftpScore::new(Url::LocalFolder("./data/watchguard/tftpboot".to_string())); let http_score = StaticFilesHttpScore { - folder_to_serve: Some(Url::LocalFolder("./data/watchguard/pxe-http-files".to_string())), + folder_to_serve: Some(Url::LocalFolder( + "./data/watchguard/pxe-http-files".to_string(), + )), files: vec![], }; let ipxe_score = IpxeScore::new(); diff --git a/examples/okd_pxe/src/main.rs b/examples/okd_pxe/src/main.rs index f5cb6cb..7f0c09d 100644 --- a/examples/okd_pxe/src/main.rs +++ b/examples/okd_pxe/src/main.rs @@ -55,11 +55,16 @@ async fn main() { gateway_ip, harmony_inventory_agent, cluster_pubkey_filename, - }.to_string(), + } + .to_string(), }, FileContent { path: FilePath::Relative("fallback.ipxe".to_string()), - content: FallbackIpxeTpl { gateway_ip, kickstart_filename}.to_string(), + content: FallbackIpxeTpl { + gateway_ip, + kickstart_filename, + } + .to_string(), }, ], }), diff --git a/harmony/src/domain/data/mod.rs b/harmony/src/domain/data/mod.rs index 1529809..8d90a52 100644 --- a/harmony/src/domain/data/mod.rs +++ b/harmony/src/domain/data/mod.rs @@ -1,6 +1,6 @@ +mod file; mod id; mod version; -mod file; +pub use file::*; pub use id::*; pub use version::*; -pub use file::*; diff --git a/harmony/src/modules/http.rs b/harmony/src/modules/http.rs index 700d5a3..a04ea73 100644 --- a/harmony/src/modules/http.rs +++ b/harmony/src/modules/http.rs @@ -64,7 +64,12 @@ impl Interpret for StaticFilesHttpInterpret { Ok(Outcome::success(format!( "Http Server running and serving files from folder {:?} and content for {}", self.score.folder_to_serve, - self.score.files.iter().map(|f| f.path.to_string()).collect::>().join(",") + self.score + .files + .iter() + .map(|f| f.path.to_string()) + .collect::>() + .join(",") ))) } diff --git a/opnsense-config-xml/src/data/caddy.rs b/opnsense-config-xml/src/data/caddy.rs index 62b311c..80088b9 100644 --- a/opnsense-config-xml/src/data/caddy.rs +++ b/opnsense-config-xml/src/data/caddy.rs @@ -48,7 +48,7 @@ pub struct CaddyGeneral { #[yaserde(rename = "TlsDnsPropagationResolvers")] pub tls_dns_propagation_resolvers: MaybeString, #[yaserde(rename = "TlsDnsEchDomain")] - pub tls_dns_ech_domain: MaybeString, + pub tls_dns_ech_domain: Option, pub accesslist: MaybeString, #[yaserde(rename = "DisableSuperuser")] pub disable_superuser: Option, diff --git a/opnsense-config-xml/src/data/mod.rs b/opnsense-config-xml/src/data/mod.rs index 6bd3ccd..712f878 100644 --- a/opnsense-config-xml/src/data/mod.rs +++ b/opnsense-config-xml/src/data/mod.rs @@ -1,9 +1,9 @@ mod caddy; mod dhcpd; +pub mod dnsmasq; mod haproxy; mod interfaces; mod opnsense; -pub mod dnsmasq; pub use caddy::*; pub use dhcpd::*; pub use haproxy::*; diff --git a/opnsense-config/src/config/config.rs b/opnsense-config/src/config/config.rs index 96f9a40..a136a92 100644 --- a/opnsense-config/src/config/config.rs +++ b/opnsense-config/src/config/config.rs @@ -4,7 +4,8 @@ use crate::{ config::{SshConfigManager, SshCredentials, SshOPNSenseShell}, error::Error, modules::{ - caddy::CaddyConfig, dhcp_legacy::DhcpConfigLegacyISC, dns::DnsConfig, dnsmasq::DhcpConfigDnsMasq, load_balancer::LoadBalancerConfig, tftp::TftpConfig + caddy::CaddyConfig, dhcp_legacy::DhcpConfigLegacyISC, dns::DnsConfig, + dnsmasq::DhcpConfigDnsMasq, load_balancer::LoadBalancerConfig, tftp::TftpConfig, }, }; use log::{debug, info, trace, warn}; diff --git a/opnsense-config/src/config/shell/ssh.rs b/opnsense-config/src/config/shell/ssh.rs index 0b5ddea..95069fc 100644 --- a/opnsense-config/src/config/shell/ssh.rs +++ b/opnsense-config/src/config/shell/ssh.rs @@ -159,11 +159,7 @@ impl SshOPNSenseShell { wait_for_completion(&mut channel).await } - async fn ensure_remote_dir_exists( - &self, - sftp: &SftpSession, - path: &str, - ) -> Result<(), Error> { + async fn ensure_remote_dir_exists(&self, sftp: &SftpSession, path: &str) -> Result<(), Error> { if !sftp.try_exists(path).await? { info!("Creating remote directory {path}"); sftp.create_dir(path).await?; diff --git a/opnsense-config/src/modules/dnsmasq.rs b/opnsense-config/src/modules/dnsmasq.rs index 7efb493..fcd3486 100644 --- a/opnsense-config/src/modules/dnsmasq.rs +++ b/opnsense-config/src/modules/dnsmasq.rs @@ -187,12 +187,10 @@ dhcp-boot=tag:bios,{bios_filename}{tftp_str} })?; info!("Restarting dnsmasq to apply changes"); - self.opnsense_shell.exec("configctl dnsmasq restart").await - .map_err(|e| { - DhcpError::Configuration(format!( - "Restarting dnsmasq failed : {e}" - )) - })?; + self.opnsense_shell + .exec("configctl dnsmasq restart") + .await + .map_err(|e| DhcpError::Configuration(format!("Restarting dnsmasq failed : {e}")))?; Ok(()) } } diff --git a/opnsense-config/src/modules/mod.rs b/opnsense-config/src/modules/mod.rs index 307e481..3448075 100644 --- a/opnsense-config/src/modules/mod.rs +++ b/opnsense-config/src/modules/mod.rs @@ -1,7 +1,7 @@ pub mod caddy; +pub mod dhcp; pub mod dhcp_legacy; pub mod dns; +pub mod dnsmasq; pub mod load_balancer; pub mod tftp; -pub mod dhcp; -pub mod dnsmasq;