From 9b3299d06d9f674caee9aa140c89d36c78736ae2 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 21 Feb 2025 07:35:25 -0600 Subject: [PATCH 1/2] Added test of info command without username in the docker test Ticket: CFE-4499 --- tests/docker/001-docker-install-test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/docker/001-docker-install-test.sh b/tests/docker/001-docker-install-test.sh index 4e57b3e..029dc98 100755 --- a/tests/docker/001-docker-install-test.sh +++ b/tests/docker/001-docker-install-test.sh @@ -22,6 +22,8 @@ echo "ssh returned exit code $?" echo "=== cf-remote info ===" | tee -a log cf-remote --log-level DEBUG info -H root@"$ip_addr":8822 2>&1 | tee -a log echo "cf-remote info got return code $?" +cf-remote --log-level DEBUG info -H "$ip_addr":8822 2>&1 | tee -a log +echo "cf-remote info got return code $?" echo "=== cf-remote install ===" | tee -a log cf-remote --log-level DEBUG install --clients root@"$ip_addr":8822 2>&1 | tee -a log ssh -o StrictHostKeyChecking=no -p 8822 root@"$ip_addr" cf-agent -V >>log 2>&1 From 8f0af0c0e2a539023f1809887ae57d29181c5780 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 21 Feb 2025 07:51:37 -0600 Subject: [PATCH 2/2] Fixed error when not specifying a username in host parameter Ticket: CFE-4499 --- cf_remote/ssh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf_remote/ssh.py b/cf_remote/ssh.py index c912674..62d58b9 100644 --- a/cf_remote/ssh.py +++ b/cf_remote/ssh.py @@ -122,7 +122,7 @@ def connect(host, users=None): log.debug("users= '%s'" % users) parts = urlparse("ssh://%s" % host) host = parts.hostname - if not users: + if not users and parts.username: users = [parts.username] port = parts.port or aramid._DEFAULT_SSH_PORT if not users: