Skip to content
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.

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

fix(backend): modelToCRDTrigger was not including periodic schedule correctly #11475

Merged
merged 3 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
21 changes: 21 additions & 0 deletions backend/src/apiserver/model/cron_schedule.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package model
hbelmiro marked this conversation as resolved.
Show resolved Hide resolved

type CronSchedule struct {
// Time at which scheduling starts.
// If no start time is specified, the StartTime is the creation time of the schedule.
CronScheduleStartTimeInSec *int64 `gorm:"column:CronScheduleStartTimeInSec;"`

// Time at which scheduling ends.
// If no end time is specified, the EndTime is the end of time.
CronScheduleEndTimeInSec *int64 `gorm:"column:CronScheduleEndTimeInSec;"`

// Cron string describing when a workflow should be created within the
// time interval defined by StartTime and EndTime.
Cron *string `gorm:"column:Schedule;"`
}

func (c CronSchedule) IsEmpty() bool {
return c.CronScheduleStartTimeInSec == nil &&
c.CronScheduleEndTimeInSec == nil &&
(c.Cron == nil || *c.Cron == "")
hbelmiro marked this conversation as resolved.
Show resolved Hide resolved
}
28 changes: 0 additions & 28 deletions backend/src/apiserver/model/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,34 +189,6 @@ type Trigger struct {
PeriodicSchedule
}

type CronSchedule struct {
// Time at which scheduling starts.
// If no start time is specified, the StartTime is the creation time of the schedule.
CronScheduleStartTimeInSec *int64 `gorm:"column:CronScheduleStartTimeInSec;"`

// Time at which scheduling ends.
// If no end time is specified, the EndTime is the end of time.
CronScheduleEndTimeInSec *int64 `gorm:"column:CronScheduleEndTimeInSec;"`

// Cron string describing when a workflow should be created within the
// time interval defined by StartTime and EndTime.
Cron *string `gorm:"column:Schedule;"`
}

type PeriodicSchedule struct {
// Time at which scheduling starts.
// If no start time is specified, the StartTime is the creation time of the schedule.
PeriodicScheduleStartTimeInSec *int64 `gorm:"column:PeriodicScheduleStartTimeInSec;"`

// Time at which scheduling ends.
// If no end time is specified, the EndTime is the end of time.
PeriodicScheduleEndTimeInSec *int64 `gorm:"column:PeriodicScheduleEndTimeInSec;"`

// Interval describing when a workflow should be created within the
// time interval defined by StartTime and EndTime.
IntervalSecond *int64 `gorm:"column:IntervalSecond;"`
}

func (j Job) GetValueOfPrimaryKey() string {
return fmt.Sprint(j.UUID)
}
Expand Down
21 changes: 21 additions & 0 deletions backend/src/apiserver/model/periodic_schedule.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package model

type PeriodicSchedule struct {
// Time at which scheduling starts.
// If no start time is specified, the StartTime is the creation time of the schedule.
PeriodicScheduleStartTimeInSec *int64 `gorm:"column:PeriodicScheduleStartTimeInSec;"`

// Time at which scheduling ends.
// If no end time is specified, the EndTime is the end of time.
PeriodicScheduleEndTimeInSec *int64 `gorm:"column:PeriodicScheduleEndTimeInSec;"`

// Interval describing when a workflow should be created within the
// time interval defined by StartTime and EndTime.
IntervalSecond *int64 `gorm:"column:IntervalSecond;"`
}

func (p PeriodicSchedule) IsEmpty() bool {
return p.PeriodicScheduleStartTimeInSec == nil &&
p.PeriodicScheduleEndTimeInSec == nil &&
(p.IntervalSecond == nil || *p.IntervalSecond == 0)
}
4 changes: 2 additions & 2 deletions backend/src/apiserver/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func modelToParametersMap(modelParameters string) (map[string]string, error) {
func modelToCRDTrigger(modelTrigger model.Trigger) (scheduledworkflow.Trigger, error) {
crdTrigger := scheduledworkflow.Trigger{}
// CronSchedule and PeriodicSchedule can have at most one being non-empty
if modelTrigger.CronSchedule != (model.CronSchedule{}) {
if !modelTrigger.CronSchedule.IsEmpty() {
// Check if CronSchedule is non-empty
crdCronSchedule := scheduledworkflow.CronSchedule{}
if modelTrigger.Cron != nil {
Expand All @@ -247,7 +247,7 @@ func modelToCRDTrigger(modelTrigger model.Trigger) (scheduledworkflow.Trigger, e
crdCronSchedule.EndTime = &endTime
}
crdTrigger.CronSchedule = &crdCronSchedule
} else if modelTrigger.PeriodicSchedule != (model.PeriodicSchedule{}) {
} else if !modelTrigger.PeriodicSchedule.IsEmpty() {
// Check if PeriodicSchedule is non-empty
crdPeriodicSchedule := scheduledworkflow.PeriodicSchedule{}
if modelTrigger.IntervalSecond != nil {
Expand Down
Loading