ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Recursively remove args with omit as as their value, to match suboptions in argument_spec (#35299)

Browse source 
* Recursively remove args with omit as as their value, to match suboptions in argument_spec

* Add test for the new remove_omit function
This commit is contained in:
Matt Martz 2018-01-26 11:07:04 -06:00 • committed by Adam Miller
parent 1a4efca83c
commit 7404dc6767
2 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/executor/task_executor.py
View file

@ -35,6 +35,24 @@ except ImportError:
__all__ = ['TaskExecutor']
def remove_omit(task_args, omit_token):
'''
Remove args with a value equal to the ``omit_token`` recursively
to align with now having suboptions in the argument_spec
'''
new_args = {}
for i in iteritems(task_args):
if i[1] == omit_token:
continue
elif isinstance(i[1], dict):
new_args[i[0]] = remove_omit(i[1], omit_token)
else:
new_args[i[0]] = i[1]
return new_args
class TaskExecutor:
'''
@ -494,7 +512,7 @@ class TaskExecutor:
# And filter out any fields which were set to default(omit), and got the omit token value
omit_token = variables.get('omit')
if omit_token is not None:
self._task.args = dict((i[0], i[1]) for i in iteritems(self._task.args) if i[1] != omit_token)
self._task.args = remove_omit(self._task.args, omit_token)
# Read some values from the task, so that we can modify them if need be
if self._task.until: