From e8b9b8c0edb8e1482f3e4a0cde23dd735668d5d1 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Sun, 2 Apr 2023 00:39:02 +0300 Subject: [PATCH] Fix merge action plugins verbose output This change fixes the output 'module_args' information of the plugins 'merge_configs' and 'merge_yaml' when Ansible is executed in maximum verbose mode. Now all the plugin options are displayed instead of standard 'copy' plugin options only. Change-Id: Ie2d9a0501fe29bfd854eb31258f282b197855948 Signed-off-by: Maksim Malchuk (cherry picked from commit 46000d4e05b6b7fc133114e8100da6fc64afb70e) --- kayobe/plugins/action/merge_configs.py | 10 +++++++--- kayobe/plugins/action/merge_yaml.py | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/kayobe/plugins/action/merge_configs.py b/kayobe/plugins/action/merge_configs.py index 1e7e9da8f..880d6ceec 100644 --- a/kayobe/plugins/action/merge_configs.py +++ b/kayobe/plugins/action/merge_configs.py @@ -177,12 +177,12 @@ def run(self, tmp=None, task_vars=None): del tmp # not used sources = self._task.args.get('sources', None) + whitespace = self._task.args.get('whitespace', True) if not isinstance(sources, list): sources = [sources] - config = OverrideConfigParser( - whitespace=self._task.args.get('whitespace', True)) + config = OverrideConfigParser(whitespace=whitespace) for source in sources: self.read_config(source, config) @@ -219,7 +219,11 @@ def run(self, tmp=None, task_vars=None): loader=self._loader, templar=self._templar, shared_loader_obj=self._shared_loader_obj) - result.update(copy_action.run(task_vars=task_vars)) + copy_result = copy_action.run(task_vars=task_vars) + copy_result['invocation']['module_args'].update({ + 'src': result_file, 'sources': sources, + 'whitespace': whitespace}) + result.update(copy_result) finally: shutil.rmtree(local_tempdir) return result diff --git a/kayobe/plugins/action/merge_yaml.py b/kayobe/plugins/action/merge_yaml.py index b2e5a621a..a8d89c0b8 100644 --- a/kayobe/plugins/action/merge_yaml.py +++ b/kayobe/plugins/action/merge_yaml.py @@ -152,7 +152,11 @@ def run(self, tmp=None, task_vars=None): loader=self._loader, templar=self._templar, shared_loader_obj=self._shared_loader_obj) - result.update(copy_action.run(task_vars=task_vars)) + copy_result = copy_action.run(task_vars=task_vars) + copy_result['invocation']['module_args'].update({ + 'src': result_file, 'sources': sources, + 'extend_lists': extend_lists}) + result.update(copy_result) finally: shutil.rmtree(local_tempdir) return result