Merge pull request rundeck-plugins#46 from aggaatul/bugWhenUsingScripts

Bug in script handling in python3
alizdavoodi · Oct 31, 2019 · a7f7996 · a7f7996
2 parents b242c5c + 301f393
commit a7f7996
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/contents/common.py b/contents/common.py
@@ -21,6 +21,8 @@
                     format='%(levelname)s: %(name)s: %(message)s')
 log = logging.getLogger('kubernetes-plugin')
 
+PY = sys.version_info[0]
+
 if os.environ.get('RD_JOB_LOGLEVEL') == 'DEBUG':
     log.setLevel(logging.DEBUG)
 
@@ -385,6 +387,10 @@ def copy_file(name, namespace, container, source_file, destination_path, destina
                 log.error("ERROR: %s" % resp.read_stderr())
             if commands:
                 c = commands.pop(0)
+
+                # Python 3 expects bytes string to transfer the data.
+                if PY == 3:
+                    c = c.decode()
                 resp.write_stdin(c)
             else:
                 break

diff --git a/contents/pods-run-script.py b/contents/pods-run-script.py
@@ -17,6 +17,7 @@
 if os.environ.get('RD_JOB_LOGLEVEL') == 'DEBUG':
     log.setLevel(logging.DEBUG)
 
+PY = sys.version_info[0]
 
 def main():
 
@@ -62,6 +63,11 @@ def main():
         exit(1)
 
     script = os.environ.get('RD_CONFIG_SCRIPT')
+
+    # Python 3 expects bytes string to transfer the data.
+    if PY == 3:
+        script = script.encode('utf-8')
+
     invocation = "/bin/bash"
     if 'RD_CONFIG_INVOCATION' in os.environ:
         invocation = os.environ.get('RD_CONFIG_INVOCATION')