Add verbosity level and quiet flag in ssh command based on debug flag (#5869)

thelovekesh · danielbachhuber · web-flow · commit 00ca209b7c9d · 2023-11-10T16:08:48.000-08:00
* Add verbosity level and quiet flag in ssh command based on debug flag

* Remove redundant spaces from ssh command args

* Update aliases and flags feature test

* Apply suggestions from code review

---------

Co-authored-by: Daniel Bachhuber &lt;daniel@bachhuber.co&gt;
diff --git a/features/aliases.feature b/features/aliases.feature
@@ -186,7 +186,7 @@ Feature: Create shortcuts to specific WordPress installs
     When I try `wp @foo --debug --version`
     Then STDERR should contain:
       """
-      Running SSH command: ssh -q -J 'proxyhost' 
+      Running SSH command: ssh -J 'proxyhost' -T -vvv
       """
 
   Scenario: Adds key to ssh command
@@ -201,7 +201,7 @@ Feature: Create shortcuts to specific WordPress installs
     When I try `wp @foo --debug --version`
     Then STDERR should contain:
       """
-      Running SSH command: ssh -q -i 'identityfile.key' 
+      Running SSH command: ssh -i 'identityfile.key' -T -vvv
       """
 
   Scenario: Add an alias
diff --git a/features/flags.feature b/features/flags.feature
@@ -344,14 +344,14 @@ Feature: Global flags
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp --debug --ssh=/ --version`
     Then STDERR should contain:
       """
-      Running SSH command: ssh -q -T '' 'WP_CLI_STRICT_ARGS_MODE=1 wp
+      Running SSH command: ssh -T -vvv '' 'WP_CLI_STRICT_ARGS_MODE=1 wp
       """
 
   Scenario: SSH flag should support changing directories
     When I try `wp --debug --ssh=wordpress:/my/path --version`
     Then STDERR should contain:
       """
-      Running SSH command: ssh -q -T 'wordpress' 'cd '\''/my/path'\''; wp
+      Running SSH command: ssh -T -vvv 'wordpress' 'cd '\''/my/path'\''; wp
       """
 
   Scenario: SSH flag should support Docker
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -644,7 +644,7 @@ private function generate_ssh_command( $bits, $wp_command ) {
 
 		// Default scheme is SSH.
 		if ( 'ssh' === $bits['scheme'] || null === $bits['scheme'] ) {
-			$command = 'ssh -q %s %s %s';
+			$command = 'ssh %s %s %s';
 
 			if ( $bits['user'] ) {
 				$bits['host'] = $bits['user'] . '@' . $bits['host'];
@@ -660,10 +660,11 @@ private function generate_ssh_command( $bits, $wp_command ) {
 			}
 
 			$command_args = [
-				$bits['proxyjump'] ? sprintf( '-J %s ', escapeshellarg( $bits['proxyjump'] ) ) : '',
-				$bits['port'] ? '-p ' . (int) $bits['port'] . ' ' : '',
+				$bits['proxyjump'] ? sprintf( '-J %s', escapeshellarg( $bits['proxyjump'] ) ) : '',
+				$bits['port'] ? sprintf( '-p %d', (int) $bits['port'] ) : '',
 				$bits['key'] ? sprintf( '-i %s', escapeshellarg( $bits['key'] ) ) : '',
 				$is_tty ? '-t' : '-T',
+				WP_CLI::get_config( 'debug' ) ? '-vvv' : '-q',
 			];
 
 			$escaped_command = sprintf(
