Fixed isScheduleEmpty function for flyte schedules (flyteorg#385)

Signed-off-by: Prafulla Mahindrakar <[email protected]>
eapolinario · Apr 5, 2022 · 96d7276 · 96d7276
1 parent 3204f7c
commit 96d7276
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/pkg/manager/impl/launch_plan_manager.go b/pkg/manager/impl/launch_plan_manager.go
@@ -142,6 +142,9 @@ func isScheduleEmpty(launchPlanSpec admin.LaunchPlanSpec) bool {
 	if schedule == nil {
 		return true
 	}
+	if schedule.GetCronSchedule() != nil && len(schedule.GetCronSchedule().Schedule) != 0 {
+		return false
+	}
 	if len(schedule.GetKickoffTimeInputArg()) != 0 {
 		return false
 	}

diff --git a/pkg/manager/impl/launch_plan_manager_test.go b/pkg/manager/impl/launch_plan_manager_test.go
@@ -1346,3 +1346,67 @@ func TestLaunchPlanManager_ListActiveLaunchPlans_BadRequest(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, lpList)
 }
+
+func TestIsScheduleEmpty(t *testing.T) {
+	t.Run("deprecated cron expression used", func(t *testing.T) {
+		sp := admin.LaunchPlanSpec{
+			EntityMetadata: &admin.LaunchPlanMetadata{
+				Schedule: &admin.Schedule{
+					ScheduleExpression: &admin.Schedule_CronExpression{},
+				},
+			},
+		}
+		assert.True(t, isScheduleEmpty(sp))
+	})
+	t.Run("deprecated cron expression used", func(t *testing.T) {
+		sp := admin.LaunchPlanSpec{
+			EntityMetadata: &admin.LaunchPlanMetadata{
+				Schedule: &admin.Schedule{
+					ScheduleExpression: &admin.Schedule_CronExpression{
+						CronExpression: "* * * * *",
+					},
+				},
+			},
+		}
+		assert.False(t, isScheduleEmpty(sp))
+	})
+	t.Run("fixed rate used", func(t *testing.T) {
+		sp := admin.LaunchPlanSpec{
+			EntityMetadata: &admin.LaunchPlanMetadata{
+				Schedule: &admin.Schedule{
+					ScheduleExpression: &admin.Schedule_Rate{
+						Rate: &admin.FixedRate{
+							Value: 10,
+							Unit:  admin.FixedRateUnit_HOUR,
+						},
+					},
+				},
+			},
+		}
+		assert.False(t, isScheduleEmpty(sp))
+	})
+	t.Run("cron schedule used", func(t *testing.T) {
+		sp := admin.LaunchPlanSpec{
+			EntityMetadata: &admin.LaunchPlanMetadata{
+				Schedule: &admin.Schedule{
+					ScheduleExpression: &admin.Schedule_CronSchedule{
+						CronSchedule: &admin.CronSchedule{
+							Schedule: "* * * * *",
+						},
+					},
+				},
+			},
+		}
+		assert.False(t, isScheduleEmpty(sp))
+	})
+	t.Run("kick off time used", func(t *testing.T) {
+		sp := admin.LaunchPlanSpec{
+			EntityMetadata: &admin.LaunchPlanMetadata{
+				Schedule: &admin.Schedule{
+					KickoffTimeInputArg: "name",
+				},
+			},
+		}
+		assert.False(t, isScheduleEmpty(sp))
+	})
+}