vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix time machine config validator on old-style config

Browse source 
Existing config won't have the keys defined, so make sure we skip in that case (and just use the defaults)
This commit is contained in:
Joseph Schorr 2017-04-27 14:24:47 -04:00
parent 66b98e5380
commit 4ea4ee3aa4
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
util/config/validators/test/test_validate_timemachine.py
View file

@ -2,7 +2,13 @@ import pytest
from util.config.validators import ConfigValidationException from util.config.validators import ConfigValidationException
from util.config.validators.validate_timemachine import TimeMachineValidator from util.config.validators.validate_timemachine import TimeMachineValidator
from util.morecollections import AttrDict
@pytest.mark.parametrize('unvalidated_config', [
({}),
])
def test_validate_noop(unvalidated_config):
TimeMachineValidator.validate(unvalidated_config, None, None)
@pytest.mark.parametrize('default_exp,options,expected_exception', [ @pytest.mark.parametrize('default_exp,options,expected_exception', [
('2d', ['1w', '2d'], None), ('2d', ['1w', '2d'], None),

8
util/config/validators/validate_timemachine.py
View file

@ -10,15 +10,19 @@ class TimeMachineValidator(BaseValidator):
@classmethod @classmethod
def validate(cls, config, user, user_password): def validate(cls, config, user, user_password):
if not 'DEFAULT_TAG_EXPIRATION' in config:
# Old style config
return
try: try:
convert_to_timedelta(config['DEFAULT_TAG_EXPIRATION']).total_seconds() convert_to_timedelta(config['DEFAULT_TAG_EXPIRATION']).total_seconds()
except ValueError as ve: except ValueError as ve:
raise ConfigValidationException('Invalid default expiration: %s' % ve.message) raise ConfigValidationException('Invalid default expiration: %s' % ve.message)
if not config['DEFAULT_TAG_EXPIRATION'] in config['TAG_EXPIRATION_OPTIONS']: if not config['DEFAULT_TAG_EXPIRATION'] in config.get('TAG_EXPIRATION_OPTIONS', []):
raise ConfigValidationException('Default expiration must be in expiration options set') raise ConfigValidationException('Default expiration must be in expiration options set')
for ts in config['TAG_EXPIRATION_OPTIONS']: for ts in config.get('TAG_EXPIRATION_OPTIONS', []):
try: try:
convert_to_timedelta(ts) convert_to_timedelta(ts)
except ValueError as ve: except ValueError as ve: