tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up error.path handling

Browse Source 
Tiny bit of refactoring to make it clearer and only pop service_name
once.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-08-10 17:12:37 +01:00
parent df14a4384d
commit 68de84a0bf
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compose/config/validation.py
View File

@ -78,6 +78,9 @@ def process_errors(errors):
# handle service level errors # handle service level errors
service_name = error.path[0] service_name = error.path[0]
# pop the service name off our path
error.path.popleft()
if error.validator == 'additionalProperties': if error.validator == 'additionalProperties':
invalid_config_key = _parse_key_from_error_msg(error) invalid_config_key = _parse_key_from_error_msg(error)
invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key)) invalid_keys.append(get_unsupported_config_msg(service_name, invalid_config_key))
@ -89,7 +92,7 @@ def process_errors(errors):
else: else:
required.append(_clean_error_message(error.message)) required.append(_clean_error_message(error.message))
elif error.validator == 'oneOf': elif error.validator == 'oneOf':
config_key = error.path[1] config_key = error.path[0]
valid_types = [context.validator_value for context in error.context] valid_types = [context.validator_value for context in error.context]
valid_type_msg = " or ".join(valid_types) valid_type_msg = " or ".join(valid_types)
type_errors.append("Service '{}' configuration key '{}' contains an invalid type, it should be either {}".format( type_errors.append("Service '{}' configuration key '{}' contains an invalid type, it should be either {}".format(
@ -100,16 +103,13 @@ def process_errors(errors):
if error.validator_value == "array": if error.validator_value == "array":
msg = "an" msg = "an"
# pop the service name off our path
error.path.popleft()
if len(error.path) > 0: if len(error.path) > 0:
config_key = " ".join(["'%s'" % k for k in error.path]) config_key = " ".join(["'%s'" % k for k in error.path])
type_errors.append("Service '{}' configuration key {} contains an invalid type, it should be {} {}".format(service_name, config_key, msg, error.validator_value)) type_errors.append("Service '{}' configuration key {} contains an invalid type, it should be {} {}".format(service_name, config_key, msg, error.validator_value))
else: else:
root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(service_name)) root_msgs.append("Service '{}' doesn\'t have any configuration options. All top level keys in your docker-compose.yml must map to a dictionary of configuration options.'".format(service_name))
elif error.validator == 'required': elif error.validator == 'required':
config_key = error.path[1] config_key = error.path[0]
required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message))) required.append("Service '{}' option '{}' is invalid, {}".format(service_name, config_key, _clean_error_message(error.message)))
elif error.validator == 'dependencies': elif error.validator == 'dependencies':
dependency_key = error.validator_value.keys()[0] dependency_key = error.validator_value.keys()[0]
@ -117,9 +117,6 @@ def process_errors(errors):
required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format( required.append("Invalid '{}' configuration for '{}' service: when defining '{}' you must set '{}' as well".format(
dependency_key, service_name, dependency_key, required_keys)) dependency_key, service_name, dependency_key, required_keys))
else: else:
# pop the service name off our path
error.path.popleft()
config_key = " ".join(["'%s'" % k for k in error.path]) config_key = " ".join(["'%s'" % k for k in error.path])
err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message) err_msg = "Service '{}' configuration key {} value {}".format(service_name, config_key, error.message)
other_errors.append(err_msg) other_errors.append(err_msg)