Skip to content

fix(feature_flags): match days of week regardless of locale #8707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anishmehta24 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(feature_flags): match days of week regardless of locale #8707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions aws_lambda_powertools/utilities/feature_flags/comparators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,23 @@ def _get_now_from_timezone(timezone: tzinfo | None) -> datetime:
return datetime.now(timezone)


# Indexed by datetime.weekday(), where Monday is 0
_DAYS_OF_WEEK = (
TimeValues.MONDAY.value,
TimeValues.TUESDAY.value,
TimeValues.WEDNESDAY.value,
TimeValues.THURSDAY.value,
TimeValues.FRIDAY.value,
TimeValues.SATURDAY.value,
TimeValues.SUNDAY.value,
)


def compare_days_of_week(context_value: Any, condition_value: dict) -> bool:
timezone_name = condition_value.get(TimeValues.TIMEZONE.value, "UTC")

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

days = condition_value.get(TimeValues.DAYS.value, [])
return current_day in days
Expand Down
42 changes: 42 additions & 0 deletions tests/functional/feature_flags/_boto3/test_time_based_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,48 @@ def test_time_based_utc_days_range_rule_match(mocker):
)


def test_time_based_days_range_rule_match_with_non_english_locale(mocker):
# GIVEN a process whose LC_TIME names the days in German, so strftime("%A") on a Friday is "Freitag"
class GermanDatetime(dt.datetime):
def strftime(self, fmt):
return super().strftime(fmt).replace("Friday", "Freitag")

friday = GermanDatetime(2022, 11, 18, 10, 0, 0, tzinfo=dt.timezone.utc)
mocker.patch(
"aws_lambda_powertools.utilities.feature_flags.comparators._get_now_from_timezone",
return_value=friday,
)
mocked_get_conf = mocker.patch("aws_lambda_powertools.utilities.parameters.AppConfigProvider.get")
mocked_get_conf.return_value = {
"my_feature": {
FEATURE_DEFAULT_VAL_KEY: False,
RULES_KEY: {
"match only on fridays": {
RULE_MATCH_VALUE: True,
CONDITIONS_KEY: [
{
CONDITION_ACTION: RuleAction.SCHEDULE_BETWEEN_DAYS_OF_WEEK.value,
CONDITION_KEY: TimeKeys.CURRENT_DAY_OF_WEEK.value,
CONDITION_VALUE: {TimeValues.DAYS.value: [TimeValues.FRIDAY.value]},
},
],
},
},
},
}
store = AppConfigStore(
environment="test_env",
application="test_app",
name="test_conf_name",
max_age=600,
sdk_config=Config(region_name="us-east-1"),
)

# WHEN evaluating the rule
# THEN the day still matches FRIDAY
assert FeatureFlags(store=store).evaluate(name="my_feature", context={}, default=False)


def test_time_based_utc_days_range_no_rule_match(mocker):
assert not evaluate_mocked_schema(
mocker=mocker,
Expand Down