refactor(schema): rename value_when_applies to when_match

heitorlessa · heitorlessa · commit 4bfe2a87a746 · 2021-08-03T07:19:07.000+02:00
diff --git a/aws_lambda_powertools/utilities/feature_flags/schema.py b/aws_lambda_powertools/utilities/feature_flags/schema.py
@@ -12,7 +12,7 @@
 FEATURE_DEFAULT_VAL_KEY = "default"
 CONDITIONS_KEY = "conditions"
 RULE_NAME_KEY = "rule_name"
-RULE_DEFAULT_VALUE = "value_when_applies"
+RULE_DEFAULT_VALUE = "when_match"
 CONDITION_KEY = "key"
 CONDITION_VALUE = "value"
 CONDITION_ACTION = "action"
diff --git a/tests/functional/feature_toggles/test_feature_toggles.py b/tests/functional/feature_toggles/test_feature_toggles.py
@@ -53,7 +53,7 @@ def test_toggles_rule_does_not_match(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id equals 345345435",
-                        "value_when_applies": False,
+                        "when_match": False,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,
@@ -103,7 +103,7 @@ def test_toggles_conditions_no_match(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id equals 345345435",
-                        "value_when_applies": False,
+                        "when_match": False,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,
@@ -133,7 +133,7 @@ def test_toggles_conditions_rule_match_equal_multiple_conditions(mocker, config)
                 "rules": [
                     {
                         "rule_name": "tenant id equals 6 and username is a",
-                        "value_when_applies": expected_value,
+                        "when_match": expected_value,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,  # this rule will match, it has multiple conditions
@@ -175,7 +175,7 @@ def test_toggles_conditions_no_rule_match_equal_multiple_conditions(mocker, conf
                 "rules": [
                     {
                         "rule_name": "tenant id equals 645654 and username is a",  # rule will not match
-                        "value_when_applies": False,
+                        "when_match": False,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,
@@ -211,7 +211,7 @@ def test_toggles_conditions_rule_match_multiple_actions_multiple_rules_multiple_
                 "rules": [
                     {
                         "rule_name": "tenant id equals 6 and username startswith a",
-                        "value_when_applies": expected_value_first_check,
+                        "when_match": expected_value_first_check,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,
@@ -227,7 +227,7 @@ def test_toggles_conditions_rule_match_multiple_actions_multiple_rules_multiple_
                     },
                     {
                         "rule_name": "tenant id equals 4446 and username startswith a and endswith z",
-                        "value_when_applies": expected_value_second_check,
+                        "when_match": expected_value_second_check,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,
@@ -280,7 +280,7 @@ def test_toggles_match_rule_with_contains_action(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id is contained in [6, 2]",
-                        "value_when_applies": expected_value,
+                        "when_match": expected_value,
                         "conditions": [
                             {
                                 "action": RuleAction.CONTAINS.value,
@@ -307,7 +307,7 @@ def test_toggles_no_match_rule_with_contains_action(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id is contained in [8, 2]",
-                        "value_when_applies": True,
+                        "when_match": True,
                         "conditions": [
                             {
                                 "action": RuleAction.CONTAINS.value,
@@ -334,7 +334,7 @@ def test_multiple_features_enabled(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id is contained in [6, 2]",
-                        "value_when_applies": True,
+                        "when_match": True,
                         "conditions": [
                             {
                                 "action": RuleAction.CONTAINS.value,
@@ -367,7 +367,7 @@ def test_multiple_features_only_some_enabled(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id is contained in [6, 2]",
-                        "value_when_applies": True,
+                        "when_match": True,
                         "conditions": [
                             {
                                 "action": RuleAction.CONTAINS.value,
@@ -389,7 +389,7 @@ def test_multiple_features_only_some_enabled(mocker, config):
                 "rules": [
                     {
                         "rule_name": "tenant id equals 7",
-                        "value_when_applies": False,
+                        "when_match": False,
                         "conditions": [
                             {
                                 "action": RuleAction.EQUALS.value,

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ def test_toggles_rule_does_not_match(mocker, config):`
`53`	`53`	`"rules": [`
`54`	`54`	`{`
`55`	`55`	`"rule_name": "tenant id equals 345345435",`
`56`		`- "value_when_applies": False,`
	`56`	`+ "when_match": False,`
`57`	`57`	`"conditions": [`
`58`	`58`	`{`
`59`	`59`	`"action": RuleAction.EQUALS.value,`
`@@ -103,7 +103,7 @@ def test_toggles_conditions_no_match(mocker, config):`
`103`	`103`	`"rules": [`
`104`	`104`	`{`
`105`	`105`	`"rule_name": "tenant id equals 345345435",`
`106`		`- "value_when_applies": False,`
	`106`	`+ "when_match": False,`
`107`	`107`	`"conditions": [`
`108`	`108`	`{`
`109`	`109`	`"action": RuleAction.EQUALS.value,`
`@@ -133,7 +133,7 @@ def test_toggles_conditions_rule_match_equal_multiple_conditions(mocker, config)`
`133`	`133`	`"rules": [`
`134`	`134`	`{`
`135`	`135`	`"rule_name": "tenant id equals 6 and username is a",`
`136`		`- "value_when_applies": expected_value,`
	`136`	`+ "when_match": expected_value,`
`137`	`137`	`"conditions": [`
`138`	`138`	`{`
`139`	`139`	`"action": RuleAction.EQUALS.value, # this rule will match, it has multiple conditions`
`@@ -175,7 +175,7 @@ def test_toggles_conditions_no_rule_match_equal_multiple_conditions(mocker, conf`
`175`	`175`	`"rules": [`
`176`	`176`	`{`
`177`	`177`	`"rule_name": "tenant id equals 645654 and username is a", # rule will not match`
`178`		`- "value_when_applies": False,`
	`178`	`+ "when_match": False,`
`179`	`179`	`"conditions": [`
`180`	`180`	`{`
`181`	`181`	`"action": RuleAction.EQUALS.value,`
`@@ -211,7 +211,7 @@ def test_toggles_conditions_rule_match_multiple_actions_multiple_rules_multiple_`
`211`	`211`	`"rules": [`
`212`	`212`	`{`
`213`	`213`	`"rule_name": "tenant id equals 6 and username startswith a",`
`214`		`- "value_when_applies": expected_value_first_check,`
	`214`	`+ "when_match": expected_value_first_check,`
`215`	`215`	`"conditions": [`
`216`	`216`	`{`
`217`	`217`	`"action": RuleAction.EQUALS.value,`
`@@ -227,7 +227,7 @@ def test_toggles_conditions_rule_match_multiple_actions_multiple_rules_multiple_`
`227`	`227`	`},`
`228`	`228`	`{`
`229`	`229`	`"rule_name": "tenant id equals 4446 and username startswith a and endswith z",`
`230`		`- "value_when_applies": expected_value_second_check,`
	`230`	`+ "when_match": expected_value_second_check,`
`231`	`231`	`"conditions": [`
`232`	`232`	`{`
`233`	`233`	`"action": RuleAction.EQUALS.value,`
`@@ -280,7 +280,7 @@ def test_toggles_match_rule_with_contains_action(mocker, config):`
`280`	`280`	`"rules": [`
`281`	`281`	`{`
`282`	`282`	`"rule_name": "tenant id is contained in [6, 2]",`
`283`		`- "value_when_applies": expected_value,`
	`283`	`+ "when_match": expected_value,`
`284`	`284`	`"conditions": [`
`285`	`285`	`{`
`286`	`286`	`"action": RuleAction.CONTAINS.value,`
`@@ -307,7 +307,7 @@ def test_toggles_no_match_rule_with_contains_action(mocker, config):`
`307`	`307`	`"rules": [`
`308`	`308`	`{`
`309`	`309`	`"rule_name": "tenant id is contained in [8, 2]",`
`310`		`- "value_when_applies": True,`
	`310`	`+ "when_match": True,`
`311`	`311`	`"conditions": [`
`312`	`312`	`{`
`313`	`313`	`"action": RuleAction.CONTAINS.value,`
`@@ -334,7 +334,7 @@ def test_multiple_features_enabled(mocker, config):`
`334`	`334`	`"rules": [`
`335`	`335`	`{`
`336`	`336`	`"rule_name": "tenant id is contained in [6, 2]",`
`337`		`- "value_when_applies": True,`
	`337`	`+ "when_match": True,`
`338`	`338`	`"conditions": [`
`339`	`339`	`{`
`340`	`340`	`"action": RuleAction.CONTAINS.value,`
`@@ -367,7 +367,7 @@ def test_multiple_features_only_some_enabled(mocker, config):`
`367`	`367`	`"rules": [`
`368`	`368`	`{`
`369`	`369`	`"rule_name": "tenant id is contained in [6, 2]",`
`370`		`- "value_when_applies": True,`
	`370`	`+ "when_match": True,`
`371`	`371`	`"conditions": [`
`372`	`372`	`{`
`373`	`373`	`"action": RuleAction.CONTAINS.value,`
`@@ -389,7 +389,7 @@ def test_multiple_features_only_some_enabled(mocker, config):`
`389`	`389`	`"rules": [`
`390`	`390`	`{`
`391`	`391`	`"rule_name": "tenant id equals 7",`
`392`		`- "value_when_applies": False,`
	`392`	`+ "when_match": False,`
`393`	`393`	`"conditions": [`
`394`	`394`	`{`
`395`	`395`	`"action": RuleAction.EQUALS.value,`