diff --git a/static/js/core-config-setup.js b/static/js/core-config-setup.js index d99ef4e7b..bc208ef5a 100644 --- a/static/js/core-config-setup.js +++ b/static/js/core-config-setup.js @@ -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; }}, ]; diff --git a/util/config/validator.py b/util/config/validator.py index 1c66ac5fa..dda3bd666 100644 --- a/util/config/validator.py +++ b/util/config/validator.py @@ -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): diff --git a/util/config/validators/test/test_validate_actionlog_archiving.py b/util/config/validators/test/test_validate_actionlog_archiving.py index 915de58d1..c14555441 100644 --- a/util/config/validators/test/test_validate_actionlog_archiving.py +++ b/util/config/validators/test/test_validate_actionlog_archiving.py @@ -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) diff --git a/util/config/validators/validate_actionlog_achiving.py b/util/config/validators/validate_actionlog_archiving.py similarity index 91% rename from util/config/validators/validate_actionlog_achiving.py rename to util/config/validators/validate_actionlog_archiving.py index f6d1d5eba..e8fb79a50 100644 --- a/util/config/validators/validate_actionlog_achiving.py +++ b/util/config/validators/validate_actionlog_archiving.py @@ -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):