Skip to content

Commit b31b504

Browse files
committed
refactor: remove redundant LXD instance name module
Remove src/infrastructure/adapters/lxd/instance/name.rs that was only re-exporting the domain InstanceName type. Update all imports to use the original InstanceName from the domain layer directly. This eliminates unnecessary abstraction and improves code clarity by using domain types consistently throughout the codebase.
1 parent 2264619 commit b31b504

File tree

7 files changed

+10
-22
lines changed

7 files changed

+10
-22
lines changed

src/application/commands/provision.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ use crate::application::steps::{
2424
WaitForSSHConnectivityStep,
2525
};
2626
#[allow(unused_imports)]
27-
use crate::domain::ProfileName;
27+
use crate::domain::{InstanceName, ProfileName};
2828
use crate::infrastructure::adapters::ansible::AnsibleClient;
29-
#[allow(unused_imports)]
30-
use crate::infrastructure::adapters::lxd::InstanceName;
3129
use crate::infrastructure::adapters::opentofu::client::{InstanceInfo, OpenTofuError};
3230
use crate::infrastructure::ansible::AnsibleTemplateRenderer;
3331
use crate::infrastructure::tofu::{ProvisionTemplateError, TofuTemplateRenderer};

src/infrastructure/adapters/lxd/instance/info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
use std::net::IpAddr;
1717

18-
use super::name::InstanceName;
18+
use crate::domain::InstanceName;
1919

2020
/// Instance information from LXD
2121
#[derive(Debug, Clone, PartialEq)]
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
//! LXD instance data types and utilities
22
//!
33
//! This module provides data types and utilities for working with LXD instances
4-
//! (containers and virtual machines), including instance information and naming.
4+
//! (containers and virtual machines), including instance information.
55
//!
66
//! ## Components
77
//!
88
//! - `info` - Instance information structures containing runtime data
9-
//! - `name` - Instance naming utilities and validation
9+
//!
10+
//! Instance naming utilities are provided by the domain layer's `InstanceName` type.
1011
//!
1112
//! These types are used throughout the LXD integration to represent and
1213
//! manipulate instance data in a type-safe manner.
1314
1415
pub mod info;
15-
pub mod name;
1616

1717
pub use info::InstanceInfo;
18-
pub use name::InstanceName;
18+
// Re-export InstanceName from domain layer for convenience
19+
pub use crate::domain::InstanceName;

src/infrastructure/adapters/lxd/instance/name.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/infrastructure/template/wrappers/tofu/lxd/variables/context.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
use serde::Serialize;
2828
use thiserror::Error;
2929

30-
use crate::domain::ProfileName;
31-
#[allow(unused_imports)]
32-
use crate::infrastructure::adapters::lxd::instance::InstanceName;
30+
use crate::domain::{InstanceName, ProfileName};
3331

3432
/// Errors that can occur when building the variables context
3533
#[derive(Error, Debug)]

src/infrastructure/template/wrappers/tofu/lxd/variables/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl VariablesTemplate {
109109
#[cfg(test)]
110110
mod tests {
111111
use super::*;
112-
use crate::infrastructure::adapters::lxd::instance::InstanceName;
112+
use crate::domain::InstanceName;
113113
use tempfile::NamedTempFile;
114114

115115
fn create_test_context() -> VariablesContext {

src/infrastructure/tofu/template/renderer/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ use std::sync::Arc;
4545
use thiserror::Error;
4646

4747
use crate::domain::template::{TemplateManager, TemplateManagerError};
48-
use crate::domain::ProfileName;
49-
#[allow(unused_imports)]
50-
use crate::infrastructure::adapters::lxd::instance::InstanceName;
48+
use crate::domain::{InstanceName, ProfileName};
5149
use crate::infrastructure::template::wrappers::tofu::lxd::variables::{
5250
VariablesContextBuilder, VariablesTemplate, VariablesTemplateError,
5351
};

0 commit comments

Comments
 (0)