From 4915d094d8865987365069bee41540b2413c19bb Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Sat, 5 Sep 2020 17:36:53 -0400 Subject: [PATCH] Automate loading of job_metrics_config_file - Move option out of parse_config_file_options - Use path_resolves_to in schema - Run make config-rebuild --- doc/source/admin/galaxy_options.rst | 2 -- lib/galaxy/config/__init__.py | 3 +-- lib/galaxy/config/sample/galaxy.yml.sample | 2 -- lib/galaxy/webapps/galaxy/config_schema.yml | 3 +-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index 73a8adbf6c6..3ba787e9561 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -3456,8 +3456,6 @@ :Description: XML config file that contains the job metric collection configuration. - The value of this option will be resolved with respect to - . :Default: ``job_metrics_conf.xml`` :Type: str diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py index 41acfef0b57..3ada2440d75 100644 --- a/lib/galaxy/config/__init__.py +++ b/lib/galaxy/config/__init__.py @@ -420,7 +420,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin): add_sample_file_to_defaults = { 'build_sites_config_file', # 'datatypes_config_file', # TODO: handle all items in this set, one commit at a time. - # 'job_metrics_config_file', + 'job_metrics_config_file', # 'tool_data_table_config_path', # 'tool_config_file', } @@ -843,7 +843,6 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin): """Backwards compatibility for config files moved to the config/ dir.""" defaults = dict( datatypes_config_file=[self._in_config_dir('datatypes_conf.xml'), self._in_sample_dir('datatypes_conf.xml.sample')], - job_metrics_config_file=[self._in_config_dir('job_metrics_conf.xml'), self._in_sample_dir('job_metrics_conf.xml.sample')], ) listify_defaults = { 'tool_data_table_config_path': [ diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index ffd86634fa2..67b47098b1a 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -1685,8 +1685,6 @@ galaxy: # XML config file that contains the job metric collection # configuration. - # The value of this option will be resolved with respect to - # . #job_metrics_config_file: job_metrics_conf.xml # This option allows users to see the job metrics (except for diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index 0f205676087..65ff98a1a84 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -2558,12 +2558,11 @@ mapping: job_metrics_config_file: type: str default: job_metrics_conf.xml + path_resolves_to: config_dir required: false desc: | XML config file that contains the job metric collection configuration. - The value of this option will be resolved with respect to . - expose_potentially_sensitive_job_metrics: type: bool default: false