ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Support list of dicts with omit. Fixes #45907 (#45923)

Browse source
This commit is contained in:
Matt Martz 2018-11-07 13:41:22 -06:00 committed by GitHub
parent 17b3171917
commit 0d068f1e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/omit-list-of-dicts.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- omit - support list types containing dicts (https://github.com/ansible/ansible/issues/45907)

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

@ -42,13 +42,18 @@ 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 = {}
if not isinstance(task_args, dict):
return task_args
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)
elif isinstance(i[1], list):
new_args[i[0]] = [remove_omit(v, omit_token) for v in i[1]]
else:
new_args[i[0]] = i[1]

12
test/units/executor/test_task_executor.py
View file

@ -502,6 +502,14 @@ class TestTaskExecutor(unittest.TestCase):
'a_list': ['POPCORN'],
},
'a_list': ['POPCORN'],
'list_of_lists': [
['some', 'thing'],
],
'list_of_dicts': [
{
'remove': 'POPCORN',
}
],
}
expected = {
@ -516,6 +524,10 @@ class TestTaskExecutor(unittest.TestCase):
'a_list': ['POPCORN'],
},
'a_list': ['POPCORN'],
'list_of_lists': [
['some', 'thing'],
],
'list_of_dicts': [{}],
}
self.assertEqual(remove_omit(data, omit_token), expected)