zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 03:51:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

make extra var YAML serialization more robust to non-dict extra vars

Browse Source
This commit is contained in:
Ryan Petrello
2018-04-17 15:39:37 -04:00
parent fe47b75aad
commit 835f2eebc3
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
awx/main/utils/safe_yaml.py
View File

@@ -50,21 +50,25 @@ def safe_dump(x, safe_dict=None):
a: b
!unsafe 'c': !unsafe 'd'
"""
yamls = []
safe_dict = safe_dict or {}
# Compare the top level keys so that we can find values that have
# equality matches (and consider those branches safe)
for k, v in x.items():
dumper = yaml.SafeDumper
if safe_dict.get(k) != v:
dumper = SafeStringDumper
yamls.append(yaml.dump_all(
[{k: v}],
None,
Dumper=dumper,
default_flow_style=False,
))
return ''.join(yamls)
if isinstance(x, dict):
yamls = []
safe_dict = safe_dict or {}
# Compare the top level keys so that we can find values that have
# equality matches (and consider those branches safe)
for k, v in x.items():
dumper = yaml.SafeDumper
if safe_dict.get(k) != v:
dumper = SafeStringDumper
yamls.append(yaml.dump_all(
[{k: v}],
None,
Dumper=dumper,
default_flow_style=False,
))
return ''.join(yamls)
else:
return yaml.dump_all([x], None, Dumper=SafeStringDumper, default_flow_style=False)
def sanitize_jinja(arg):