From e7896f2f42bf70133797ee9f14d060015757996d Mon Sep 17 00:00:00 2001 From: AnsibleGuy Date: Mon, 19 Aug 2024 20:58:27 +0200 Subject: [PATCH] fix for empty data in diff --- plugins/module_utils/helper/main.py | 2 +- plugins/module_utils/helper/wrapper.py | 3 ++- plugins/modules/ids_policy_rule.py | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/module_utils/helper/main.py b/plugins/module_utils/helper/main.py index 787df7d3..7a2480b0 100644 --- a/plugins/module_utils/helper/main.py +++ b/plugins/module_utils/helper/main.py @@ -12,7 +12,7 @@ def diff_remove_empty(diff: dict) -> dict: d = diff.copy() - for k in diff.keys(): + for k in diff: if len(diff[k]) == 0: d.pop(k) diff --git a/plugins/module_utils/helper/wrapper.py b/plugins/module_utils/helper/wrapper.py index 3619cc2f..5e1a0d68 100644 --- a/plugins/module_utils/helper/wrapper.py +++ b/plugins/module_utils/helper/wrapper.py @@ -16,11 +16,12 @@ def module_process(instance: BaseModule): if hasattr(instance, 's'): instance.s.close() + instance.r['diff'] = diff_remove_empty(instance.r['diff']) + def module_wrapper(instance: BaseModule): if instance.m.params['profiling'] or instance.m.params['debug']: module_name = inspect_getfile(inspect_stack()[1][0]).rsplit('/', 1)[1].rsplit('.', 1)[0] return profiler(check=module_process, module_name=module_name, kwargs={'instance': instance}) - instance.r['diff'] = diff_remove_empty(instance.r['diff']) return module_process(instance) diff --git a/plugins/modules/ids_policy_rule.py b/plugins/modules/ids_policy_rule.py index 2fe3db85..0feb2b06 100644 --- a/plugins/modules/ids_policy_rule.py +++ b/plugins/modules/ids_policy_rule.py @@ -56,8 +56,6 @@ def run_module(): ) module_wrapper(Rule(module=module, result=result)) - - result['diff'] = diff_remove_empty(result['diff']) module.exit_json(**result)