refactor: use SshConnection in validation step constructors

Replace separate SshCredentials and IpAddr parameters with a single
SshConnection parameter in:
- ValidateCloudInitCompletionStep::new
- ValidateDockerInstallationStep::new
- ValidateDockerComposeInstallationStep::new

This improves encapsulation and follows the existing pattern used
throughout the codebase. Updated usage in e2e_tests.rs and all
corresponding unit tests.

Author: josecelano

src/bin/e2e_tests.rs

@@ -280,25 +280,26 @@ async fn validate_deployment(env: &TestEnvironment, instance_ip: &IpAddr) -> Res
     info!(stage = "validation", "Starting deployment validation");
 
     // Validate cloud-init completion
-    let validate_cloud_init_step =
-        ValidateCloudInitCompletionStep::new(env.config.ssh_credentials.clone(), *instance_ip);
+    let validate_cloud_init_step = ValidateCloudInitCompletionStep::new(
+        env.config.ssh_credentials.clone().with_host(*instance_ip),
+    );
     validate_cloud_init_step
         .execute()
         .await
         .map_err(|e| anyhow::anyhow!(e))?;
 
     // Validate Docker installation
-    let validate_docker_step =
-        ValidateDockerInstallationStep::new(env.config.ssh_credentials.clone(), *instance_ip);
+    let validate_docker_step = ValidateDockerInstallationStep::new(
+        env.config.ssh_credentials.clone().with_host(*instance_ip),
+    );
     validate_docker_step
         .execute()
         .await
         .map_err(|e| anyhow::anyhow!(e))?;
 
     // Validate Docker Compose installation
     let validate_docker_compose_step = ValidateDockerComposeInstallationStep::new(
-        env.config.ssh_credentials.clone(),
-        *instance_ip,
+        env.config.ssh_credentials.clone().with_host(*instance_ip),
     );
     validate_docker_compose_step
         .execute()

src/steps/infrastructure/validate_cloud_init_completion.rs

@@ -1,22 +1,17 @@
-use std::net::IpAddr;
 use tracing::info;
 
 use crate::actions::{CloudInitValidator, RemoteAction, RemoteActionError};
-use crate::command_wrappers::ssh::SshCredentials;
+use crate::command_wrappers::ssh::SshConnection;
 
 /// Step that validates cloud-init completion on a remote host
 pub struct ValidateCloudInitCompletionStep {
-    ssh_credentials: SshCredentials,
-    host_ip: IpAddr,
+    ssh_connection: SshConnection,
 }
 
 impl ValidateCloudInitCompletionStep {
     #[must_use]
-    pub fn new(ssh_credentials: SshCredentials, host_ip: IpAddr) -> Self {
-        Self {
-            ssh_credentials,
-            host_ip,
-        }
+    pub fn new(ssh_connection: SshConnection) -> Self {
+        Self { ssh_connection }
     }
 
     /// Execute the cloud-init completion validation step
@@ -43,10 +38,11 @@ impl ValidateCloudInitCompletionStep {
             "Validating cloud-init completion"
         );
 
-        let cloud_init_ssh_connection = self.ssh_credentials.clone().with_host(self.host_ip);
-        let cloud_init_validator = CloudInitValidator::new(cloud_init_ssh_connection);
+        let cloud_init_validator = CloudInitValidator::new(self.ssh_connection.clone());
 
-        cloud_init_validator.execute(&self.host_ip).await?;
+        cloud_init_validator
+            .execute(&self.ssh_connection.host_ip)
+            .await?;
 
         Ok(())
     }
@@ -57,6 +53,8 @@ mod tests {
     use std::net::{IpAddr, Ipv4Addr};
     use std::path::PathBuf;
 
+    use crate::command_wrappers::ssh::SshCredentials;
+
     use super::*;
 
     #[test]
@@ -67,10 +65,11 @@ mod tests {
             "test_user".to_string(),
         );
         let host_ip = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1));
+        let ssh_connection = ssh_credentials.with_host(host_ip);
 
-        let step = ValidateCloudInitCompletionStep::new(ssh_credentials, host_ip);
+        let step = ValidateCloudInitCompletionStep::new(ssh_connection);
 
         // Test that the step can be created successfully
-        assert_eq!(step.host_ip, host_ip);
+        assert_eq!(step.ssh_connection.host_ip, host_ip);
     }
 }

src/steps/infrastructure/validate_docker_compose_installation.rs

@@ -1,22 +1,17 @@
-use std::net::IpAddr;
 use tracing::info;
 
 use crate::actions::{DockerComposeValidator, RemoteAction, RemoteActionError};
-use crate::command_wrappers::ssh::SshCredentials;
+use crate::command_wrappers::ssh::SshConnection;
 
 /// Step that validates Docker Compose installation on a remote host
 pub struct ValidateDockerComposeInstallationStep {
-    ssh_credentials: SshCredentials,
-    host_ip: IpAddr,
+    ssh_connection: SshConnection,
 }
 
 impl ValidateDockerComposeInstallationStep {
     #[must_use]
-    pub fn new(ssh_credentials: SshCredentials, host_ip: IpAddr) -> Self {
-        Self {
-            ssh_credentials,
-            host_ip,
-        }
+    pub fn new(ssh_connection: SshConnection) -> Self {
+        Self { ssh_connection }
     }
 
     /// Execute the Docker Compose installation validation step
@@ -43,10 +38,11 @@ impl ValidateDockerComposeInstallationStep {
             "Validating Docker Compose installation"
         );
 
-        let docker_compose_ssh_connection = self.ssh_credentials.clone().with_host(self.host_ip);
-        let docker_compose_validator = DockerComposeValidator::new(docker_compose_ssh_connection);
+        let docker_compose_validator = DockerComposeValidator::new(self.ssh_connection.clone());
 
-        docker_compose_validator.execute(&self.host_ip).await?;
+        docker_compose_validator
+            .execute(&self.ssh_connection.host_ip)
+            .await?;
 
         Ok(())
     }
@@ -57,6 +53,8 @@ mod tests {
     use std::net::{IpAddr, Ipv4Addr};
     use std::path::PathBuf;
 
+    use crate::command_wrappers::ssh::SshCredentials;
+
     use super::*;
 
     #[test]
@@ -67,10 +65,11 @@ mod tests {
             "test_user".to_string(),
         );
         let host_ip = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1));
+        let ssh_connection = ssh_credentials.with_host(host_ip);
 
-        let step = ValidateDockerComposeInstallationStep::new(ssh_credentials, host_ip);
+        let step = ValidateDockerComposeInstallationStep::new(ssh_connection);
 
         // Test that the step can be created successfully
-        assert_eq!(step.host_ip, host_ip);
+        assert_eq!(step.ssh_connection.host_ip, host_ip);
     }
 }

src/steps/infrastructure/validate_docker_installation.rs

@@ -1,22 +1,17 @@
-use std::net::IpAddr;
 use tracing::info;
 
 use crate::actions::{DockerValidator, RemoteAction, RemoteActionError};
-use crate::command_wrappers::ssh::SshCredentials;
+use crate::command_wrappers::ssh::SshConnection;
 
 /// Step that validates Docker installation on a remote host
 pub struct ValidateDockerInstallationStep {
-    ssh_credentials: SshCredentials,
-    host_ip: IpAddr,
+    ssh_connection: SshConnection,
 }
 
 impl ValidateDockerInstallationStep {
     #[must_use]
-    pub fn new(ssh_credentials: SshCredentials, host_ip: IpAddr) -> Self {
-        Self {
-            ssh_credentials,
-            host_ip,
-        }
+    pub fn new(ssh_connection: SshConnection) -> Self {
+        Self { ssh_connection }
     }
 
     /// Execute the Docker installation validation step
@@ -43,10 +38,11 @@ impl ValidateDockerInstallationStep {
             "Validating Docker installation"
         );
 
-        let docker_ssh_connection = self.ssh_credentials.clone().with_host(self.host_ip);
-        let docker_validator = DockerValidator::new(docker_ssh_connection);
+        let docker_validator = DockerValidator::new(self.ssh_connection.clone());
 
-        docker_validator.execute(&self.host_ip).await?;
+        docker_validator
+            .execute(&self.ssh_connection.host_ip)
+            .await?;
 
         Ok(())
     }
@@ -57,6 +53,8 @@ mod tests {
     use std::net::{IpAddr, Ipv4Addr};
     use std::path::PathBuf;
 
+    use crate::command_wrappers::ssh::SshCredentials;
+
     use super::*;
 
     #[test]
@@ -67,10 +65,11 @@ mod tests {
             "test_user".to_string(),
         );
         let host_ip = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1));
+        let ssh_connection = ssh_credentials.with_host(host_ip);
 
-        let step = ValidateDockerInstallationStep::new(ssh_credentials, host_ip);
+        let step = ValidateDockerInstallationStep::new(ssh_connection);
 
         // Test that the step can be created successfully
-        assert_eq!(step.host_ip, host_ip);
+        assert_eq!(step.ssh_connection.host_ip, host_ip);
     }
 }