Merge branch 'develop' of https://github.com/awslabs/aws-lambda-powertools-python into docs/feature-toggle-examples

* 'develop' of https://github.com/awslabs/aws-lambda-powertools-python:
  chore(deps): bump boto3 from 1.18.15 to 1.18.17 (#597)
  feat(feature flags): Add not_in action and rename contains to in (#589)
  chore(deps-dev): bump mkdocs-material from 7.2.2 to 7.2.3 (#596)
  chore(deps): bump boto3 from 1.18.1 to 1.18.15 (#591)
  chore(deps): bump codecov/codecov-action from 2.0.1 to 2.0.2 (#558)
  fix(deps): bump poetry to latest (#592)
  chore(deps-dev): bump mkdocs-material from 7.2.1 to 7.2.2 (#582)

Author: heitorlessa

.github/workflows/python_build.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Complexity baseline
         run: make complexity-baseline
       - name: Upload coverage to Codecov
-        uses: codecov/[email protected].1
+        uses: codecov/[email protected].2
         with:
           file: ./coverage.xml
           # flags: unittests

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

@@ -46,7 +46,8 @@ def _match_by_action(action: str, condition_value: Any, context_value: Any) -> b
             schema.RuleAction.EQUALS.value: lambda a, b: a == b,
             schema.RuleAction.STARTSWITH.value: lambda a, b: a.startswith(b),
             schema.RuleAction.ENDSWITH.value: lambda a, b: a.endswith(b),
-            schema.RuleAction.CONTAINS.value: lambda a, b: a in b,
+            schema.RuleAction.IN.value: lambda a, b: a in b,
+            schema.RuleAction.NOT_IN.value: lambda a, b: a not in b,
         }
 
         try:

aws_lambda_powertools/utilities/feature_flags/schema.py

@@ -20,7 +20,8 @@ class RuleAction(str, Enum):
     EQUALS = "EQUALS"
     STARTSWITH = "STARTSWITH"
     ENDSWITH = "ENDSWITH"
-    CONTAINS = "CONTAINS"
+    IN = "IN"
+    NOT_IN = "NOT_IN"
 
 
 class SchemaValidator(BaseValidator):
@@ -79,7 +80,7 @@ class SchemaValidator(BaseValidator):
     The value MUST contain the following members:
 
     * **action**: `str`. Operation to perform to match a key and value.
-    The value MUST be either EQUALS, STARTSWITH, ENDSWITH, CONTAINS
+    The value MUST be either EQUALS, STARTSWITH, ENDSWITH, IN, NOT_IN
     * **key**: `str`. Key in given context to perform operation
     * **value**: `Any`. Value in given context that should match action operation.
 

poetry.lock

@@ -49,7 +49,7 @@ 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

@@ -263,7 +263,7 @@ def test_flags_conditions_rule_match_multiple_actions_multiple_rules_multiple_co
 
 
 # check a case where the feature exists but the rule doesn't match so we revert to the default value of the feature
-def test_flags_match_rule_with_contains_action(mocker, config):
+def test_flags_match_rule_with_in_action(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
@@ -273,7 +273,7 @@ def test_flags_match_rule_with_contains_action(mocker, config):
                     "when_match": expected_value,
                     "conditions": [
                         {
-                            "action": RuleAction.CONTAINS.value,
+                            "action": RuleAction.IN.value,
                             "key": "tenant_id",
                             "value": ["6", "2"],
                         }
@@ -287,7 +287,7 @@ def test_flags_match_rule_with_contains_action(mocker, config):
     assert toggle == expected_value
 
 
-def test_flags_no_match_rule_with_contains_action(mocker, config):
+def test_flags_no_match_rule_with_in_action(mocker, config):
     expected_value = False
     mocked_app_config_schema = {
         "my_feature": {
@@ -297,7 +297,7 @@ def test_flags_no_match_rule_with_contains_action(mocker, config):
                     "when_match": True,
                     "conditions": [
                         {
-                            "action": RuleAction.CONTAINS.value,
+                            "action": RuleAction.IN.value,
                             "key": "tenant_id",
                             "value": ["8", "2"],
                         }
@@ -311,6 +311,54 @@ def test_flags_no_match_rule_with_contains_action(mocker, config):
     assert toggle == expected_value
 
 
+def test_flags_match_rule_with_not_in_action(mocker, config):
+    expected_value = True
+    mocked_app_config_schema = {
+        "my_feature": {
+            "default": False,
+            "rules": {
+                "tenant id is contained in [8, 2]": {
+                    "when_match": expected_value,
+                    "conditions": [
+                        {
+                            "action": RuleAction.NOT_IN.value,
+                            "key": "tenant_id",
+                            "value": ["10", "4"],
+                        }
+                    ],
+                }
+            },
+        }
+    }
+    feature_flags = init_feature_flags(mocker, mocked_app_config_schema, config)
+    toggle = feature_flags.evaluate(name="my_feature", context={"tenant_id": "6", "username": "a"}, default=False)
+    assert toggle == expected_value
+
+
+def test_flags_no_match_rule_with_not_in_action(mocker, config):
+    expected_value = False
+    mocked_app_config_schema = {
+        "my_feature": {
+            "default": expected_value,
+            "rules": {
+                "tenant id is contained in [8, 2]": {
+                    "when_match": True,
+                    "conditions": [
+                        {
+                            "action": RuleAction.NOT_IN.value,
+                            "key": "tenant_id",
+                            "value": ["6", "4"],
+                        }
+                    ],
+                }
+            },
+        }
+    }
+    feature_flags = init_feature_flags(mocker, mocked_app_config_schema, config)
+    toggle = feature_flags.evaluate(name="my_feature", context={"tenant_id": "6", "username": "a"}, default=False)
+    assert toggle == expected_value
+
+
 def test_multiple_features_enabled(mocker, config):
     expected_value = ["my_feature", "my_feature2"]
     mocked_app_config_schema = {
@@ -321,7 +369,7 @@ def test_multiple_features_enabled(mocker, config):
                     "when_match": True,
                     "conditions": [
                         {
-                            "action": RuleAction.CONTAINS.value,
+                            "action": RuleAction.IN.value,
                             "key": "tenant_id",
                             "value": ["6", "2"],
                         }
@@ -351,7 +399,7 @@ def test_multiple_features_only_some_enabled(mocker, config):
                     "when_match": True,
                     "conditions": [
                         {
-                            "action": RuleAction.CONTAINS.value,
+                            "action": RuleAction.IN.value,
                             "key": "tenant_id",
                             "value": ["6", "2"],
                         }
@@ -464,7 +512,7 @@ def test_features_jmespath_envelope(mocker, config):
     assert toggle == expected_value
 
 
-# test_match_rule_with_contains_action
+# test_match_rule_with_equals_action
 def test_match_condition_with_dict_value(mocker, config):
     expected_value = True
     mocked_app_config_schema = {

tests/functional/feature_flags/test_feature_flags.py

@@ -211,10 +211,15 @@ def test_valid_condition_all_actions():
                             CONDITION_VALUE: "a",
                         },
                         {
-                            CONDITION_ACTION: RuleAction.CONTAINS.value,
+                            CONDITION_ACTION: RuleAction.IN.value,
                             CONDITION_KEY: "username",
                             CONDITION_VALUE: ["a", "b"],
                         },
+                        {
+                            CONDITION_ACTION: RuleAction.NOT_IN.value,
+                            CONDITION_KEY: "username",
+                            CONDITION_VALUE: ["c"],
+                        },
                     ],
                 }
             },