From 0e84e1bdda1d0e4998de594e809e7318f9732dbb Mon Sep 17 00:00:00 2001
From: "Lockszmith (@VAST)" <gal.szkolnik@vastdata.com>
Date: Thu, 3 Apr 2025 22:47:24 -0400
Subject: [PATCH] Improve tssh-with-tunnel

---
 .../bin/executable_tssh-with-tunnel             | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel b/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
index 6da0438..189a960 100644
--- a/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
+++ b/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
@@ -30,19 +30,18 @@ SSHUSER="${SSHUSER:-vastdata}"
 
 TARGET="${SSHUSER}@$(tsh-get "$SEARCH" "$SSHUSER")"
 
-VMS="${VMS:-"$(awk '$5 { split($4, cidr, "/"); print cidr[1] }' <(tsh ssh "${TARGET}" bash -l <<SSHEOF
-    VMS="\$(clush -g cnodes 'docker ps | grep vast_vms | grep -v grep' 2>/dev/null | cut -d':' -f1)" \
-    && clush -w "\$VMS" ip -4 -br a
-SSHEOF
-))"}"
+VMS="${VMS:-"$(tsh ssh "${TARGET}" -- cat /vast/vman/mgmt-vip)"}"
 
-TUNNEL="-L ${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
+TUNNEL="${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
 
 RUN="${RUN:-}"
 if [[ -z "$RUN" && -n "$(command -v zellij)" ]]; then
-    RUN="zellij run --floating --pinned 'true' --name '${SCRIPT_NAME} ${SEARCH}: ${TUNNEL} ${TARGET}' --"
+    RUN="zellij run --floating --pinned 'true' --name '${TUNNEL}|${TARGET}|${SEARCH}|${SCRIPT_NAME}' --"
 fi
 
-printf "Executing: %s ...\n" "tsh ssh ${TUNNEL} ${TARGET} ${*:2}" >&2
-eval "${RUN} tsh ssh ${TUNNEL} '${TARGET}' ${*:2}"
+TUNNEL="-L ${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
+SSH_OPTS="${SSH_OPTS:--N}"
+
+printf "Executing: %s ...\n" "tsh ssh ${TUNNEL} ${TARGET} ${*:2}" >&2
+eval "${RUN} tsh ssh ${SSH_OPTS} ${TUNNEL} '${TARGET}' ${*:2}"