refactor: remove with_host and with_host_and_port methods from SshCredentials

- Removed SshCredentials::with_host() method
- Removed SshCredentials::with_host_and_port() method
- Updated all callers to use SshConnection constructors directly:
  - Use SshConnection::with_default_port() for default port 22
  - Use SshConnection::new() with SocketAddr for custom ports
- Cleaned up unused imports in credentials.rs
- Updated imports in affected files to include SshConnection
- All tests pass and linting is clean

This simplifies the API by removing duplicate functionality and makes
socket address creation explicit in the calling code.

Author: josecelano

src/application/commands/provision.rs

@@ -30,7 +30,7 @@ use crate::infrastructure::adapters::opentofu::client::{InstanceInfo, OpenTofuEr
 use crate::infrastructure::ansible::AnsibleTemplateRenderer;
 use crate::infrastructure::tofu::{ProvisionTemplateError, TofuTemplateRenderer};
 use crate::shared::executor::CommandError;
-use crate::shared::ssh::{credentials::SshCredentials, SshError};
+use crate::shared::ssh::{credentials::SshCredentials, SshConnection, SshError};
 
 /// Comprehensive error type for the `ProvisionCommand`
 #[derive(Debug, thiserror::Error)]
@@ -155,7 +155,8 @@ impl ProvisionCommand {
         .execute()
         .await?;
 
-        let ssh_connection = self.ssh_credentials.clone().with_host(instance_ip);
+        let ssh_connection =
+            SshConnection::with_default_port(self.ssh_credentials.clone(), instance_ip);
         WaitForSSHConnectivityStep::new(ssh_connection)
             .execute()
             .await?;

src/application/commands/test.rs

@@ -22,7 +22,7 @@ use crate::application::steps::{
 };
 use crate::infrastructure::remote_actions::RemoteActionError;
 use crate::shared::executor::CommandError;
-use crate::shared::ssh::credentials::SshCredentials;
+use crate::shared::ssh::{credentials::SshCredentials, SshConnection};
 
 /// Comprehensive error type for the `TestCommand`
 #[derive(Debug, thiserror::Error)]
@@ -73,7 +73,8 @@ impl TestCommand {
             "Starting complete infrastructure testing workflow"
         );
 
-        let ssh_connection = self.ssh_credentials.clone().with_host(self.instance_ip);
+        let ssh_connection =
+            SshConnection::with_default_port(self.ssh_credentials.clone(), self.instance_ip);
 
         // TODO: Cloud-init validation disabled for container testing
         // This step fails when testing with Docker containers since they don't have cloud-init installed.

src/application/steps/connectivity/wait_ssh_connectivity.rs

@@ -90,7 +90,7 @@ mod tests {
             "/tmp/test_key.pub".into(),
             "testuser".to_string(),
         );
-        let ssh_connection = credentials.with_host(instance_ip);
+        let ssh_connection = SshConnection::with_default_port(credentials, instance_ip);
 
         let step = WaitForSSHConnectivityStep::new(ssh_connection);
 
@@ -110,7 +110,7 @@ mod tests {
             "/home/user/.ssh/id_rsa.pub".into(),
             "torrust".to_string(),
         );
-        let ssh_connection = credentials.with_host(instance_ip);
+        let ssh_connection = SshConnection::with_default_port(credentials, instance_ip);
 
         let step = WaitForSSHConnectivityStep::new(ssh_connection);
 
@@ -130,7 +130,7 @@ mod tests {
             "/path/to/ssh/key.pub".into(),
             "admin".to_string(),
         );
-        let ssh_connection = credentials.with_host(instance_ip);
+        let ssh_connection = SshConnection::with_default_port(credentials, instance_ip);
 
         let step = WaitForSSHConnectivityStep::new(ssh_connection);
 

src/application/steps/validation/cloud_init.rs

@@ -86,7 +86,7 @@ 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 ssh_connection = SshConnection::with_default_port(ssh_credentials, host_ip);
 
         let step = ValidateCloudInitCompletionStep::new(ssh_connection);
 

src/application/steps/validation/docker.rs

@@ -85,7 +85,7 @@ 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 ssh_connection = SshConnection::with_default_port(ssh_credentials, host_ip);
 
         let step = ValidateDockerInstallationStep::new(ssh_connection);
 

src/application/steps/validation/docker_compose.rs

@@ -91,7 +91,7 @@ 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 ssh_connection = SshConnection::with_default_port(ssh_credentials, host_ip);
 
         let step = ValidateDockerComposeInstallationStep::new(ssh_connection);
 

src/e2e/tasks/run_configuration_validation.rs

@@ -28,6 +28,7 @@ use crate::config::SshCredentials;
 use crate::infrastructure::remote_actions::{
     DockerComposeValidator, DockerValidator, RemoteAction,
 };
+use crate::shared::ssh::SshConnection;
 
 /// Run configuration validation tests on a configured instance
 ///
@@ -127,7 +128,8 @@ async fn validate_docker_installation(
 ) -> Result<()> {
     info!("Validating Docker installation");
 
-    let ssh_connection = ssh_credentials.clone().with_host_and_port(ip_addr, port);
+    let ssh_connection =
+        SshConnection::new(ssh_credentials.clone(), SocketAddr::new(ip_addr, port));
 
     let docker_validator = DockerValidator::new(ssh_connection);
     docker_validator
@@ -165,7 +167,8 @@ async fn validate_docker_compose_installation(
 ) -> Result<()> {
     info!("Validating Docker Compose installation");
 
-    let ssh_connection = ssh_credentials.clone().with_host_and_port(ip_addr, port);
+    let ssh_connection =
+        SshConnection::new(ssh_credentials.clone(), SocketAddr::new(ip_addr, port));
 
     let compose_validator = DockerComposeValidator::new(ssh_connection);
     compose_validator

src/shared/ssh/client.rs

@@ -245,7 +245,7 @@ impl SshClient {
 
 #[cfg(test)]
 mod tests {
-    use super::super::SshCredentials;
+    use super::super::{SshConnection, SshCredentials};
     use super::*;
     use std::net::{IpAddr, Ipv4Addr};
     use std::path::PathBuf;
@@ -258,7 +258,7 @@ mod tests {
             PathBuf::from("/path/to/key.pub"),
             "testuser".to_string(),
         );
-        let ssh_connection = credentials.with_host(host_ip);
+        let ssh_connection = SshConnection::with_default_port(credentials, host_ip);
         let ssh_client = SshClient::new(ssh_connection);
 
         assert_eq!(
@@ -281,7 +281,7 @@ mod tests {
             PathBuf::from("/path/to/key.pub"),
             "testuser".to_string(),
         );
-        let ssh_connection = credentials.with_host(host_ip);
+        let ssh_connection = SshConnection::with_default_port(credentials, host_ip);
         let ssh_client = SshClient::new(ssh_connection);
 
         assert_eq!(

src/shared/ssh/connection.rs

@@ -18,6 +18,9 @@ use std::path::PathBuf;
 
 use super::SshCredentials;
 
+/// Default SSH port number.
+const DEFAULT_SSH_PORT: u16 = 22;
+
 /// SSH connection configuration for a specific remote instance.
 ///
 /// Contains both the SSH credentials and the target host socket address,
@@ -53,10 +56,10 @@ impl SshConnection {
     /// );
     /// ```
     #[must_use]
-    pub fn new(credentials: SshCredentials, socket_addr: SocketAddr) -> Self {
+    pub fn new(credentials: SshCredentials, ssh_socket_addr: SocketAddr) -> Self {
         Self {
             credentials,
-            socket_addr,
+            socket_addr: ssh_socket_addr,
         }
     }
 
@@ -80,7 +83,7 @@ impl SshConnection {
     /// ```
     #[must_use]
     pub fn with_default_port(credentials: SshCredentials, host_ip: IpAddr) -> Self {
-        let socket_addr = SocketAddr::new(host_ip, 22);
+        let socket_addr = SocketAddr::new(host_ip, DEFAULT_SSH_PORT);
         Self::new(credentials, socket_addr)
     }
 
@@ -119,30 +122,4 @@ impl SshConnection {
     pub fn socket_addr(&self) -> SocketAddr {
         self.socket_addr
     }
-
-    /// Creates a new SSH connection configuration with IP address and port.
-    ///
-    /// This is a convenience method for creating a connection when you have
-    /// separate IP address and port values.
-    ///
-    /// ```rust
-    /// # use std::net::{IpAddr, Ipv4Addr};
-    /// # use std::path::PathBuf;
-    /// # use torrust_tracker_deploy::shared::ssh::{SshCredentials, SshConnection};
-    /// let credentials = SshCredentials::new(
-    ///     PathBuf::from("/home/user/.ssh/deploy_key"),
-    ///     PathBuf::from("/home/user/.ssh/deploy_key.pub"),
-    ///     "ubuntu".to_string(),
-    /// );
-    /// let connection = SshConnection::with_ip_and_port(
-    ///     credentials,
-    ///     IpAddr::V4(Ipv4Addr::new(192, 168, 1, 100)),
-    ///     2222,
-    /// );
-    /// ```
-    #[must_use]
-    pub fn with_ip_and_port(credentials: SshCredentials, host_ip: IpAddr, port: u16) -> Self {
-        let socket_addr = SocketAddr::new(host_ip, port);
-        Self::new(credentials, socket_addr)
-    }
 }

src/shared/ssh/credentials.rs

@@ -13,11 +13,8 @@
 //! The credentials are typically configured at startup and used throughout
 //! the deployment process for secure remote access to provisioned instances.
 
-use std::net::IpAddr;
 use std::path::PathBuf;
 
-use super::SshConnection;
-
 /// SSH credentials for remote instance authentication.
 ///
 /// Contains the static SSH authentication information that is known
@@ -69,19 +66,4 @@ impl SshCredentials {
             ssh_username,
         }
     }
-
-    /// Promote these credentials to a full SSH connection configuration.
-    ///
-    /// This method creates an `SshConnection` by combining these credentials
-    /// with a specific host IP address.
-    #[must_use]
-    pub fn with_host(self, host_ip: IpAddr) -> SshConnection {
-        SshConnection::with_default_port(self, host_ip)
-    }
-
-    /// Create an SSH connection with a custom port
-    #[must_use]
-    pub fn with_host_and_port(self, host_ip: IpAddr, port: u16) -> SshConnection {
-        SshConnection::with_ip_and_port(self, host_ip, port)
-    }
 }