jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch non-unique errors

Browse source 
When a schema type is set as unique, we should display the validation
error to indicate that non-unique values have been provided for a key.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-08-10 16:57:32 +01:00
commit df14a4384d
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compose/config/validation.py
View file

@ -59,6 +59,7 @@ def process_errors(errors):
invalid_keys = []
required = []
type_errors = []
other_errors = []
for error in errors:
# handle root level errors
@ -115,8 +116,15 @@ def process_errors(errors):
required_keys = ",".join(error.validator_value[dependency_key])
required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
dependency_key, service_name, dependency_key, required_keys))
else:
# pop the service name off our path
error.path.popleft()
return "\n".join(root_msgs + invalid_keys + required + type_errors)
config_key = " ".join(["'%s'" % k for k in error.path])
err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message)
other_errors.append(err_msg)
return "\n".join(root_msgs + invalid_keys + required + type_errors + other_errors)
def validate_against_schema(config):