fixup! feat: add user maintenance schedule for max_ttl autostop

coder · deansheather · Jul 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 21, 2023
commit 92c05b366702344d3b12d20309e0cc7084146d2e
diff --git a/coderd/schedule/user.go b/coderd/schedule/user.go
@@ -2,6 +2,7 @@ package schedule
 
 import (
 	"context"
+	"time"
 
 	"github.com/google/uuid"
 
@@ -19,6 +20,10 @@ type UserMaintenanceScheduleOptions struct {
 	// maintenance windows should not be used.
 	Schedule *Schedule
 	UserSet  bool
+	// Duration is the duration of the maintenance window starting when the cron
+	// triggers. Workspaces can be stopped for maintenance or due to max_ttl
+	// during this window.
+	Duration time.Duration
 }
 
 type UserMaintenanceScheduleStore interface {

diff --git a/enterprise/coderd/schedule/user.go b/enterprise/coderd/schedule/user.go
@@ -3,6 +3,7 @@ package schedule
 import (
 	"context"
 	"strings"
+	"time"
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
@@ -11,6 +12,8 @@ import (
 	agpl "github.com/coder/coder/coderd/schedule"
 )
 
+const userMaintenanceWindowDuration = 4 * time.Hour
+
 // enterpriseUserMaintenanceScheduleStore provides an
 // agpl.UserMaintenanceScheduleStore that has all fields implemented for
 // enterprise customers.
@@ -46,6 +49,7 @@ func (s *enterpriseUserMaintenanceScheduleStore) parseSchedule(rawSchedule strin
 	return agpl.UserMaintenanceScheduleOptions{
 		Schedule: sched,
 		UserSet:  userSet,
+		Duration: userMaintenanceWindowDuration,
 	}, nil
 }
 
@@ -77,5 +81,8 @@ func (s *enterpriseUserMaintenanceScheduleStore) SetUserMaintenanceScheduleOptio
 		return agpl.UserMaintenanceScheduleOptions{}, xerrors.Errorf("update user maintenance schedule: %w", err)
 	}
 
+	// TODO: update max_ttl for all active builds for this user to clamp to the
+	// new schedule.
+
 	return opts, nil
 }
diff --git a/enterprise/coderd/users.go b/enterprise/coderd/users.go
@@ -11,9 +11,6 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
-// TODO: move this constant
-const userMaintenanceWindowDuration = 4 * time.Hour
-
 // @Summary Get user maintenance schedule
 // @ID get-user-maintenance-schedule
 // @Security CoderSessionToken
@@ -46,7 +43,7 @@ func (api *API) userMaintenanceSchedule(rw http.ResponseWriter, r *http.Request)
 		UserSet:     opts.UserSet,
 		Time:        opts.Schedule.Time(),
 		Timezone:    opts.Schedule.Location().String(),
-		Duration:    userMaintenanceWindowDuration,
+		Duration:    opts.Duration,
 		Next:        opts.Schedule.Next(time.Now()),
 	})
 }
@@ -93,7 +90,7 @@ func (api *API) putUserMaintenanceSchedule(rw http.ResponseWriter, r *http.Reque
 		UserSet:     opts.UserSet,
 		Time:        opts.Schedule.Time(),
 		Timezone:    opts.Schedule.Location().String(),
-		Duration:    userMaintenanceWindowDuration,
+		Duration:    opts.Duration,
 		Next:        opts.Schedule.Next(time.Now()),
 	})
 }