valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve config validation logging

Browse Source 
This corrects the formatting on the error messages, and adds an error
condition when a type that should be a str or bool is specified as a
list or dict.
This commit is contained in:
Erik Johnson 2016-02-18 17:45:21 -06:00
parent cd3400e67e
commit 795008bad1
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/config.py
View File

@ -730,22 +730,40 @@ def _validate_opts(opts):
if isinstance(val, VALID_OPTS[key]):
continue
else:
errors.append(err.format(key, val, type(val), 'list'))
errors.append(
err.format(key, val, type(val).__name__, 'list')
)
if isinstance(VALID_OPTS[key](), dict):
if isinstance(val, VALID_OPTS[key]):
continue
else:
errors.append(err.format(key, val, type(val), 'dict'))
errors.append(
err.format(key, val, type(val).__name__, 'dict')
)
else:
try:
VALID_OPTS[key](val)
if isinstance(val, (list, dict)):
# We'll only get here if VALID_OPTS[key] is str or
# bool, and the passed value is a list/dict. Attempting
# to run int() or float() on a list/dict will raise an
# exception, but running str() or bool() on it will
# pass despite not being the correct type.
errors.append(
err.format(
key,
val,
type(val).__name__,
VALID_OPTS[key].__name__
)
)
except ValueError:
errors.append(
err.format(key, val, type(val), VALID_OPTS[key])
err.format(key, val, type(val).__name__, VALID_OPTS[key])
)
except TypeError:
errors.append(
err.format(key, val, type(val), VALID_OPTS[key])
err.format(key, val, type(val).__name__, VALID_OPTS[key])
)
for error in errors: