internet/community.crypto
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.crypto.git synced 2026-05-06 05:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify error handling, reject empty values outright.

Browse Source
This commit is contained in:
Felix Fontein
2021-10-31 14:28:09 +01:00
parent 2b305459c2
commit d497231e1c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/module_utils/crypto/support.py
View File

@@ -239,23 +239,23 @@ def load_certificate_request(path, content=None, backend='cryptography'):
def parse_name_field(input_dict, name_field_name=None):
"""Take a dict with key: value or key: list_of_values mappings and return a list of tuples"""
error_str = '{key}' if name_field_name is None else '{key} in {name}'
result = []
for key, value in input_dict.items():
if isinstance(value, list):
for entry in value:
if not isinstance(entry, six.string_types):
if name_field_name:
raise TypeError('Values for {key} in {name} must be strings'.format(key=key, name=name_field_name))
raise TypeError('Values for {key} must be strings'.format(key=key))
raise TypeError(('Values %s must be strings' % error_str).format(key=key, name=name_field_name))
if not entry:
raise ValueError(('Values for %s must not be empty strings' % error_str).format(key=key))
result.append((key, entry))
elif isinstance(value, six.string_types):
if not value:
raise ValueError(('Value for %s must not be an empty string' % error_str).format(key=key))
result.append((key, value))
else:
if name_field_name:
raise TypeError(
'Value for {key} in {name} must be either a string or a list of strings'.format(key=key, name=name_field_name))
raise TypeError('Value for {key} must be either a string or a list of strings'.format(key=key))
raise TypeError(('Value for %s must be either a string or a list of strings' % error_str).format(key=key))
return result