Merge "Fix empty dict in the script arguments when running a script in the cmd-exec"

1 files changed, 6 insertions, 1 deletions

diff --git a/ms/command-executor/src/main/python/command_executor_handler.py b/ms/command-executor/src/main/python/command_executor_handler.py
index eec385783..06004b551 100644
--- a/ms/command-executor/src/main/python/command_executor_handler.py
+++ b/ms/command-executor/src/main/python/command_executor_handler.py
@@ -104,11 +104,16 @@ class CommandExecutorHandler():
 
             cmd = "cd " + self.venv_home
 
+            ### if properties are defined we add them to the command
+            properties = ""
+            if request.properties is not None and len(request.properties) > 0:
+                properties = " " + re.escape(MessageToJson(request.properties))
+
             ### TODO: replace with os.environ['VIRTUAL_ENV']?
             if "ansible-playbook" in request.command:
                 cmd = cmd + "; " + request.command + " -e 'ansible_python_interpreter=" + self.venv_home + "/bin/python'"
             else:
-                cmd = cmd + "; " + request.command + " " + re.escape(MessageToJson(request.properties))
+                cmd = cmd + "; " + request.command + properties
 
             ### extract the original header request into sys-env variables
             ### RequestID