fix(ssh.upload): fix wrong connection string when using use_remote_su…

…do and user (pyinfra-dev#623) Fixes the ssh connection string when setting the use_remote_sudo and user options for the ssh.upload operation Before: ```json [ "scp -P 22 local_filename [email protected]:_tempfile_", "ssh -p 22 test@[email protected] 'sudo mv _tempfile_ local_filename'" ] ``` After: ```json [ "scp -P 22 local_filename [email protected]:_tempfile_", "ssh -p 22 [email protected] 'sudo mv _tempfile_ local_filename'" ] ```
hbcbh1999 · Jul 15, 2021 · 4e30aaf · 4e30aaf
1 parent bbb2694
commit 4e30aaf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/pyinfra/operations/ssh.py b/pyinfra/operations/ssh.py
@@ -157,7 +157,7 @@ def upload(
 
         # And sudo sudo to move it
         yield command(
-            hostname=connection_target,
+            hostname=hostname,
             command='sudo mv {0} {1}'.format(temp_remote_filename, remote_filename),
             port=port,
             user=user,

diff --git a/tests/operations/ssh.upload/upload_remote_sudo_user.json b/tests/operations/ssh.upload/upload_remote_sudo_user.json
@@ -0,0 +1,12 @@
+{
+    "args": ["remote-host.net", "local_filename"],
+    "kwargs": {
+        "user": "test",
+        "use_remote_sudo": true
+    },
+    "commands": [
+        "scp -P 22 local_filename [email protected]:_tempfile_",
+        "ssh -p 22 [email protected] 'sudo mv _tempfile_ local_filename'"
+    ],
+    "idempotent": false
+}