Merge pull request #17 from grumBit/Allow-suffixes-to-last-day-of-week

Allow suffixes to last day of week

Author: grumBit

RELEASENOTES.md

@@ -1,5 +1,10 @@
 # Release History
 
+### v1.1.9 [2024-02-01]
+
+- Fixes;
+  - [Does not support "last day of the month" suffixes](https://github.com/grumBit/aws_cron_expression_validator/issues/12#issuecomment-1920567609)
+
 ### v1.1.8 [2024-02-01]
 
 - Fixes;

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aws_cron_expression_validator"
-version = "1.1.8"
+version = "1.1.9"
 authors = [
   { name="Graham Coster", email="bitjugglers@gmail.com" },
 ]

src/aws_cron_expression_validator/validator.py

@@ -136,7 +136,8 @@ def month_regex(cls):
     @classmethod
     def day_of_week_regex(cls):
         range_list = cls.list_range_regex(cls.day_of_week_values)
-        return rf"^({range_list}|\*|\?|{cls.day_of_week_values}L|L|{cls.day_of_week_hash})$"  # values , - * ? L #
+        return rf"^({range_list}|\*|\?|{cls.day_of_week_values}L|L|L-[1-7]|{cls.day_of_week_hash})$"
+        # values , - * ? L #
 
     @classmethod
     def year_regex(cls):

tests/aws_cron_expression_validator/test_validator.py

@@ -129,7 +129,7 @@ def test_month_regex(self):
 
     def test_day_of_week_regex(self):
         given_regex = validator.AWSCronExpressionValidator.day_of_week_regex()
-        given_valid_matches = ["*", "1", "5", "7", "MON", "?", "L", "5L", "MONL", "3#2", "MON-FRI"]
+        given_valid_matches = ["*", "1", "5", "7", "MON", "?", "L", "5L", "MONL", "3#2", "MON-FRI", "L-1", "L-7"]
         given_invalid_matches = [
             "Monday",
             "0",
@@ -138,6 +138,9 @@ def test_day_of_week_regex(self):
             "?5",
             "5?",
             "5-L",
+            "L-0",
+            "L-8",
+            "L-",
             "L5",
             "#",
             "0#2",
@@ -229,6 +232,8 @@ def test_validator(self):
             "30 0 1 JAN-APR,JUL-OCT/2,DEC ? *",
             "15 10 ? * L 2019-2022",
             "15 10 ? * 6L 2019-2022",
+            "15 10 ? * FRIL 2019-2022",
+            "15 10 ? * L-2 2019-2022",
         ]
 
         invalid_expression_exceptions = [
@@ -246,6 +251,7 @@ def test_validator(self):
             ("15/30 10 * * ? 2400", validator.AWSCronExpressionYearError),
             ("0 9 ? * ? *", validator.AWSCronExpressionError),
             ("0 18 3L * ? *", validator.AWSCronExpressionDayOfMonthError),
+            ("0 18 L-3 * ? *", validator.AWSCronExpressionDayOfMonthError),
             ("0 1-7/2,11-23/2, * * ? *", validator.AWSCronExpressionHourError),
         ]