feat: implement scheduling relative to last task execution (#439)

internal/api/backresthandler_test.go

@@ -502,6 +502,7 @@ func TestHookOnErrorHandling(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			sut.opstore.ResetForTest(t)
 

internal/config/config_test.go

@@ -125,6 +125,7 @@ func TestConfig(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			err := tc.store.Update(tc.config)

internal/config/migrations/001prunepolicy_test.go

@@ -94,6 +94,7 @@ func Test001Migration(t *testing.T) {
 	}
 
 	for _, tc := range cases {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			config := v1.Config{}
 			err := protojson.Unmarshal([]byte(tc.config), &config)

internal/config/migrations/003relativescheduling.go

@@ -0,0 +1,42 @@
+package migrations
+
+import (
+	v1 "github.com/garethgeorge/backrest/gen/go/v1"
+)
+
+func convertToRelativeSchedule(sched *v1.Schedule) {
+	switch s := sched.GetSchedule().(type) {
+	case *v1.Schedule_MaxFrequencyDays:
+		sched.Schedule = &v1.Schedule_MinDaysSinceLastRun{
+			MinDaysSinceLastRun: s.MaxFrequencyDays,
+		}
+	case *v1.Schedule_MaxFrequencyHours:
+		sched.Schedule = &v1.Schedule_MinHoursSinceLastRun{
+			MinHoursSinceLastRun: s.MaxFrequencyHours,
+		}
+	case *v1.Schedule_Cron:
+		sched.Schedule = &v1.Schedule_CronSinceLastRun{
+			CronSinceLastRun: s.Cron,
+		}
+	default:
+		// do nothing
+	}
+}
+
+func migration003RelativeScheduling(config *v1.Config) {
+	// loop over plans and examine prune policy's
+	for _, repo := range config.Repos {
+		prunePolicy := repo.GetPrunePolicy()
+		if prunePolicy == nil {
+			continue
+		}
+
+		if schedule := repo.GetPrunePolicy().GetSchedule(); schedule != nil {
+			convertToRelativeSchedule(schedule)
+		}
+
+		if schedule := repo.GetCheckPolicy().GetSchedule(); schedule != nil {
+			convertToRelativeSchedule(schedule)
+		}
+	}
+}

internal/config/migrations/003relativescheduling_test.go

@@ -0,0 +1,128 @@
+package migrations
+
+import (
+	"testing"
+
+	v1 "github.com/garethgeorge/backrest/gen/go/v1"
+	"google.golang.org/protobuf/proto"
+)
+
+func Test003Migration(t *testing.T) {
+	config := &v1.Config{
+		Repos: []*v1.Repo{
+			{
+				Id: "prune daily",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MaxFrequencyDays{
+							MaxFrequencyDays: 1,
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MaxFrequencyDays{
+							MaxFrequencyDays: 1,
+						},
+					},
+				},
+			},
+			{
+				Id: "prune hourly",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MaxFrequencyHours{
+							MaxFrequencyHours: 1,
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MaxFrequencyHours{
+							MaxFrequencyHours: 1,
+						},
+					},
+				},
+			},
+			{
+				Id: "prune cron",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_Cron{
+							Cron: "0 0 * * *",
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_Cron{
+							Cron: "0 0 * * *",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	want := &v1.Config{
+		Repos: []*v1.Repo{
+			{
+				Id: "prune daily",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MinDaysSinceLastRun{
+							MinDaysSinceLastRun: 1,
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MinDaysSinceLastRun{
+							MinDaysSinceLastRun: 1,
+						},
+					},
+				},
+			},
+			{
+				Id: "prune hourly",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MinHoursSinceLastRun{
+							MinHoursSinceLastRun: 1,
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_MinHoursSinceLastRun{
+							MinHoursSinceLastRun: 1,
+						},
+					},
+				},
+			},
+			{
+				Id: "prune cron",
+				PrunePolicy: &v1.PrunePolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_CronSinceLastRun{
+							CronSinceLastRun: "0 0 * * *",
+						},
+					},
+				},
+				CheckPolicy: &v1.CheckPolicy{
+					Schedule: &v1.Schedule{
+						Schedule: &v1.Schedule_CronSinceLastRun{
+							CronSinceLastRun: "0 0 * * *",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	migration003RelativeScheduling(config)
+
+	if !proto.Equal(config, want) {
+		t.Errorf("got %v, want %v", config, want)
+	}
+}

internal/config/migrations/migrations.go

@@ -8,6 +8,7 @@ import (
 var migrations = []func(*v1.Config){
 	migration001PrunePolicy,
 	migration002Schedules,
+	migration003RelativeScheduling,
 }
 
 var CurrentVersion = int32(len(migrations))

internal/config/validationutil/validationutil_test.go

@@ -38,6 +38,7 @@ func TestSanitizeID(t *testing.T) {
 	}
 
 	for _, tc := range tcs {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			got := SanitizeID(tc.id)
 			if got != tc.want {