From 754bf36055e4936c9956312d55fa82c5e76a380a Mon Sep 17 00:00:00 2001 From: Ashwini Mhatre Date: Fri, 1 Mar 2024 11:36:54 +0530 Subject: [PATCH] Undo changes done by https://github.com/ansible-collections/ansible.utils/pull/172 (#335) * Undo changes done by https://github.com/ansible-collections/ansible.utils/pull/172 * Update bugfix_178.yaml * Delete changelogs/fragments/bugfix_178.yaml --------- Co-authored-by: Ashwini Mhatre --- plugins/lookup/get_path.py | 3 +-- plugins/lookup/index_of.py | 3 +-- plugins/lookup/to_paths.py | 3 +-- plugins/lookup/validate.py | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/lookup/get_path.py b/plugins/lookup/get_path.py index 3370d6a..fa8ccf2 100644 --- a/plugins/lookup/get_path.py +++ b/plugins/lookup/get_path.py @@ -171,8 +171,7 @@ class LookupModule(LookupBase): terms = dict(zip(keys, terms)) terms.update(kwargs) - schema = [v for k, v in globals().items() if k.lower() == "documentation"] - aav = AnsibleArgSpecValidator(data=terms, schema=schema[0], name="get_path") + aav = AnsibleArgSpecValidator(data=terms, schema=DOCUMENTATION, name="get_path") valid, errors, updated_data = aav.validate() if not valid: raise AnsibleLookupError(errors) diff --git a/plugins/lookup/index_of.py b/plugins/lookup/index_of.py index 3da623a..8ccd4ff 100644 --- a/plugins/lookup/index_of.py +++ b/plugins/lookup/index_of.py @@ -341,8 +341,7 @@ class LookupModule(LookupBase): terms = dict(zip(keys, terms)) terms.update(kwargs) - schema = [v for k, v in globals().items() if k.lower() == "documentation"] - aav = AnsibleArgSpecValidator(data=terms, schema=schema[0], name="index_of") + aav = AnsibleArgSpecValidator(data=terms, schema=DOCUMENTATION, name="index_of") valid, errors, updated_data = aav.validate() if not valid: raise AnsibleLookupError(errors) diff --git a/plugins/lookup/to_paths.py b/plugins/lookup/to_paths.py index 70a9abe..b5b1d53 100644 --- a/plugins/lookup/to_paths.py +++ b/plugins/lookup/to_paths.py @@ -143,8 +143,7 @@ class LookupModule(LookupBase): terms = dict(zip(keys, terms)) terms.update(kwargs) - schema = [v for k, v in globals().items() if k.lower() == "documentation"] - aav = AnsibleArgSpecValidator(data=terms, schema=schema[0], name="to_paths") + aav = AnsibleArgSpecValidator(data=terms, schema=DOCUMENTATION, name="to_paths") valid, errors, updated_data = aav.validate() if not valid: raise AnsibleLookupError(errors) diff --git a/plugins/lookup/validate.py b/plugins/lookup/validate.py index 711c3c9..fbe542c 100644 --- a/plugins/lookup/validate.py +++ b/plugins/lookup/validate.py @@ -107,9 +107,8 @@ class LookupModule(LookupBase): if kwargs.get("engine"): params.update({"engine": kwargs["engine"]}) - schema = [v for k, v in globals().items() if k.lower() == "documentation"] valid, argspec_result, updated_params = check_argspec( - schema=schema[0], + schema=DOCUMENTATION, name="validate lookup", schema_conditionals=ARGSPEC_CONDITIONALS, **params,