feat: add scheduling configuration for prebuilds #408
+1,214
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| package helpers | ||
|
|
||
| import ( | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "golang.org/x/xerrors" | ||
| ) | ||
|
|
||
| // ValidateSchedules checks if any schedules overlap | ||
| func ValidateSchedules(schedules []string) error { | ||
| for i := 0; i < len(schedules); i++ { | ||
| for j := i + 1; j < len(schedules); j++ { | ||
| overlap, err := SchedulesOverlap(schedules[i], schedules[j]) | ||
| if err != nil { | ||
| return xerrors.Errorf("invalid schedule: %w", err) | ||
| } | ||
| if overlap { | ||
| return xerrors.Errorf("schedules overlap: %s and %s", | ||
| schedules[i], schedules[j]) | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // SchedulesOverlap checks if two schedules overlap by checking | ||
| // all cron fields separately | ||
| func SchedulesOverlap(schedule1, schedule2 string) (bool, error) { | ||
|
There was a problem hiding this comment. This is excellent work @evgeniy-scherbina! I really like how clean the code is, how complete the code-coverage, and how clear the intentions are. |
||
| // Get cron fields | ||
| fields1 := strings.Fields(schedule1) | ||
| fields2 := strings.Fields(schedule2) | ||
|
|
||
| if len(fields1) != 5 { | ||
| return false, xerrors.Errorf("schedule %q has %d fields, expected 5 fields (minute hour day-of-month month day-of-week)", schedule1, len(fields1)) | ||
| } | ||
| if len(fields2) != 5 { | ||
| return false, xerrors.Errorf("schedule %q has %d fields, expected 5 fields (minute hour day-of-month month day-of-week)", schedule2, len(fields2)) | ||
| } | ||
|
Comment on lines
+34
to
+39
There was a problem hiding this comment. We're missing test coverage for these two cases. |
||
|
|
||
| // Check if months overlap | ||
| monthsOverlap, err := MonthsOverlap(fields1[3], fields2[3]) | ||
| if err != nil { | ||
| return false, xerrors.Errorf("invalid month range: %w", err) | ||
| } | ||
| if !monthsOverlap { | ||
| return false, nil | ||
| } | ||
|
|
||
| // Check if days overlap (DOM OR DOW) | ||
| daysOverlap, err := DaysOverlap(fields1[2], fields1[4], fields2[2], fields2[4]) | ||
| if err != nil { | ||
| return false, xerrors.Errorf("invalid day range: %w", err) | ||
| } | ||
| if !daysOverlap { | ||
| return false, nil | ||
| } | ||
|
|
||
| // Check if hours overlap | ||
| hoursOverlap, err := HoursOverlap(fields1[1], fields2[1]) | ||
| if err != nil { | ||
| return false, xerrors.Errorf("invalid hour range: %w", err) | ||
| } | ||
|
|
||
| return hoursOverlap, nil | ||
| } | ||
|
|
||
| // MonthsOverlap checks if two month ranges overlap | ||
| func MonthsOverlap(months1, months2 string) (bool, error) { | ||
| return CheckOverlap(months1, months2, 12) | ||
| } | ||
|
|
||
| // HoursOverlap checks if two hour ranges overlap | ||
| func HoursOverlap(hours1, hours2 string) (bool, error) { | ||
| return CheckOverlap(hours1, hours2, 23) | ||
| } | ||
|
|
||
| // DomOverlap checks if two day-of-month ranges overlap | ||
| func DomOverlap(dom1, dom2 string) (bool, error) { | ||
| return CheckOverlap(dom1, dom2, 31) | ||
| } | ||
|
|
||
| // DowOverlap checks if two day-of-week ranges overlap | ||
| func DowOverlap(dow1, dow2 string) (bool, error) { | ||
| return CheckOverlap(dow1, dow2, 6) | ||
| } | ||
|
|
||
| // DaysOverlap checks if two day ranges overlap, considering both DOM and DOW. | ||
| // Returns true if both DOM and DOW overlap, or if one is * and the other overlaps. | ||
| func DaysOverlap(dom1, dow1, dom2, dow2 string) (bool, error) { | ||
| // If either DOM is *, we only need to check DOW overlap | ||
| if dom1 == "*" || dom2 == "*" { | ||
| return DowOverlap(dow1, dow2) | ||
| } | ||
|
|
||
| // If either DOW is *, we only need to check DOM overlap | ||
| if dow1 == "*" || dow2 == "*" { | ||
| return DomOverlap(dom1, dom2) | ||
| } | ||
|
Comment on lines
+97
to
+99
There was a problem hiding this comment. We're missing a test case for this. |
||
|
|
||
| // If both DOM and DOW are specified, we need to check both | ||
| // because the schedule runs when either matches | ||
| domOverlap, err := DomOverlap(dom1, dom2) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| dowOverlap, err := DowOverlap(dow1, dow2) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| // If either DOM or DOW overlaps, the schedules overlap | ||
| return domOverlap || dowOverlap, nil | ||
| } | ||
|
|
||
| // CheckOverlap is a function to check if two ranges overlap | ||
| func CheckOverlap(range1, range2 string, maxValue int) (bool, error) { | ||
| set1, err := ParseRange(range1, maxValue) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| set2, err := ParseRange(range2, maxValue) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| for value := range set1 { | ||
| if set2[value] { | ||
| return true, nil | ||
| } | ||
| } | ||
| return false, nil | ||
| } | ||
|
|
||
| // ParseRange converts a cron range to a set of integers | ||
| // maxValue is the maximum allowed value (e.g., 23 for hours, 6 for DOW, 12 for months, 31 for DOM) | ||
| func ParseRange(input string, maxValue int) (map[int]bool, error) { | ||
| result := make(map[int]bool) | ||
|
|
||
| // Handle "*" case | ||
| if input == "*" { | ||
| for i := 0; i <= maxValue; i++ { | ||
| result[i] = true | ||
| } | ||
| return result, nil | ||
| } | ||
|
|
||
| // Parse ranges like "1-3,5,7-9" | ||
| parts := strings.Split(input, ",") | ||
| for _, part := range parts { | ||
| if strings.Contains(part, "-") { | ||
| // Handle range like "1-3" | ||
| rangeParts := strings.Split(part, "-") | ||
| start, err := strconv.Atoi(rangeParts[0]) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("invalid start value in range: %w", err) | ||
| } | ||
| end, err := strconv.Atoi(rangeParts[1]) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("invalid end value in range: %w", err) | ||
| } | ||
|
|
||
| // Validate range | ||
| if start < 0 || end > maxValue || start > end { | ||
| return nil, xerrors.Errorf("invalid range %d-%d: values must be between 0 and %d", start, end, maxValue) | ||
| } | ||
|
|
||
| for i := start; i <= end; i++ { | ||
| result[i] = true | ||
| } | ||
| } else { | ||
| // Handle single value | ||
| value, err := strconv.Atoi(part) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("invalid value: %w", err) | ||
| } | ||
|
|
||
| // Validate value | ||
| if value < 0 || value > maxValue { | ||
| return nil, xerrors.Errorf("invalid value %d: must be between 0 and %d", value, maxValue) | ||
| } | ||
|
|
||
| result[value] = true | ||
| } | ||
| } | ||
| return result, nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This error message could be more helpful. We know which aspect of the schedules overlap, so let's help template authors out by telling them.