Add monitoring image to workflow options (#189)

* Add monitoring image to wf options

* Update unit tests

* Fix adding monitoring image to options

lira/lira_utils.py

@@ -266,14 +266,18 @@ def compose_config_options(cromwell_options_file, lira_config):
         cromwell_options_file = cromwell_options_file.decode()
     options_json = json.loads(cromwell_options_file)
 
+    # If a monitoring image is defined in the config, add it to the options JSON
+    monitoring_image = getattr(lira_config, 'monitoring_image', None)
+    if monitoring_image:
+        options_json['monitoring_image'] = lira_config.monitoring_image
+
     # Defer to value already in options file if it exists
     # Docs on default runtime attributes: https://cromwell.readthedocs.io/en/latest/wf_options/Overview/
     runtime_parameters = options_json.get('default_runtime_attributes', {})
     if 'maxRetries' not in runtime_parameters.keys():
         options_json['default_runtime_attributes'] = {
             'maxRetries': lira_config.max_cromwell_retries
         }
-
     return json.dumps(options_json).encode('utf-8')
 
 

lira/test/test_lira_utils.py

@@ -487,6 +487,15 @@ def test_max_retries_uses_value_from_lira_config_if_not_set_in_options(self):
         max_retries = json.loads(options)['default_runtime_attributes']['maxRetries']
         self.assertEqual(max_retries, expected_max_retries)
 
+    def test_monitoring_image_passed_from_config_to_workflow_options(self):
+        test_config = deepcopy(self.correct_test_config)
+        test_image_name = "gcr.io/test_project/test_image"
+        test_config['monitoring_image'] = test_image_name
+        config = lira_config.LiraConfig(test_config)
+        options = lira_utils.compose_config_options(self.options_json, config)
+        image_name = json.loads(options)['monitoring_image']
+        self.assertEqual(image_name, test_image_name)
+
     def test_parse_github_resource_url(self):
         """Test if parse_github_resource_url can correctly parse Github resource urls."""
         self.assertEqual(