fix: add settings lost in GetScheduledSettingsRaw

core/scheduling/settings.go

@@ -33,6 +33,7 @@ func GetScheduledSettingsRaw(when time.Time, settings wingv1.TargetSettings) (pa
  }
 
  if scheduler.Contains(when) {
+ hitScheduleSettingsPayload = make([]byte, len(schedule.Settings.Raw))
  copy(hitScheduleSettingsPayload, schedule.Settings.Raw)
  break
  }

core/scheduling/settings_test.go

@@ -9,6 +9,7 @@ import (
 
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "k8s.io/apimachinery/pkg/runtime"
 )
 
 func isSchedulePeriodContains(when time.Time, scheduleSettings wingv1.ScheduleTargetSettings) (bool, error) {
@@ -272,3 +273,56 @@ func BenchmarkIsSchedulePeriodContainsWithDate(b *testing.B) {
  })
  }
 }
+
+func TestGetScheduledSettingsRaw(t *testing.T) {
+ settings := wingv1.TargetSettings{
+ Default: &runtime.RawExtension{
+ Raw: []byte(`{"a":"b"}`),
+ },
+ Schedules: []wingv1.ScheduleTargetSettings{
+ {
+ Start: "0 8 * * *",
+ End: "0 10 * * *",
+ Timezone: "Asia/Shanghai",
+ Settings: &runtime.RawExtension{
+ Raw: []byte(`{"a":"c"}`),
+ },
+ },
+ },
+ }
+ for _, c := range []struct {
+ date string
+ payload string
+ }{
+ {
+ date: "2021-01-01 7:59",
+ payload: `{"a":"b"}`,
+ },
+ {
+ date: "2021-01-01 8:00",
+ payload: `{"a":"c"}`,
+ },
+ {
+ date: "2021-01-01 9:00",
+ payload: `{"a":"c"}`,
+ },
+ {
+ date: "2021-01-01 9:59",
+ payload: `{"a":"c"}`,
+ },
+ {
+ date: "2021-01-01 10:00",
+ payload: `{"a":"b"}`,
+ },
+ {
+ date: "2021-01-01 10:01",
+ payload: `{"a":"b"}`,
+ },
+ } {
+ date, err := time.ParseInLocation(timerange.SchedulePeriodDateFormat, c.date, time.Local)
+ require.NoError(t, err)
+ payload, err := GetScheduledSettingsRaw(date, settings)
+ require.NoError(t, err)
+ require.Equal(t, c.payload, string(payload))
+ }
+}