Skip to content

Remove max_allowed value from ValidationError error message #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vz10 merged 1 commit into from
Jan 27, 2021
Merged

Remove max_allowed value from ValidationError error message #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-Validator-69448.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "Validator",
"description": "Fix showing incorrect max-value in error message for range and length value validation"
}
22 changes: 9 additions & 13 deletions botocore/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ def _type_check(param, errors, name):
def range_check(name, value, shape, error_type, errors):
failed = False
min_allowed = float('-inf')
max_allowed = float('inf')
if 'min' in shape.metadata:
min_allowed = shape.metadata['min']
if value < min_allowed:
Expand All @@ -82,8 +81,7 @@ def range_check(name, value, shape, error_type, errors):
if value < min_allowed:
failed = True
if failed:
errors.report(name, error_type, param=value,
valid_range=[min_allowed, max_allowed])
errors.report(name, error_type, param=value, min_allowed=min_allowed)


class ValidationErrors(object):
Expand Down Expand Up @@ -117,17 +115,15 @@ def _format_error(self, error):
str(type(additional['param'])),
', '.join(additional['valid_types']))
elif error_type == 'invalid range':
min_allowed = additional['valid_range'][0]
max_allowed = additional['valid_range'][1]
return ('Invalid range for parameter %s, value: %s, valid range: '
'%s-%s' % (name, additional['param'],
min_allowed, max_allowed))
min_allowed = additional['min_allowed']
return ('Invalid value for parameter %s, value: %s, '
'valid min value: %s' % (name, additional['param'],
min_allowed))
elif error_type == 'invalid length':
min_allowed = additional['valid_range'][0]
max_allowed = additional['valid_range'][1]
return ('Invalid length for parameter %s, value: %s, valid range: '
'%s-%s' % (name, additional['param'],
min_allowed, max_allowed))
min_allowed = additional['min_allowed']
return ('Invalid length for parameter %s, value: %s, '
'valid min length: %s' % (name, additional['param'],
min_allowed))
elif error_type == 'unable to encode to json':
return 'Invalid parameter %s must be json serializable: %s' \
% (name, additional['type_error'])
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ def test_less_than_range(self):
'Long': -10,
},
errors=[
'Invalid range for parameter Int',
'Invalid range for parameter Long',
'Invalid value for parameter Int',
'Invalid value for parameter Long',
]
)

Expand Down Expand Up @@ -423,7 +423,7 @@ def test_range_float(self):
'Float': 1,
},
errors=[
'Invalid range for parameter Float',
'Invalid value for parameter Float',
]
)

Expand All @@ -441,7 +441,7 @@ def test_decimal_still_validates_range(self):
'Float': decimal.Decimal('1'),
},
errors=[
'Invalid range for parameter Float',
'Invalid value for parameter Float',
]
)

Expand Down