Merge pull request #6 from thebaptiste/metwork

fix: in ssh_process, we exit(1) only if the exit code of the ssh command is not 0

Dockerfile

@@ -23,4 +23,4 @@ RUN chmod +x /opt/tools/entrypoint.sh
 COPY app.py /opt/tools/app.py
 RUN chmod +x /opt/tools/app.py
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["/opt/tools/entrypoint.sh"]

app.py

@@ -6,6 +6,8 @@ import scp
 import sys
 import math
 import re
+import tempfile
+import os
 
 
 envs = environ
@@ -42,19 +44,34 @@ def strip_and_parse_envs(p):
         return None
     for c in strips:
         p = p.strip(c)
-    return path.expandvars(p)
+    return path.expandvars(p) if p != "." else f"{path.realpath(p)}/*"
 
 
 def connect(callback=None):
-    with paramiko.SSHClient() as ssh:
-        p_key = paramiko.RSAKey.from_private_key(INPUT_KEY) if INPUT_KEY else None
+    tmp = tempfile.NamedTemporaryFile(delete=False)
+    try:
+        ssh = paramiko.SSHClient()
+        p_key = None
+        if INPUT_KEY:
+            tmp.write(INPUT_KEY.encode())
+            tmp.close()
+            p_key = paramiko.RSAKey.from_private_key_file(filename=tmp.name)
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         ssh.connect(INPUT_HOST, port=INPUT_PORT, username=INPUT_USER,
                     pkey=p_key, password=INPUT_PASS,
                     timeout=convert_to_seconds(INPUT_CONNECT_TIMEOUT))
+    except Exception as err:
+        print(f"Connect error\n{err}")
+        sys.exit(1)
+        
+    else:
         if callback:
             callback(ssh)
             
+    finally:
+        os.unlink(tmp.name)
+        tmp.close()
+
 
 # Define progress callback that prints the current percentage completed for the file
 def progress(filename, size, sent):
@@ -79,6 +96,8 @@ def ssh_process(ssh, input_ssh):
 
     stdin, stdout, stderr = ssh.exec_command(command_str)
     
+    ssh_exit_status = stdout.channel.recv_exit_status()
+    
     out = "".join(stdout.readlines())
     out = out.strip() if out is not None else None
     if out:
@@ -87,10 +106,11 @@ def ssh_process(ssh, input_ssh):
     err = "".join(stderr.readlines())
     err = err.strip() if err is not None else None
     if err:
-        if out is None:
-            raise Exception(err)
-        else:
-            print(f"Error: \n{err}")
+        print(f"Error: \n{err}")
+    
+    if  ssh_exit_status != 0:
+        print(f"ssh exit status: {ssh_exit_status}")
+        sys.exit(1)
         
     pass
 
@@ -117,10 +137,19 @@ def scp_process(ssh, input_scp):
     with scp.SCPClient(ssh.get_transport(), progress=progress, sanitize=lambda x: x) as conn:
         for l2r in copy_list:
             remote = l2r.get('r')
-            ssh.exec_command(f"mkdir -p {remote} || true")
+            try:
+                ssh.exec_command(f"mkdir -p {remote}")
+            except Exception as err:
+                print(f"Remote mkdir error. Can't create {remote}\n{err}")
+                sys.exit(1)
+                
             for f in [f for f in glob(l2r.get('l'))]:
-                conn.put(f, remote_path=remote, recursive=True)
-                print(f"{f} -> {remote}")
+                try:
+                    conn.put(f, remote_path=remote, recursive=True)
+                    print(f"{f} -> {remote}")
+                except Exception as err:
+                    print(f"Scp error. Can't copy {f} on {remote}\n{err}")
+                    sys.exit(1)
     pass
 
 

entrypoint.sh

@@ -3,5 +3,8 @@
 echo "+++++++++++++++++++STARTING PIPELINES+++++++++++++++++++"
 
 python3 /opt/tools/app.py
+RET=$?
 
 echo "+++++++++++++++++++END PIPELINES+++++++++++++++++++"
+
+exit $RET