P2-01: schedule schema + CRUD API
The `schedules` table was already laid down in migration 0001; this
slice adds the Go-side data model, store CRUD with atomic version
bumps, and REST endpoints.
* `store.Schedule` + `RetentionPolicy` + `ScheduleOptions` typed
views (the wire form on the agent side keeps retention/options
as raw JSON since the agent just forwards them to restic).
* Store CRUD: CreateSchedule / GetSchedule / ListSchedulesByHost /
UpdateSchedule / DeleteSchedule. Each mutation bumps
`host_schedule_version` atomically in the same tx via UPSERT on
`host_schedule_version`. SetHostAppliedScheduleVersion records
what the agent has confirmed via schedule.ack (P2-02 will use it).
* REST endpoints under /api/hosts/{id}/schedules + /{sid}:
GET (list, with the version envelope so callers can detect
drift), POST (create), PUT (update — kind is immutable), DELETE.
* Validation: cron expressions parse via robfig/cron/v3 (same
parser the agent will use, so anything that validates here will
fire there); kind ∈ {backup, forget, prune, check} (init/unlock
are operator-only one-shot kinds, not schedulable); backup
schedules require ≥1 path; hooks rejected on non-backup kinds
(spec §14.3).
* All mutations audit-logged.
* Tests: store-level CRUD + version-bump invariants; REST happy
path (create→list→update→delete with version progression); REST
validation table covers each rejection code.
newTestServerWithHub now sets BootstrapToken so the schedules
handler tests can use the existing login flow without a parallel
test-server constructor.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,296 @@
|
||||
package http
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
stdhttp "net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/oklog/ulid/v2"
|
||||
"github.com/robfig/cron/v3"
|
||||
|
||||
"gitea.dcglab.co.uk/steve/restic-manager/internal/api"
|
||||
"gitea.dcglab.co.uk/steve/restic-manager/internal/store"
|
||||
)
|
||||
|
||||
// scheduleAPI is the JSON shape for /api/hosts/{id}/schedules. We
|
||||
// avoid leaking host_id in the body since it's already in the URL,
|
||||
// and we render booleans + retention as typed JSON rather than
|
||||
// strings so the UI can edit fields directly.
|
||||
type scheduleAPI struct {
|
||||
ID string `json:"id,omitempty"`
|
||||
Kind api.JobKind `json:"kind"`
|
||||
CronExpr string `json:"cron_expr"`
|
||||
Paths []string `json:"paths"`
|
||||
Excludes []string `json:"excludes"`
|
||||
Tags []string `json:"tags"`
|
||||
RetentionPolicy store.RetentionPolicy `json:"retention_policy"`
|
||||
Options store.ScheduleOptions `json:"options"`
|
||||
PreHook string `json:"pre_hook,omitempty"`
|
||||
PostHook string `json:"post_hook,omitempty"`
|
||||
Enabled bool `json:"enabled"`
|
||||
CreatedAt string `json:"created_at,omitempty"`
|
||||
UpdatedAt string `json:"updated_at,omitempty"`
|
||||
}
|
||||
|
||||
// listSchedulesResp wraps the array so the response is forward-
|
||||
// compatible (we may want to add a top-level `version` later).
|
||||
type listSchedulesResp struct {
|
||||
Version int64 `json:"version"`
|
||||
Schedules []scheduleAPI `json:"schedules"`
|
||||
}
|
||||
|
||||
// cron parser used for input validation. Standard 5-field syntax
|
||||
// with descriptors (@hourly etc.) — same parser the agent will
|
||||
// run against, so a schedule that validates here will fire there.
|
||||
var cronParser = cron.NewParser(
|
||||
cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor,
|
||||
)
|
||||
|
||||
func (s *Server) handleListSchedules(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
if _, ok := s.requireUser(r); !ok {
|
||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
if hostID == "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "missing_host_id", "")
|
||||
return
|
||||
}
|
||||
if _, err := s.deps.Store.GetHost(r.Context(), hostID); err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
writeJSONError(w, stdhttp.StatusNotFound, "host_not_found", "")
|
||||
return
|
||||
}
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
||||
return
|
||||
}
|
||||
rows, err := s.deps.Store.ListSchedulesByHost(r.Context(), hostID)
|
||||
if err != nil {
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
||||
return
|
||||
}
|
||||
version, err := s.deps.Store.GetHostScheduleVersion(r.Context(), hostID)
|
||||
if err != nil {
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
||||
return
|
||||
}
|
||||
out := listSchedulesResp{Version: version, Schedules: make([]scheduleAPI, len(rows))}
|
||||
for i, row := range rows {
|
||||
out.Schedules[i] = toScheduleAPI(row)
|
||||
}
|
||||
writeJSON(w, stdhttp.StatusOK, out)
|
||||
}
|
||||
|
||||
func (s *Server) handleCreateSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
user, ok := s.requireUser(r)
|
||||
if !ok {
|
||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
if hostID == "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "missing_host_id", "")
|
||||
return
|
||||
}
|
||||
if _, err := s.deps.Store.GetHost(r.Context(), hostID); err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
writeJSONError(w, stdhttp.StatusNotFound, "host_not_found", "")
|
||||
return
|
||||
}
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
||||
return
|
||||
}
|
||||
|
||||
var req scheduleAPI
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
||||
return
|
||||
}
|
||||
if code, msg := validateSchedule(&req); code != "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, code, msg)
|
||||
return
|
||||
}
|
||||
|
||||
row := store.Schedule{
|
||||
ID: ulid.Make().String(),
|
||||
HostID: hostID,
|
||||
Kind: string(req.Kind),
|
||||
CronExpr: req.CronExpr,
|
||||
Paths: req.Paths,
|
||||
Excludes: req.Excludes,
|
||||
Tags: req.Tags,
|
||||
RetentionPolicy: req.RetentionPolicy,
|
||||
Options: req.Options,
|
||||
PreHook: req.PreHook,
|
||||
PostHook: req.PostHook,
|
||||
Enabled: req.Enabled,
|
||||
}
|
||||
if err := s.deps.Store.CreateSchedule(r.Context(), &row); err != nil {
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &user.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.created",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &row.ID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
writeJSON(w, stdhttp.StatusCreated, toScheduleAPI(row))
|
||||
}
|
||||
|
||||
func (s *Server) handleUpdateSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
user, ok := s.requireUser(r)
|
||||
if !ok {
|
||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
scheduleID := chi.URLParam(r, "sid")
|
||||
if hostID == "" || scheduleID == "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "missing_id", "")
|
||||
return
|
||||
}
|
||||
existing, err := s.deps.Store.GetSchedule(r.Context(), hostID, scheduleID)
|
||||
if err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
||||
return
|
||||
}
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
||||
return
|
||||
}
|
||||
|
||||
var req scheduleAPI
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
||||
return
|
||||
}
|
||||
// Kind is immutable; ignore whatever was sent and fix up before
|
||||
// validation so validateSchedule sees the existing kind.
|
||||
req.Kind = api.JobKind(existing.Kind)
|
||||
if code, msg := validateSchedule(&req); code != "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, code, msg)
|
||||
return
|
||||
}
|
||||
|
||||
existing.CronExpr = req.CronExpr
|
||||
existing.Paths = req.Paths
|
||||
existing.Excludes = req.Excludes
|
||||
existing.Tags = req.Tags
|
||||
existing.RetentionPolicy = req.RetentionPolicy
|
||||
existing.Options = req.Options
|
||||
existing.PreHook = req.PreHook
|
||||
existing.PostHook = req.PostHook
|
||||
existing.Enabled = req.Enabled
|
||||
|
||||
if err := s.deps.Store.UpdateSchedule(r.Context(), existing); err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
||||
return
|
||||
}
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &user.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.updated",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &existing.ID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
writeJSON(w, stdhttp.StatusOK, toScheduleAPI(*existing))
|
||||
}
|
||||
|
||||
func (s *Server) handleDeleteSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
user, ok := s.requireUser(r)
|
||||
if !ok {
|
||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
scheduleID := chi.URLParam(r, "sid")
|
||||
if hostID == "" || scheduleID == "" {
|
||||
writeJSONError(w, stdhttp.StatusBadRequest, "missing_id", "")
|
||||
return
|
||||
}
|
||||
if err := s.deps.Store.DeleteSchedule(r.Context(), hostID, scheduleID); err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
||||
return
|
||||
}
|
||||
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
||||
return
|
||||
}
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &user.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.deleted",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &scheduleID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
w.WriteHeader(stdhttp.StatusNoContent)
|
||||
}
|
||||
|
||||
// validateSchedule rejects malformed inputs with a stable error code.
|
||||
// Returns ("", "") on success.
|
||||
func validateSchedule(s *scheduleAPI) (code, msg string) {
|
||||
switch s.Kind {
|
||||
case api.JobBackup, api.JobForget, api.JobPrune, api.JobCheck:
|
||||
// ok — valid schedule kinds (init/unlock are operator-driven only).
|
||||
default:
|
||||
return "invalid_kind", "kind must be one of backup|forget|prune|check"
|
||||
}
|
||||
if strings.TrimSpace(s.CronExpr) == "" {
|
||||
return "missing_cron_expr", "cron_expr is required"
|
||||
}
|
||||
if _, err := cronParser.Parse(s.CronExpr); err != nil {
|
||||
return "invalid_cron_expr", err.Error()
|
||||
}
|
||||
if s.Kind == api.JobBackup && len(s.Paths) == 0 {
|
||||
return "missing_paths", "backup schedules require at least one path"
|
||||
}
|
||||
// Hooks are only meaningful on backup schedules (spec §14.3).
|
||||
if s.Kind != api.JobBackup && (s.PreHook != "" || s.PostHook != "") {
|
||||
return "hooks_not_allowed", "pre_hook / post_hook only apply to backup schedules"
|
||||
}
|
||||
return "", ""
|
||||
}
|
||||
|
||||
func toScheduleAPI(s store.Schedule) scheduleAPI {
|
||||
out := scheduleAPI{
|
||||
ID: s.ID,
|
||||
Kind: api.JobKind(s.Kind),
|
||||
CronExpr: s.CronExpr,
|
||||
Paths: s.Paths,
|
||||
Excludes: s.Excludes,
|
||||
Tags: s.Tags,
|
||||
RetentionPolicy: s.RetentionPolicy,
|
||||
Options: s.Options,
|
||||
PreHook: s.PreHook,
|
||||
PostHook: s.PostHook,
|
||||
Enabled: s.Enabled,
|
||||
CreatedAt: s.CreatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
||||
UpdatedAt: s.UpdatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
||||
}
|
||||
if out.Paths == nil {
|
||||
out.Paths = []string{}
|
||||
}
|
||||
if out.Excludes == nil {
|
||||
out.Excludes = []string{}
|
||||
}
|
||||
if out.Tags == nil {
|
||||
out.Tags = []string{}
|
||||
}
|
||||
return out
|
||||
}
|
||||
Reference in New Issue
Block a user