From 4b7db6f7f9686be4f93c77cde7d9a421c0da538d Mon Sep 17 00:00:00 2001 From: Will Thames Date: Thu, 28 May 2020 09:41:16 +1000 Subject: [PATCH] Use improved kubernetes diffs where possible Use information from strategic merges to improve the quality of diffs, particularly for list items (order no longer important, and adding/removing an item from a list just shows that item in the diff, not the whole list) --- plugins/module_utils/common.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index f9562011..6ea371bf 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -26,7 +26,6 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.common.dict_transformations import recursive_diff from ansible.module_utils.six import iteritems, string_types from ansible.module_utils._text import to_native @@ -57,6 +56,11 @@ try: except ImportError: pass +try: + from openshift.dynamic.apply import recursive_diff +except ImportError: + from ansible.module_utils.common.dict_transformations import recursive_diff + def list_dict_str(value): if isinstance(value, list):