From e6adddcaf8d4cf46185a90be89a574ba01cc6b84 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 23 Jan 2025 15:00:32 -0800 Subject: [PATCH] debug: hide loop variables while using var (#84597) Fixes: #65856 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/hide-loop-vars-debug-vars.yml | 3 +++ lib/ansible/plugins/callback/__init__.py | 5 ++++- ...lback_default.out.result_format_yaml_lossy_verbose.stdout | 3 --- .../callback_default.out.result_format_yaml_verbose.stdout | 3 --- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/hide-loop-vars-debug-vars.yml diff --git a/changelogs/fragments/hide-loop-vars-debug-vars.yml b/changelogs/fragments/hide-loop-vars-debug-vars.yml new file mode 100644 index 00000000000..975ab2f75ab --- /dev/null +++ b/changelogs/fragments/hide-loop-vars-debug-vars.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - debug - hide loop vars in debug var display (https://github.com/ansible/ansible/issues/65856). diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index 12d97a5a969..8dd839fdc8f 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -163,7 +163,10 @@ class CallbackBase(AnsiblePlugin): if options is not None: self.set_options(options) - self._hide_in_debug = ('changed', 'failed', 'skipped', 'invocation', 'skip_reason') + self._hide_in_debug = ( + 'changed', 'failed', 'skipped', 'invocation', 'skip_reason', + 'ansible_loop_var', 'ansible_index_var', 'ansible_loop', + ) # helper for callbacks, so they don't all have to include deepcopy _copy_result = deepcopy diff --git a/test/integration/targets/callback_default/callback_default.out.result_format_yaml_lossy_verbose.stdout b/test/integration/targets/callback_default/callback_default.out.result_format_yaml_lossy_verbose.stdout index 10172d9ea9a..a83161e9347 100644 --- a/test/integration/targets/callback_default/callback_default.out.result_format_yaml_lossy_verbose.stdout +++ b/test/integration/targets/callback_default/callback_default.out.result_format_yaml_lossy_verbose.stdout @@ -120,7 +120,6 @@ failed: [testhost] (item=debug-2) => ok: [testhost] => (item=debug-3) => msg: debug-3 skipping: [testhost] => (item=debug-4) => - ansible_loop_var: item false_condition: item != 4 item: 4 fatal: [testhost]: FAILED! => @@ -200,11 +199,9 @@ skipping: [testhost] => TASK [debug] ******************************************************************* skipping: [testhost] => (item=1) => - ansible_loop_var: item false_condition: false item: 1 skipping: [testhost] => (item=2) => - ansible_loop_var: item false_condition: false item: 2 skipping: [testhost] => diff --git a/test/integration/targets/callback_default/callback_default.out.result_format_yaml_verbose.stdout b/test/integration/targets/callback_default/callback_default.out.result_format_yaml_verbose.stdout index 69181046817..8098d224d25 100644 --- a/test/integration/targets/callback_default/callback_default.out.result_format_yaml_verbose.stdout +++ b/test/integration/targets/callback_default/callback_default.out.result_format_yaml_verbose.stdout @@ -126,7 +126,6 @@ failed: [testhost] (item=debug-2) => ok: [testhost] => (item=debug-3) => msg: debug-3 skipping: [testhost] => (item=debug-4) => - ansible_loop_var: item false_condition: item != 4 item: 4 fatal: [testhost]: FAILED! => @@ -207,11 +206,9 @@ skipping: [testhost] => TASK [debug] ******************************************************************* skipping: [testhost] => (item=1) => - ansible_loop_var: item false_condition: false item: 1 skipping: [testhost] => (item=2) => - ansible_loop_var: item false_condition: false item: 2 skipping: [testhost] =>