Skip to content

Commit 7fa8ec2

Browse files
committed
refactor(schema-validator): rename each Validator
1 parent 33f30d2 commit 7fa8ec2

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

aws_lambda_powertools/utilities/feature_flags/schema.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ def validate(self) -> None:
3333
if not isinstance(self.schema, dict):
3434
raise ConfigurationError(f"Schema must be a dictionary, schema={str(self.schema)}")
3535

36-
features = Features(schema=self.schema)
36+
features = FeaturesValidator(schema=self.schema)
3737
features.validate()
3838

3939

40-
class Features(BaseValidator):
40+
class FeaturesValidator(BaseValidator):
4141
def __init__(self, schema):
4242
self.schema = schema
4343
self.features: Optional[Dict[str, Dict]] = None
@@ -51,7 +51,7 @@ def validate(self):
5151

5252
for name, feature in self.features.items():
5353
self.validate_feature(name, feature)
54-
rules = FeatureRules(feature=feature, feature_name=name)
54+
rules = RulesValidator(feature=feature, feature_name=name)
5555
rules.validate()
5656

5757
@staticmethod
@@ -64,7 +64,7 @@ def validate_feature(name, feature):
6464
raise ConfigurationError(f"'feature_default_value' boolean key must be present, feature_name={name}")
6565

6666

67-
class FeatureRules(BaseValidator):
67+
class RulesValidator(BaseValidator):
6868
def __init__(self, feature: Dict[str, Any], feature_name: str):
6969
self.feature = feature
7070
self.feature_name = feature_name
@@ -80,7 +80,7 @@ def validate(self):
8080

8181
for rule in self.rules:
8282
self.validate_rule(rule, self.feature)
83-
conditions = FeatureRuleConditions(rule=rule, rule_name=rule.get(RULE_NAME_KEY))
83+
conditions = ConditionsValidator(rule=rule, rule_name=rule.get(RULE_NAME_KEY))
8484
conditions.validate()
8585

8686
def validate_rule(self, rule, feature_name):
@@ -106,7 +106,7 @@ def validate_rule_default_value(rule):
106106
raise ConfigurationError(f"'rule_default_value' key must have be bool, rule_name={rule_name}")
107107

108108

109-
class FeatureRuleConditions(BaseValidator):
109+
class ConditionsValidator(BaseValidator):
110110
def __init__(self, rule: Dict[str, Any], rule_name: str):
111111
self.conditions = rule.get(CONDITIONS_KEY, {})
112112
self.rule_name = rule_name

tests/functional/feature_toggles/test_schema_validation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
RULE_DEFAULT_VALUE,
1515
RULE_NAME_KEY,
1616
RULES_KEY,
17-
FeatureRules,
17+
RulesValidator,
1818
SchemaValidator,
1919
)
2020

@@ -327,5 +327,5 @@ def test_validate_rule_invalid_rule_name():
327327
# WHEN calling _validate_rule
328328
# THEN raise ConfigurationError
329329
with pytest.raises(ConfigurationError, match="'rule_name' key must be present*"):
330-
rules_validator = FeatureRules(feature=feature, feature_name="my_feature")
330+
rules_validator = RulesValidator(feature=feature, feature_name="my_feature")
331331
rules_validator.validate_rule_name(rule=rule, feature_name="my_feature")

0 commit comments

Comments
 (0)