github/ansible-later
0
0
Fork 0
mirror of https://github.com/thegeeklab/ansible-later.git synced 2024-11-25 14:20:45 +00:00
Code Issues Projects Releases Wiki Activity

fix issue with conflicting action statements

Browse Source 
This PR will address https://github.com/xoxys/ansible-later/issues/35.

Collected metadata will be temp. removed from the raw task dict before
passing it to Ansibles `ModuleArgsParser` class. After processing, the
metadata will be added back to the result dict.
This commit is contained in:
Robert Kaussow 2020-09-26 14:13:09 +02:00
parent 79398d95b4
commit 8a4d291342
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ansiblelater/utils/yamlhelper.py
View File

@ -396,16 +396,26 @@ def _kv_to_dict(v):
def normalize_task(task, filename, custom_modules=[]): def normalize_task(task, filename, custom_modules=[]):
"""Ensure tasks have an action key and strings are converted to python objects.""" """Ensure tasks have an action key and strings are converted to python objects."""
ansible_action_type = task.get("__ansible_action_type__", "task") ansible_action_type = task.get("__ansible_action_type__", "task")
ansible_action_meta = task.get("__ansible_action_meta__", dict())
if "__ansible_action_type__" in task: if "__ansible_action_type__" in task:
del (task["__ansible_action_type__"]) del (task["__ansible_action_type__"])
# temp. extract metadata
ansible_meta = dict()
for key in ["__line__", "__file__", "__ansible_action_meta__"]:
default = None
if key == "__ansible_action_meta__":
default = dict()
ansible_meta[key] = task.pop(key, default)
normalized = dict() normalized = dict()
# TODO: Workaround for custom modules
builtin = list(ansible.parsing.mod_args.BUILTIN_TASKS) builtin = list(ansible.parsing.mod_args.BUILTIN_TASKS)
builtin = list(set(builtin + custom_modules)) builtin = list(set(builtin + custom_modules))
ansible.parsing.mod_args.BUILTIN_TASKS = frozenset(builtin) ansible.parsing.mod_args.BUILTIN_TASKS = frozenset(builtin)
mod_arg_parser = ModuleArgsParser(task) mod_arg_parser = ModuleArgsParser(task)
try: try:
action, arguments, normalized["delegate_to"] = mod_arg_parser.parse() action, arguments, normalized["delegate_to"] = mod_arg_parser.parse()
except AnsibleParserError as e: except AnsibleParserError as e:
@ -435,7 +445,12 @@ def normalize_task(task, filename, custom_modules=[]):
normalized[FILENAME_KEY] = filename normalized[FILENAME_KEY] = filename
normalized["__ansible_action_type__"] = ansible_action_type normalized["__ansible_action_type__"] = ansible_action_type
normalized["__ansible_action_meta__"] = ansible_action_meta
# add back extracted metadata
for (k, v) in ansible_meta.items():
if v:
normalized[k] = v
return normalized return normalized