Support verbose flag for remote shell ssh command

balena-io-modules · Jun 22, 2016 · 9d497cf · 9d497cf
1 parent 870a966
commit 9d497cf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/build/ssh.js b/build/ssh.js
@@ -45,7 +45,7 @@ utils = require('./utils');
  */
 
 exports.getConnectCommand = function(options) {
-  var containerId, port, result, username, uuid;
+  var containerId, port, result, username, uuid, verbose;
   if (options == null) {
     options = {};
   }
@@ -92,6 +92,7 @@ exports.getConnectCommand = function(options) {
     }
   });
   username = options.username, uuid = options.uuid, containerId = options.containerId, port = options.port;
-  result = "ssh -p " + port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null " + username + "@ssh." + (settings.get('proxyUrl')) + " rsync " + uuid + " " + containerId;
+  verbose = options.verbose ? '-vv ' : '';
+  result = "ssh " + verbose + "-p " + port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null " + username + "@ssh." + (settings.get('proxyUrl')) + " rsync " + uuid + " " + containerId;
   return result;
 };
diff --git a/lib/ssh.coffee b/lib/ssh.coffee
@@ -75,6 +75,16 @@ exports.getConnectCommand = (options = {}) ->
 
 	{ username, uuid, containerId, port } = options
 
-	result = "ssh -p #{port} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{username}@ssh.#{settings.get('proxyUrl')} rsync #{uuid} #{containerId}"
+	verbose = if options.verbose then '-vv ' else ''
+	result = """
+		ssh \
+		#{verbose}\
+		-p #{port} \
+		-o LogLevel=ERROR \
+		-o StrictHostKeyChecking=no \
+		-o UserKnownHostsFile=/dev/null \
+		#{username}@ssh.#{settings.get('proxyUrl')} \
+		rsync #{uuid} #{containerId}
+	"""
 
 	return result
diff --git a/tests/ssh.spec.coffee b/tests/ssh.spec.coffee
@@ -19,5 +19,6 @@ describe 'SSH:', ->
 					uuid: '1234'
 					containerId: '4567'
 					port: 8080
+					verbose: true
 
-				m.chai.expect(command).to.equal('ssh -p 8080 -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null test@ssh.resindevice.io rsync 1234 4567')
+				m.chai.expect(command).to.equal('ssh -vv -p 8080 -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null test@ssh.resindevice.io rsync 1234 4567')