This commit is contained in:
Joseph Schorr 2017-07-10 18:35:51 +03:00
parent 661c0e6432
commit a13235c032
4 changed files with 9 additions and 9 deletions

View file

@ -81,7 +81,7 @@ angular.module("core-config-setup", ['angularFileUpload'])
return $scope.getOIDCProviders(config).length > 0;
}},
{'id': 'actionlogachiving', 'title': 'Action Log Rotation', 'condition': function(config) {
{'id': 'actionlogarchiving', 'title': 'Action Log Rotation', 'condition': function(config) {
return config.FEATURE_ACTION_LOG_ROTATION;
}},
];

View file

@ -21,7 +21,7 @@ from util.config.validators.validate_github import GitHubLoginValidator, GitHubT
from util.config.validators.validate_oidc import OIDCLoginValidator
from util.config.validators.validate_timemachine import TimeMachineValidator
from util.config.validators.validate_access import AccessSettingsValidator
from util.config.validators.validate_actionlog_achiving import ActionLogAchivingValidator
from util.config.validators.validate_actionlog_archiving import ActionLogArchivingValidator
logger = logging.getLogger(__name__)
@ -58,7 +58,7 @@ VALIDATORS = {
OIDCLoginValidator.name: OIDCLoginValidator.validate,
TimeMachineValidator.name: TimeMachineValidator.validate,
AccessSettingsValidator.name: AccessSettingsValidator.validate,
ActionLogAchivingValidator.name: ActionLogAchivingValidator.validate,
ActionLogArchivingValidator.name: ActionLogArchivingValidator.validate,
}
def validate_service_for_config(service, config, password=None):

View file

@ -1,7 +1,7 @@
import pytest
from util.config.validators import ConfigValidationException
from util.config.validators.validate_actionlog_achiving import ActionLogAchivingValidator
from util.config.validators.validate_actionlog_archiving import ActionLogArchivingValidator
from test.fixtures import *
@ -11,7 +11,7 @@ from test.fixtures import *
({'ACTION_LOG_ARCHIVE_LOCATION': ''}),
])
def test_skip_validate_actionlog(unvalidated_config, app):
validator = ActionLogAchivingValidator()
validator = ActionLogArchivingValidator()
validator.validate(unvalidated_config, None, None)
@ -30,7 +30,7 @@ def test_skip_validate_actionlog(unvalidated_config, app):
'Action log archive storage location `invalid` not found in storage config'),
])
def test_invalid_config(config, expected_error, app):
validator = ActionLogAchivingValidator()
validator = ActionLogArchivingValidator()
with pytest.raises(ConfigValidationException) as ipe:
validator.validate(config, None, None)
@ -47,5 +47,5 @@ def test_valid_config(app):
},
}
validator = ActionLogAchivingValidator()
validator = ActionLogArchivingValidator()
validator.validate(config, None, None)

View file

@ -1,7 +1,7 @@
from util.config.validators import BaseValidator, ConfigValidationException
class ActionLogAchivingValidator(BaseValidator):
name = "actionlogachiving"
class ActionLogArchivingValidator(BaseValidator):
name = "actionlogarchiving"
@classmethod
def validate(cls, config, user, user_password):