refactor: move executor module from infrastructure to shared

josecelano · josecelano · commit 73a43d2e5a41 · 2025-09-24T16:54:55.000+01:00
diff --git a/src/application/commands/configure.rs b/src/application/commands/configure.rs
@@ -4,7 +4,7 @@ use tracing::{info, instrument};
 
 use crate::application::steps::{InstallDockerComposeStep, InstallDockerStep};
 use crate::infrastructure::adapters::ansible::AnsibleClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Comprehensive error type for the `ConfigureCommand`
 #[derive(Debug, thiserror::Error)]
diff --git a/src/application/commands/provision.rs b/src/application/commands/provision.rs
@@ -28,7 +28,7 @@ use crate::infrastructure::adapters::ansible::AnsibleClient;
 use crate::infrastructure::adapters::lxd::InstanceName;
 use crate::infrastructure::adapters::opentofu::client::{InstanceInfo, OpenTofuError};
 use crate::infrastructure::ansible::AnsibleTemplateRenderer;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 use crate::infrastructure::tofu::{ProvisionTemplateError, TofuTemplateRenderer};
 use crate::shared::ssh::{credentials::SshCredentials, SshError};
 
diff --git a/src/application/commands/test.rs b/src/application/commands/test.rs
@@ -20,7 +20,7 @@ use crate::application::steps::{
     ValidateDockerComposeInstallationStep,
     ValidateDockerInstallationStep,
 };
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 use crate::infrastructure::remote_actions::RemoteActionError;
 use crate::shared::ssh::credentials::SshCredentials;
 
diff --git a/src/application/steps/infrastructure/apply.rs b/src/application/steps/infrastructure/apply.rs
@@ -26,7 +26,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::opentofu::client::OpenTofuClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Simple step that applies `OpenTofu` configuration by executing `tofu apply`
 pub struct ApplyInfrastructureStep {
diff --git a/src/application/steps/infrastructure/initialize.rs b/src/application/steps/infrastructure/initialize.rs
@@ -26,7 +26,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::opentofu::client::OpenTofuClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Simple step that initializes `OpenTofu` configuration by executing `tofu init`
 pub struct InitializeInfrastructureStep {
diff --git a/src/application/steps/infrastructure/plan.rs b/src/application/steps/infrastructure/plan.rs
@@ -26,7 +26,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::opentofu::client::OpenTofuClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Simple step that plans `OpenTofu` configuration by executing `tofu plan`
 pub struct PlanInfrastructureStep {
diff --git a/src/application/steps/infrastructure/validate.rs b/src/application/steps/infrastructure/validate.rs
@@ -27,7 +27,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::opentofu::client::OpenTofuClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Simple step that validates `OpenTofu` configuration by executing `tofu validate`
 pub struct ValidateInfrastructureStep {
diff --git a/src/application/steps/software/docker.rs b/src/application/steps/software/docker.rs
@@ -23,7 +23,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::ansible::AnsibleClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Step that installs Docker on a remote host via Ansible
 pub struct InstallDockerStep {
diff --git a/src/application/steps/software/docker_compose.rs b/src/application/steps/software/docker_compose.rs
@@ -25,7 +25,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::ansible::AnsibleClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Step that installs Docker Compose on a remote host via Ansible
 pub struct InstallDockerComposeStep {
diff --git a/src/application/steps/system/wait_cloud_init.rs b/src/application/steps/system/wait_cloud_init.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use tracing::{info, instrument};
 
 use crate::infrastructure::adapters::ansible::AnsibleClient;
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Step that waits for cloud-init completion on a remote host
 pub struct WaitForCloudInitStep {
diff --git a/src/infrastructure/adapters/ansible.rs b/src/infrastructure/adapters/ansible.rs
@@ -17,7 +17,7 @@ use std::path::{Path, PathBuf};
 
 use tracing::info;
 
-use crate::infrastructure::executor::{CommandError, CommandExecutor};
+use crate::shared::executor::{CommandError, CommandExecutor};
 
 /// A specialized `Ansible` client for configuration management.
 /// This client provides a consistent interface for `Ansible` operations:
diff --git a/src/infrastructure/adapters/lxd/client.rs b/src/infrastructure/adapters/lxd/client.rs
@@ -19,7 +19,7 @@ use std::net::IpAddr;
 use anyhow::{Context, Result};
 use tracing::info;
 
-use crate::infrastructure::executor::CommandExecutor;
+use crate::shared::executor::CommandExecutor;
 
 #[allow(unused_imports)]
 use super::instance::{InstanceInfo, InstanceName};
diff --git a/src/infrastructure/adapters/opentofu/client.rs b/src/infrastructure/adapters/opentofu/client.rs
@@ -26,7 +26,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tracing::info;
 
-use crate::infrastructure::executor::{CommandError, CommandExecutor};
+use crate::shared::executor::{CommandError, CommandExecutor};
 
 use super::json_parser::{OpenTofuJsonParser, ParseError};
 
diff --git a/src/infrastructure/mod.rs b/src/infrastructure/mod.rs
@@ -6,7 +6,6 @@
 //!
 //! ## Components
 //!
-//! - `executor` - Low-level shell command execution utilities
 //! - `adapters` - External tool integration adapters (Ansible, LXD, `OpenTofu`, SSH)
 //! - `remote_actions` - Repository-like implementations for remote system operations
 //! - `ansible` - Ansible delivery mechanism and implementation details
@@ -15,10 +14,6 @@
 
 pub mod adapters;
 pub mod ansible;
-pub mod executor;
 pub mod remote_actions;
 pub mod template;
 pub mod tofu;
-
-// Re-export commonly used types for convenience
-pub use executor::{CommandError, CommandExecutor};
diff --git a/src/infrastructure/remote_actions/mod.rs b/src/infrastructure/remote_actions/mod.rs
@@ -24,7 +24,7 @@
 use std::net::IpAddr;
 use thiserror::Error;
 
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Errors that can occur during remote action execution
 #[derive(Error, Debug)]
diff --git a/src/shared/executor.rs b/src/shared/executor.rs
diff --git a/src/shared/mod.rs b/src/shared/mod.rs
@@ -4,4 +4,8 @@
 //! between different layers of the application, including infrastructure,
 //! e2e tests, and other components.
 
+pub mod executor;
 pub mod ssh;
+
+// Re-export commonly used types for convenience
+pub use executor::{CommandError, CommandExecutor};
diff --git a/src/shared/ssh/client.rs b/src/shared/ssh/client.rs
@@ -18,7 +18,7 @@ use std::time::Duration;
 
 use tracing::info;
 
-use crate::infrastructure::executor::{CommandError, CommandExecutor};
+use crate::shared::executor::{CommandError, CommandExecutor};
 
 use super::{SshConnection, SshError};
 
diff --git a/src/shared/ssh/mod.rs b/src/shared/ssh/mod.rs
@@ -34,7 +34,7 @@ pub use service_checker::SshServiceChecker;
 
 use thiserror::Error;
 
-use crate::infrastructure::executor::CommandError;
+use crate::shared::executor::CommandError;
 
 /// Errors that can occur during SSH operations
 #[derive(Error, Debug)]
