summaryrefslogtreecommitdiffstats
path: root/library/modify_yaml.py
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-12-19 12:19:12 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-12-19 12:28:31 -0500
commit9db2a1330f620fd0ce0198d714a09f078e598fdf (patch)
tree123db7d6909634659f9f997e4332b05c9d0c7b7a /library/modify_yaml.py
parentb8109cdf7e909eb6a255c795a99b078b850f49f0 (diff)
downloadopenshift-9db2a1330f620fd0ce0198d714a09f078e598fdf.tar.gz
openshift-9db2a1330f620fd0ce0198d714a09f078e598fdf.tar.bz2
openshift-9db2a1330f620fd0ce0198d714a09f078e598fdf.tar.xz
openshift-9db2a1330f620fd0ce0198d714a09f078e598fdf.zip
modify_yaml: handle None value during update.
Diffstat (limited to 'library/modify_yaml.py')
-rwxr-xr-xlibrary/modify_yaml.py26
1 files changed, 15 insertions, 11 deletions
diff --git a/library/modify_yaml.py b/library/modify_yaml.py
index 000c7d9a2..0805f01ec 100755
--- a/library/modify_yaml.py
+++ b/library/modify_yaml.py
@@ -25,15 +25,22 @@ EXAMPLES = '''
def set_key(yaml_data, yaml_key, yaml_value):
changes = []
ptr = yaml_data
+ final_key = yaml_key.split('.')[-1]
for key in yaml_key.split('.'):
- if key not in ptr and key != yaml_key.split('.')[-1]:
+ # Key isn't present and we're not on the final key. Set to empty dictionary.
+ if key not in ptr and key != final_key:
ptr[key] = {}
ptr = ptr[key]
- elif key == yaml_key.split('.')[-1]:
+ # Current key is the final key. Update value.
+ elif key == final_key:
if (key in ptr and module.safe_eval(ptr[key]) != yaml_value) or (key not in ptr): # noqa: F405
ptr[key] = yaml_value
changes.append((yaml_key, yaml_value))
else:
+ # Next value is None and we're not on the final key.
+ # Turn value into an empty dictionary.
+ if ptr[key] is None and key != final_key:
+ ptr[key] = {}
ptr = ptr[key]
return changes
@@ -71,21 +78,18 @@ def main():
yaml.add_representer(type(None), none_representer)
try:
-
- yaml_file = open(dest)
- yaml_data = yaml.safe_load(yaml_file.read())
- yaml_file.close()
+ with open(dest) as yaml_file:
+ yaml_data = yaml.safe_load(yaml_file.read())
changes = set_key(yaml_data, yaml_key, yaml_value)
if len(changes) > 0:
if backup:
module.backup_local(dest)
- yaml_file = open(dest, 'w')
- yaml_string = yaml.dump(yaml_data, default_flow_style=False)
- yaml_string = yaml_string.replace('\'\'', '""')
- yaml_file.write(yaml_string)
- yaml_file.close()
+ with open(dest, 'w') as yaml_file:
+ yaml_string = yaml.dump(yaml_data, default_flow_style=False)
+ yaml_string = yaml_string.replace('\'\'', '""')
+ yaml_file.write(yaml_string)
return module.exit_json(changed=(len(changes) > 0), changes=changes)