Correct wrong assumption made about data structures

pulsar/client/action_mapper.py

@@ -171,7 +171,8 @@ def __client_to_config(self, client):
             config = dict()
         config["default_action"] = client.default_file_action
         config["files_endpoint"] = client.files_endpoint
-        config["ssh_key"] = client.ssh_key
+        if hasattr(client, 'ssh_key'):
+            config["ssh_key"] = client.ssh_key
         return config
 
     def __load_action_config(self, path):
@@ -217,6 +218,7 @@ def __process_action(self, action, file_type):
             action.url = url
         elif action.action_type == "remote_rsync_transfer":
             action.url = action.path
+            # Required, so no check for presence
             action.ssh_key = self.ssh_key
 
 REQUIRED_ACTION_KWD = object()

pulsar/managers/stateful.py

@@ -66,7 +66,9 @@ def do_preprocess():
             try:
                 staging_config = job_directory.load_metadata("staging_config", {})
                 # TODO: swap out for a generic "job_extra_params"
-                if 'ssh_key' in staging_config['action_mapper']:
+                if 'action_mapper' in staging_config and \
+                        'ssh_key' in staging_config['action_mapper'] and \
+                        'setup' in staging_config:
                     for action in staging_config['setup']:
                         action['action'].update(ssh_key=staging_config['action_mapper']['ssh_key'])
                 preprocess(job_directory, staging_config.get("setup", []), self.__preprocess_action_executor)