From 2229e9d7afb74f216452af884ff4b13c201c33d3 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Fri, 18 Apr 2025 23:36:39 -0400 Subject: [PATCH] chore: Cargo fmt --- harmony/src/domain/topology/ha_cluster.rs | 6 ++++-- harmony/src/domain/topology/k8s_anywhere.rs | 6 +++++- harmony/src/domain/topology/localhost.rs | 4 +++- harmony/src/domain/topology/mod.rs | 4 ++-- harmony/src/modules/k3d/mod.rs | 1 - harmony/src/modules/mod.rs | 2 +- k3d/src/downloadable_asset.rs | 16 +++++++++------- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/harmony/src/domain/topology/ha_cluster.rs b/harmony/src/domain/topology/ha_cluster.rs index d2af961..a9bde4c 100644 --- a/harmony/src/domain/topology/ha_cluster.rs +++ b/harmony/src/domain/topology/ha_cluster.rs @@ -14,10 +14,10 @@ use super::DnsServer; use super::Firewall; use super::HttpServer; use super::IpAddress; +use super::K8sclient; use super::LoadBalancer; use super::LoadBalancerService; use super::LogicalHost; -use super::K8sclient; use super::Router; use super::TftpServer; @@ -48,7 +48,9 @@ impl Topology for HAClusterTopology { todo!() } async fn ensure_ready(&self) -> Result { - todo!("ensure_ready, not entirely sure what it should do here, probably something like verify that the hosts are reachable and all services are up and ready.") + todo!( + "ensure_ready, not entirely sure what it should do here, probably something like verify that the hosts are reachable and all services are up and ready." + ) } } diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index f91d88b..9eb4837 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -5,7 +5,11 @@ use log::{info, warn}; use tokio::sync::OnceCell; use crate::{ - interpret::{InterpretError, Outcome}, inventory::Inventory, maestro::Maestro, modules::k3d::K3DInstallationScore, topology::LocalhostTopology + interpret::{InterpretError, Outcome}, + inventory::Inventory, + maestro::Maestro, + modules::k3d::K3DInstallationScore, + topology::LocalhostTopology, }; use super::{Topology, k8s::K8sClient}; diff --git a/harmony/src/domain/topology/localhost.rs b/harmony/src/domain/topology/localhost.rs index 19804e8..dfa1c0b 100644 --- a/harmony/src/domain/topology/localhost.rs +++ b/harmony/src/domain/topology/localhost.rs @@ -15,6 +15,8 @@ impl Topology for LocalhostTopology { } async fn ensure_ready(&self) -> Result { - Ok(Outcome::success("Localhost is Chuck Norris, always ready.".to_string())) + Ok(Outcome::success( + "Localhost is Chuck Norris, always ready.".to_string(), + )) } } diff --git a/harmony/src/domain/topology/mod.rs b/harmony/src/domain/topology/mod.rs index b3e3779..e792227 100644 --- a/harmony/src/domain/topology/mod.rs +++ b/harmony/src/domain/topology/mod.rs @@ -3,10 +3,10 @@ mod host_binding; mod http; mod k8s_anywhere; mod localhost; -pub use localhost::*; pub use k8s_anywhere::*; -mod load_balancer; +pub use localhost::*; pub mod k8s; +mod load_balancer; mod router; mod tftp; use async_trait::async_trait; diff --git a/harmony/src/modules/k3d/mod.rs b/harmony/src/modules/k3d/mod.rs index 2d243c0..0dcdd5e 100644 --- a/harmony/src/modules/k3d/mod.rs +++ b/harmony/src/modules/k3d/mod.rs @@ -1,3 +1,2 @@ mod install; pub use install::*; - diff --git a/harmony/src/modules/mod.rs b/harmony/src/modules/mod.rs index 9baa98a..19d88d7 100644 --- a/harmony/src/modules/mod.rs +++ b/harmony/src/modules/mod.rs @@ -2,10 +2,10 @@ pub mod dhcp; pub mod dns; pub mod dummy; pub mod http; +pub mod k3d; pub mod k8s; pub mod lamp; pub mod load_balancer; pub mod okd; pub mod opnsense; pub mod tftp; -pub mod k3d; diff --git a/k3d/src/downloadable_asset.rs b/k3d/src/downloadable_asset.rs index cdf9bf2..53de329 100644 --- a/k3d/src/downloadable_asset.rs +++ b/k3d/src/downloadable_asset.rs @@ -142,20 +142,20 @@ mod tests { TEST_SERVER.get_or_init(|| { let listener = TcpListener::bind(format!("127.0.0.1:{}", TEST_SERVER_PORT)).unwrap(); - + thread::spawn(move || { for stream in listener.incoming() { thread::spawn(move || { let mut stream = stream.expect("Stream opened correctly"); let mut buffer = [0; 1024]; let _ = stream.read(&mut buffer); - + let response = format!( "HTTP/1.1 200 OK\r\nContent-Type: application/octet-stream\r\nContent-Length: {}\r\n\r\n{}", TEST_CONTENT.len(), TEST_CONTENT ); - + stream.write_all(response.as_bytes()).expect("Can write to stream"); stream.flush().expect("Can flush stream"); }); @@ -203,7 +203,7 @@ mod tests { let folder = PathBuf::from(&test.download_path); let result = asset.download_to_path(folder).await.unwrap(); - + let downloaded_content = std::fs::read_to_string(result).unwrap(); assert_eq!(downloaded_content, TEST_CONTENT); } @@ -212,7 +212,7 @@ mod tests { async fn test_download_to_path_already_exists() { let test = setup_test(); let folder = PathBuf::from(&test.download_path); - + let asset = DownloadableAsset { url: Url::parse(&format!("http://{}/test.txt", test.domain)).unwrap(), file_name: "test.txt".to_string(), @@ -230,14 +230,16 @@ mod tests { #[tokio::test] async fn test_download_to_path_failure() { let test = setup_test(); - + let asset = DownloadableAsset { url: Url::parse("http://127.0.0.1:9999/test.txt").unwrap(), file_name: "test.txt".to_string(), checksum: "some_checksum".to_string(), }; - let result = asset.download_to_path(PathBuf::from(&test.download_path)).await; + let result = asset + .download_to_path(PathBuf::from(&test.download_path)) + .await; assert!(result.is_err()); } }