refactor(schema): remove 'features' key

Author: heitorlessa

aws_lambda_powertools/utilities/feature_flags/feature_flags.py

@@ -121,7 +121,7 @@ def get_configuration(self) -> Union[Dict[str, Dict], Dict]:
         validator = schema.SchemaValidator(schema=config)
         validator.validate()
 
-        return config.get(schema.FEATURES_KEY, {})
+        return config
 
     def evaluate(self, *, name: str, context: Optional[Dict[str, Any]] = None, default: bool) -> bool:
         """Get a feature toggle boolean value. Value is calculated according to a set of rules and conditions.
@@ -154,8 +154,8 @@ def evaluate(self, *, name: str, context: Optional[Dict[str, Any]] = None, defau
 
         try:
             features = self.get_configuration()
-        except ConfigurationError:
-            logger.debug("Unable to get feature toggles JSON, returning provided default value")
+        except ConfigurationError as err:
+            logger.debug(f"Unable to get feature toggles JSON, returning provided default value, reason={err}")
             return default
 
         feature = features.get(name)
@@ -165,9 +165,9 @@ def evaluate(self, *, name: str, context: Optional[Dict[str, Any]] = None, defau
             )
             return default
 
-        rules_list = feature.get(schema.RULES_KEY)
+        rules = feature.get(schema.RULES_KEY)
         feature_default_value = feature.get(schema.FEATURE_DEFAULT_VAL_KEY)
-        if not rules_list:
+        if not rules:
             # no rules but value
             logger.debug(
                 f"no rules found, returning feature default value, name={name}, "
@@ -181,7 +181,7 @@ def evaluate(self, *, name: str, context: Optional[Dict[str, Any]] = None, defau
             feature_name=name,
             context=context,
             feature_default_value=bool(feature_default_value),
-            rules=cast(List, rules_list),
+            rules=rules,
         )
 
     def get_enabled_features(self, *, context: Optional[Dict[str, Any]] = None) -> List[str]:

aws_lambda_powertools/utilities/feature_flags/schema.py

@@ -7,7 +7,6 @@
 
 logger = logging.getLogger(__name__)
 
-FEATURES_KEY = "features"
 RULES_KEY = "rules"
 FEATURE_DEFAULT_VAL_KEY = "default"
 CONDITIONS_KEY = "conditions"
@@ -30,7 +29,7 @@ def __init__(self, schema: Dict[str, Any]):
 
     def validate(self) -> None:
         if not isinstance(self.schema, dict):
-            raise ConfigurationError(f"Schema must be a dictionary, schema={str(self.schema)}")
+            raise ConfigurationError(f"Features must be a dictionary, schema={str(self.schema)}")
 
         features = FeaturesValidator(schema=self.schema)
         features.validate()
@@ -39,13 +38,9 @@ def validate(self) -> None:
 class FeaturesValidator(BaseValidator):
     def __init__(self, schema: Dict):
         self.schema = schema
-        self.features: Optional[Dict[str, Dict]] = self.schema.get(FEATURES_KEY)
 
     def validate(self):
-        if not isinstance(self.features, dict):
-            raise ConfigurationError(f"'features' key must be a dictionary, schema={self.schema}")
-
-        for name, feature in self.features.items():
+        for name, feature in self.schema.items():
             self.validate_feature(name, feature)
             rules = RulesValidator(feature=feature)
             rules.validate()