Skip to content

Commit 9945fcb

Browse files
fix(feature_flags): match days of week regardless of locale (#8707)
Co-authored-by: Leandro Damascena <lcdama@amazon.pt>
1 parent d7b3024 commit 9945fcb

2 files changed

Lines changed: 56 additions & 2 deletions

File tree

‎aws_lambda_powertools/utilities/feature_flags/comparators.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,23 @@ def _get_now_from_timezone(timezone: tzinfo | None) -> datetime:
1919
return datetime.now(timezone)
2020

2121

22+
# Indexed by datetime.weekday(), where Monday is 0
23+
_DAYS_OF_WEEK = (
24+
TimeValues.MONDAY.value,
25+
TimeValues.TUESDAY.value,
26+
TimeValues.WEDNESDAY.value,
27+
TimeValues.THURSDAY.value,
28+
TimeValues.FRIDAY.value,
29+
TimeValues.SATURDAY.value,
30+
TimeValues.SUNDAY.value,
31+
)
32+
33+
2234
def compare_days_of_week(context_value: Any, condition_value: dict) -> bool:
2335
timezone_name = condition_value.get(TimeValues.TIMEZONE.value, "UTC")
2436

25-
# %A = Weekday as locale’s full name.
26-
current_day = _get_now_from_timezone(gettz(timezone_name)).strftime("%A").upper()
37+
# Not strftime("%A"): it names the day in the process locale, e.g. "FREITAG" under a German LC_TIME
38+
current_day = _DAYS_OF_WEEK[_get_now_from_timezone(gettz(timezone_name)).weekday()]
2739

2840
days = condition_value.get(TimeValues.DAYS.value, [])
2941
return current_day in days

‎tests/functional/feature_flags/_boto3/test_time_based_actions.py‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,48 @@ def test_time_based_utc_days_range_rule_match(mocker):
416416
)
417417

418418

419+
def test_time_based_days_range_rule_match_with_non_english_locale(mocker):
420+
# GIVEN a process whose LC_TIME names the days in German, so strftime("%A") on a Friday is "Freitag"
421+
class GermanDatetime(dt.datetime):
422+
def strftime(self, fmt):
423+
return super().strftime(fmt).replace("Friday", "Freitag")
424+
425+
friday = GermanDatetime(2022, 11, 18, 10, 0, 0, tzinfo=dt.timezone.utc)
426+
mocker.patch(
427+
"aws_lambda_powertools.utilities.feature_flags.comparators._get_now_from_timezone",
428+
return_value=friday,
429+
)
430+
mocked_get_conf = mocker.patch("aws_lambda_powertools.utilities.parameters.AppConfigProvider.get")
431+
mocked_get_conf.return_value = {
432+
"my_feature": {
433+
FEATURE_DEFAULT_VAL_KEY: False,
434+
RULES_KEY: {
435+
"match only on fridays": {
436+
RULE_MATCH_VALUE: True,
437+
CONDITIONS_KEY: [
438+
{
439+
CONDITION_ACTION: RuleAction.SCHEDULE_BETWEEN_DAYS_OF_WEEK.value,
440+
CONDITION_KEY: TimeKeys.CURRENT_DAY_OF_WEEK.value,
441+
CONDITION_VALUE: {TimeValues.DAYS.value: [TimeValues.FRIDAY.value]},
442+
},
443+
],
444+
},
445+
},
446+
},
447+
}
448+
store = AppConfigStore(
449+
environment="test_env",
450+
application="test_app",
451+
name="test_conf_name",
452+
max_age=600,
453+
sdk_config=Config(region_name="us-east-1"),
454+
)
455+
456+
# WHEN evaluating the rule
457+
# THEN the day still matches FRIDAY
458+
assert FeatureFlags(store=store).evaluate(name="my_feature", context={}, default=False)
459+
460+
419461
def test_time_based_utc_days_range_no_rule_match(mocker):
420462
assert not evaluate_mocked_schema(
421463
mocker=mocker,

0 commit comments

Comments
 (0)