fix(feature flags): fix handling multiple conditons where first condition matches and other dont

Author: Ran Isenberg

.github/workflows/python_build.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Complexity baseline
         run: make complexity-baseline
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.0.1
+        uses: codecov/codecov-action@v2.0.2
         with:
           file: ./coverage.xml
           # flags: unittests

.github/workflows/python_docs.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - develop
+    paths:
+      - 'docs/**'
+      - 'CHANGELOG.md'
+      - 'mkdocs.yml'
 
 jobs:
   docs:

Makefile

@@ -5,7 +5,7 @@ target:
 	@$(MAKE) pr
 
 dev:
-	pip install --upgrade pip pre-commit poetry==1.1.4
+	pip install --upgrade pip pre-commit poetry
 	poetry install --extras "pydantic"
 	pre-commit install
 

aws_lambda_powertools/utilities/feature_flags/feature_flags.py

@@ -64,6 +64,13 @@ def _evaluate_conditions(
         rule_match_value = rule.get(schema.RULE_MATCH_VALUE)
         conditions = cast(List[Dict], rule.get(schema.CONDITIONS_KEY))
 
+        if not conditions:
+            logger.debug(
+                f"rule did not match, no conditions to match, rule_name={rule_name}, rule_value={rule_match_value}, "
+                f"name={feature_name} "
+            )
+            return False
+
         for condition in conditions:
             context_value = context.get(str(condition.get(schema.CONDITION_KEY)))
             cond_action = condition.get(schema.CONDITION_ACTION, "")
@@ -76,9 +83,8 @@ def _evaluate_conditions(
                 )
                 return False  # context doesn't match condition
 
-            logger.debug(f"rule matched, rule_name={rule_name}, rule_value={rule_match_value}, name={feature_name}")
-            return True
-        return False
+        logger.debug(f"rule matched, rule_name={rule_name}, rule_value={rule_match_value}, name={feature_name}")
+        return True
 
     def _evaluate_rules(
         self, *, feature_name: str, context: Dict[str, Any], feat_default: bool, rules: Dict[str, Any]
@@ -238,6 +244,7 @@ def get_enabled_features(self, *, context: Optional[Dict[str, Any]] = None) -> L
             logger.debug(f"Failed to fetch feature flags from store, returning empty list, reason={err}")
             return features_enabled
 
+        logger.debug("Evaluating all features")
         for name, feature in features.items():
             rules = feature.get(schema.RULES_KEY, {})
             feature_default_value = feature.get(schema.FEATURE_DEFAULT_VAL_KEY)

poetry.lock

@@ -42,14 +42,14 @@ flake8-variables-names = "^0.0.4"
 isort = "^5.9.3"
 pytest-cov = "^2.12.1"
 pytest-mock = "^3.5.1"
-pdoc3 = "^0.9.2"
+pdoc3 = "^0.10.0"
 pytest-asyncio = "^0.15.1"
 bandit = "^1.7.0"
 radon = "^4.5.0"
 xenon = "^0.7.3"
 flake8-eradicate = "^1.1.0"
 flake8-bugbear = "^21.3.2"
-mkdocs-material = "^7.2.1"
+mkdocs-material = "^7.2.3"
 mkdocs-git-revision-date-plugin = "^0.3.1"
 mike = "^0.6.0"
 mypy = "^0.910"

pyproject.toml

@@ -121,6 +121,44 @@ def test_flags_conditions_no_match(mocker, config):
 
 
 # check that a rule can match when it has multiple conditions, see rule name for further explanation
+def test_flags_conditions_rule_not_match_multiple_conditions_match_only_one_condition(mocker, config):
+    expected_value = True
+    tenant_id_val = "6"
+    username_val = "a"
+    mocked_app_config_schema = {
+        "my_feature": {
+            "default": True,
+            "rules": {
+                "tenant id equals 6 and username is a": {
+                    "when_match": False,
+                    "conditions": [
+                        {
+                            "action": RuleAction.EQUALS.value,  # this condition matches
+                            "key": "tenant_id",
+                            "value": tenant_id_val,
+                        },
+                        {
+                            "action": RuleAction.EQUALS.value,  # this condition does not
+                            "key": "username",
+                            "value": "bbb",
+                        },
+                    ],
+                }
+            },
+        }
+    }
+    feature_flags = init_feature_flags(mocker, mocked_app_config_schema, config)
+    toggle = feature_flags.evaluate(
+        name="my_feature",
+        context={
+            "tenant_id": tenant_id_val,
+            "username": username_val,
+        },
+        default=True,
+    )
+    assert toggle == expected_value
+
+
 def test_flags_conditions_rule_match_equal_multiple_conditions(mocker, config):
     expected_value = False
     tenant_id_val = "6"