ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 12:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Properly handle FieldAttribute.default if callable (#48992)

Browse source 
* Properly handle FieldAttribute.default if callable

Fixes #48673

* Add changelog...

* Add integration test

* Add aliases file
This commit is contained in:
Martin Krizek 2018-11-26 18:14:46 +01:00 • committed by GitHub
commit 48ffd8789f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/base.py
View file

@ -363,7 +363,10 @@ class FieldAttributeBase(with_metaclass(BaseMeta, object)):
# if this evaluated to the omit value, set the value back to
# the default specified in the FieldAttribute and move on
if omit_value is not None and value == omit_value:
setattr(self, name, attribute.default)
if callable(attribute.default):
setattr(self, name, attribute.default())
else:
setattr(self, name, attribute.default)
continue
# and make sure the attribute is of the type it should be
@ -546,7 +549,10 @@ class FieldAttributeBase(with_metaclass(BaseMeta, object)):
if name in data:
setattr(self, name, data[name])
else:
setattr(self, name, attribute.default)
if callable(attribute.default):
setattr(self, name, attribute.default())
else:
setattr(self, name, attribute.default)
# restore the UUID field
setattr(self, '_uuid', data.get('uuid'))