function name remove Schedule

Emyrk · Emyrk · commit 94872aa9a2b5 · 2024-05-01T10:12:55.000-05:00
diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go
@@ -83,7 +83,7 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 					slog.Error(err),
 				)
 			} else {
-				next, allowed := schedule.NextAutostartSchedule(now, workspace.AutostartSchedule.String, templateSchedule)
+				next, allowed := schedule.NextAutostart(now, workspace.AutostartSchedule.String, templateSchedule)
 				if allowed {
 					nextAutostart = next
 				}
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -367,7 +367,7 @@ func isEligibleForAutostart(user database.User, ws database.Workspace, build dat
 		return false
 	}
 
-	nextTransition, allowed := schedule.NextAutostartSchedule(build.CreatedAt, ws.AutostartSchedule.String, templateSchedule)
+	nextTransition, allowed := schedule.NextAutostart(build.CreatedAt, ws.AutostartSchedule.String, templateSchedule)
 	if !allowed {
 		return false
 	}
diff --git a/coderd/schedule/autostart.go b/coderd/schedule/autostart.go
@@ -6,10 +6,10 @@ import (
 	"github.com/coder/coder/v2/coderd/schedule/cron"
 )
 
-// NextAutostartSchedule takes the workspace and template schedule and returns the next autostart schedule
+// NextAutostart takes the workspace and template schedule and returns the next autostart schedule
 // after "at". The boolean returned is if the autostart should be allowed to start based on the template
 // schedule.
-func NextAutostartSchedule(at time.Time, wsSchedule string, templateSchedule TemplateScheduleOptions) (time.Time, bool) {
+func NextAutostart(at time.Time, wsSchedule string, templateSchedule TemplateScheduleOptions) (time.Time, bool) {
 	sched, err := cron.Weekly(wsSchedule)
 	if err != nil {
 		return time.Time{}, false
diff --git a/coderd/schedule/autostop.go b/coderd/schedule/autostop.go
@@ -47,7 +47,7 @@ type CalculateAutostopParams struct {
 	// WorkspaceAutostart can be the empty string if no workspace autostart
 	// is configured.
 	// If configured, this is expected to be a cron weekly event parsable
-	// by autobuild.NextAutostartSchedule
+	// by autobuild.NextAutostart
 	WorkspaceAutostart string
 
 	Now       time.Time
@@ -137,7 +137,7 @@ func CalculateAutostop(ctx context.Context, params CalculateAutostopParams) (Aut
 			// 3. User starts workspace at 9:45pm.
 			//	- The initial deadline is calculated to be 9:45am
 			//	- This crosses the autostart deadline, so the deadline is extended to 9pm
-			nextAutostart, ok := NextAutostartSchedule(params.Now, params.WorkspaceAutostart, templateSchedule)
+			nextAutostart, ok := NextAutostart(params.Now, params.WorkspaceAutostart, templateSchedule)
 			if ok && autostop.Deadline.After(nextAutostart) {
 				autostop.Deadline = nextAutostart.Add(ttl)
 			}
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1186,7 +1186,7 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 					slog.Error(err),
 				)
 			} else {
-				next, allowed := schedule.NextAutostartSchedule(time.Now(), workspace.AutostartSchedule.String, templateSchedule)
+				next, allowed := schedule.NextAutostart(time.Now(), workspace.AutostartSchedule.String, templateSchedule)
 				if allowed {
 					nextAutostart = next
 				}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (a StatsAPI) UpdateStats(ctx context.Context, req agentproto.UpdateStatsR`
`83`	`83`	`slog.Error(err),`
`84`	`84`	`)`
`85`	`85`	`} else {`
`86`		`- next, allowed := schedule.NextAutostartSchedule(now, workspace.AutostartSchedule.String, templateSchedule)`
	`86`	`+ next, allowed := schedule.NextAutostart(now, workspace.AutostartSchedule.String, templateSchedule)`
`87`	`87`	`if allowed {`
`88`	`88`	`nextAutostart = next`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ func isEligibleForAutostart(user database.User, ws database.Workspace, build dat`
`367`	`367`	`return false`
`368`	`368`	`}`
`369`	`369`
`370`		`- nextTransition, allowed := schedule.NextAutostartSchedule(build.CreatedAt, ws.AutostartSchedule.String, templateSchedule)`
	`370`	`+ nextTransition, allowed := schedule.NextAutostart(build.CreatedAt, ws.AutostartSchedule.String, templateSchedule)`
`371`	`371`	`if !allowed {`
`372`	`372`	`return false`
`373`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ func (api API) workspaceAgentReportStats(rw http.ResponseWriter, r http.Reques`
`1186`	`1186`	`slog.Error(err),`
`1187`	`1187`	`)`
`1188`	`1188`	`} else {`
`1189`		`- next, allowed := schedule.NextAutostartSchedule(time.Now(), workspace.AutostartSchedule.String, templateSchedule)`
	`1189`	`+ next, allowed := schedule.NextAutostart(time.Now(), workspace.AutostartSchedule.String, templateSchedule)`
`1190`	`1190`	`if allowed {`
`1191`	`1191`	`nextAutostart = next`
`1192`	`1192`	`}`