formatting fix

Author: Ran Isenberg

aws_lambda_powertools/utilities/feature_toggles/configuration_store.py

@@ -48,8 +48,8 @@ def __init__(
         self._conf_name = conf_name
         self._conf_store = AppConfigProvider(environment=environment, application=service, config=config)
 
-    def _validate_json_schema(self, schema: str) -> bool:
-        ## todo
+    def _validate_json_schema(self, schema: Dict[str, Any]) -> bool:
+        #
         return True
 
     def _match_by_action(self, action: str, restriction_value: Any, context_value: Any) -> bool:
@@ -138,27 +138,28 @@ def get_feature_toggle(self, *, feature_name: str, rules_context: Dict[str, Any]
             feature_name (str): feature name that you wish to fetch
             rules_context (Dict[str, Any]): dict of attributes that you would like to match the rules
                                             against, can be {'tenant_id: 'X', 'username':' 'Y', 'region': 'Z'} etc.
-            value_if_missing (bool): this will be the returned value in case the feature toggle doesn't exist in the schema
-                                  or there has been an error while fetching the configuration from appconfig
+            value_if_missing (bool): this will be the returned value in case the feature toggle doesn't exist in
+                                     the schema or there has been an error while fetching the
+                                    configuration from appconfig
 
         Returns:
             bool: calculated feature toggle value. several possibilities:
                 1. if the feature doesn't appear in the schema or there has been an error fetching the
-                   configuration -> warning log would appear and value_if_missing is returned
+                   configuration -> error/warning log would appear and value_if_missing is returned
                 2. feature exists and has no rules or no rules have matched -> return feature_default_value of
                    the defined feature
                 3. feature exists and a rule matches -> rule_default_value of rule is returned
         """
         try:
             toggles_dict: Dict[str, Any] = self.get_configuration()
         except ConfigurationException:
-            logger.warning("unable to get feature toggles JSON, returning provided default value")
-            return default_value
+            logger.error("unable to get feature toggles JSON, returning provided value_if_missing value")  # noqa: E501
+            return value_if_missing
 
         feature: Dict[str, Dict] = toggles_dict.get(FEATURES_KEY, {}).get(feature_name, None)
         if feature is None:
             logger.warning(
-                f"feature does not appear in configuration, using provided default value, feature_name={feature_name}, value_if_missing={value_if_missing}"  # noqa: E501
+                f"feature does not appear in configuration, using provided value_if_missing, feature_name={feature_name}, value_if_missing={value_if_missing}"  # noqa: E501
             )
             return value_if_missing
 
@@ -175,5 +176,8 @@ def get_feature_toggle(self, *, feature_name: str, rules_context: Dict[str, Any]
             f"looking for rule match,  feature_name={feature_name}, feature_default_value={feature_default_value}"
         )  # noqa: E501
         return self._handle_rules(
-            feature_name=feature_name, rules_context=rules_context, feature_default_value=feature_default_value, rules=rules_list
+            feature_name=feature_name,
+            rules_context=rules_context,
+            feature_default_value=feature_default_value,
+            rules=rules_list,
         )

tests/functional/feature_toggles/test_feature_toggles.py

@@ -29,7 +29,6 @@ def init_configuration_store(mocker, mock_schema: Dict, config: Config) -> Confi
 def test_toggles_rule_does_not_match(mocker, config):
     expected_value = "True"
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_value,
@@ -59,7 +58,7 @@ def test_toggles_rule_does_not_match(mocker, config):
 # you get the default value of False that was sent to the get_feature_toggle API
 def test_toggles_no_restrictions_feature_does_not_exist(mocker, config):
     expected_value = False
-    mocked_app_config_schema = {"log_level": "DEBUG", "features": {"my_fake_feature": {"feature_default_value": "True"}}}
+    mocked_app_config_schema = {"features": {"my_fake_feature": {"feature_default_value": "True"}}}
 
     conf_store = init_configuration_store(mocker, mocked_app_config_schema, config)
     toggle = conf_store.get_feature_toggle(feature_name="my_feature", rules_context={}, value_if_missing=expected_value)
@@ -70,7 +69,7 @@ def test_toggles_no_restrictions_feature_does_not_exist(mocker, config):
 # default value is False but the feature has a True default_value.
 def test_toggles_no_rules(mocker, config):
     expected_value = "True"
-    mocked_app_config_schema = {"log_level": "DEBUG", "features": {"my_feature": {"feature_default_value": expected_value}}}
+    mocked_app_config_schema = {"features": {"my_feature": {"feature_default_value": expected_value}}}
     conf_store = init_configuration_store(mocker, mocked_app_config_schema, config)
     toggle = conf_store.get_feature_toggle(
         feature_name="my_feature", rules_context={"tenant_id": "6", "username": "a"}, value_if_missing=False
@@ -82,7 +81,6 @@ def test_toggles_no_rules(mocker, config):
 def test_toggles_restrictions_no_match(mocker, config):
     expected_value = "True"
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_value,
@@ -117,7 +115,6 @@ def test_toggles_restrictions_rule_match_equal_multiple_restrictions(mocker, con
     tenant_id_val = "6"
     username_val = "a"
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": "True",
@@ -160,7 +157,6 @@ def test_toggles_restrictions_rule_match_equal_multiple_restrictions(mocker, con
 def test_toggles_restrictions_no_rule_match_equal_multiple_restrictions(mocker, config):
     expected_val = "True"
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_val,
@@ -199,7 +195,6 @@ def test_toggles_restrictions_rule_match_multiple_actions_multiple_rules_multipl
     expected_value_third_check = "False"
     expected_value_fourth_case = False
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_value_third_check,
@@ -281,7 +276,6 @@ def test_toggles_restrictions_rule_match_multiple_actions_multiple_rules_multipl
 def test_toggles_match_rule_with_contains_action(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_value,
@@ -313,7 +307,6 @@ def test_toggles_match_rule_with_contains_action(mocker, config):
 def test_toggles_no_match_rule_with_contains_action(mocker, config):
     expected_value = False
     mocked_app_config_schema = {
-        "log_level": "DEBUG",
         "features": {
             "my_feature": {
                 "feature_default_value": expected_value,