From f7dc15cbf0d84b5dc9bf57aef85418fdf8a44559 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Mon, 31 Mar 2025 15:07:16 -0400 Subject: [PATCH] refactor(topology): remove unused HAClusterTopology import Remove the unnecessary `HAClusterTopology` import from multiple modules to clean up dependencies and reduce clutter. This change does not affect functionality as `HAClusterTopology` is no longer required in these files. --- harmony/src/domain/maestro/mod.rs | 2 +- harmony/src/modules/dhcp.rs | 3 +-- harmony/src/modules/dns.rs | 2 +- harmony/src/modules/dummy.rs | 2 +- harmony/src/modules/http.rs | 2 +- harmony/src/modules/k8s/resource.rs | 2 +- harmony/src/modules/lamp.rs | 2 +- harmony/src/modules/load_balancer.rs | 2 +- harmony/src/modules/okd/upgrade.rs | 2 +- harmony/src/modules/opnsense/shell.rs | 2 +- harmony/src/modules/tftp.rs | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/harmony/src/domain/maestro/mod.rs b/harmony/src/domain/maestro/mod.rs index ea4ff26..8bb369b 100644 --- a/harmony/src/domain/maestro/mod.rs +++ b/harmony/src/domain/maestro/mod.rs @@ -9,7 +9,7 @@ use super::{ topology::Topology, }; -type ScoreVec = Vec>>; +type ScoreVec = Vec>>; pub struct Maestro { inventory: Inventory, diff --git a/harmony/src/modules/dhcp.rs b/harmony/src/modules/dhcp.rs index bd332c1..e145e03 100644 --- a/harmony/src/modules/dhcp.rs +++ b/harmony/src/modules/dhcp.rs @@ -1,4 +1,3 @@ -use std::sync::Arc; use async_trait::async_trait; use derive_new::new; @@ -8,7 +7,7 @@ use crate::{ domain::{data::Version, interpret::InterpretStatus}, interpret::{Interpret, InterpretError, InterpretName, Outcome}, inventory::Inventory, - topology::{DHCPStaticEntry, DhcpServer, HAClusterTopology, HostBinding, IpAddress, Topology}, + topology::{DHCPStaticEntry, DhcpServer, HostBinding, IpAddress, Topology}, }; use crate::domain::score::Score; diff --git a/harmony/src/modules/dns.rs b/harmony/src/modules/dns.rs index 1002a35..ab4e3ec 100644 --- a/harmony/src/modules/dns.rs +++ b/harmony/src/modules/dns.rs @@ -7,7 +7,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{DnsRecord, DnsServer, HAClusterTopology, Topology}, + topology::{DnsRecord, DnsServer, Topology}, }; #[derive(Debug, new, Clone)] diff --git a/harmony/src/modules/dummy.rs b/harmony/src/modules/dummy.rs index 99e2f12..e9bd540 100644 --- a/harmony/src/modules/dummy.rs +++ b/harmony/src/modules/dummy.rs @@ -5,7 +5,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, Topology}, + topology::Topology, }; /// Score that always errors. This is only useful for development/testing purposes. It does nothing diff --git a/harmony/src/modules/http.rs b/harmony/src/modules/http.rs index 1d6df51..419bd89 100644 --- a/harmony/src/modules/http.rs +++ b/harmony/src/modules/http.rs @@ -6,7 +6,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, HttpServer, Topology, Url}, + topology::{HttpServer, Topology, Url}, }; #[derive(Debug, new, Clone)] diff --git a/harmony/src/modules/k8s/resource.rs b/harmony/src/modules/k8s/resource.rs index 878da22..e33cd7a 100644 --- a/harmony/src/modules/k8s/resource.rs +++ b/harmony/src/modules/k8s/resource.rs @@ -8,7 +8,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, OcK8sclient, Topology}, + topology::{OcK8sclient, Topology}, }; #[derive(Debug, Clone)] diff --git a/harmony/src/modules/lamp.rs b/harmony/src/modules/lamp.rs index d7cd495..90f36da 100644 --- a/harmony/src/modules/lamp.rs +++ b/harmony/src/modules/lamp.rs @@ -8,7 +8,7 @@ use crate::{ inventory::Inventory, modules::k8s::deployment::K8sDeploymentScore, score::Score, - topology::{HAClusterTopology, OcK8sclient, Topology, Url}, + topology::{OcK8sclient, Topology, Url}, }; #[derive(Debug, Clone)] diff --git a/harmony/src/modules/load_balancer.rs b/harmony/src/modules/load_balancer.rs index 5358e84..f590fa1 100644 --- a/harmony/src/modules/load_balancer.rs +++ b/harmony/src/modules/load_balancer.rs @@ -6,7 +6,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, LoadBalancer, LoadBalancerService, Topology}, + topology::{LoadBalancer, LoadBalancerService, Topology}, }; #[derive(Debug, Clone)] diff --git a/harmony/src/modules/okd/upgrade.rs b/harmony/src/modules/okd/upgrade.rs index a4fc6b1..a215c00 100644 --- a/harmony/src/modules/okd/upgrade.rs +++ b/harmony/src/modules/okd/upgrade.rs @@ -1,4 +1,4 @@ -use crate::{data::Version, score::Score}; +use crate::data::Version; #[derive(Debug, Clone)] pub struct OKDUpgradeScore { diff --git a/harmony/src/modules/opnsense/shell.rs b/harmony/src/modules/opnsense/shell.rs index f4cecad..225e2ad 100644 --- a/harmony/src/modules/opnsense/shell.rs +++ b/harmony/src/modules/opnsense/shell.rs @@ -8,7 +8,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, Topology}, + topology::Topology, }; #[derive(Debug, Clone)] diff --git a/harmony/src/modules/tftp.rs b/harmony/src/modules/tftp.rs index 504459a..3e90fc0 100644 --- a/harmony/src/modules/tftp.rs +++ b/harmony/src/modules/tftp.rs @@ -6,7 +6,7 @@ use crate::{ interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, inventory::Inventory, score::Score, - topology::{HAClusterTopology, Router, TftpServer, Topology, Url}, + topology::{Router, TftpServer, Topology, Url}, }; #[derive(Debug, new, Clone)]