fixup! feat: add crontab package for supporting autostart/stop. This is basically a small wrapper around robfig/cron/v3.

johnstcn · johnstcn · commit c92c8eb15eb0 · 2022-04-04T11:09:00.000Z
diff --git a/coderd/crontab/crontab.go b/coderd/crontab/crontab.go
@@ -45,20 +45,20 @@ func (s cronSchedule) Next(t time.Time) time.Time {
 }
 
 func Parse(spec string) (WeeklySchedule, error) {
-	s, err := defaultParser.Parse(spec)
+	specSched, err := defaultParser.Parse(spec)
 	if err != nil {
 		return nil, xerrors.Errorf("parse schedule: %w", err)
 	}
 
-	schedule, ok := s.(*cron.SpecSchedule)
+	schedule, ok := specSched.(*cron.SpecSchedule)
 	if !ok {
-		return nil, xerrors.Errorf("expected cron.SpecSchedule but got %T", s)
+		return nil, xerrors.Errorf("expected *cron.SpecSchedule but got %T", specSched)
 	}
 
-	cs := &cronSchedule{
+	cronSched := &cronSchedule{
 		sched: schedule,
 		spec:  spec,
 	}
-	return cs, nil
+	return cronSched, nil
 
 }
diff --git a/coderd/crontab/crontab_test.go b/coderd/crontab/crontab_test.go
@@ -1,9 +1,10 @@
-package crontab
+package crontab_test
 
 import (
 	"testing"
 	"time"
 
+	"github.com/coder/coder/coderd/cron"
 	"github.com/stretchr/testify/require"
 )
 
@@ -46,18 +47,18 @@ func Test_Parse(t *testing.T) {
 		},
 	}
 
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
+	for _, testCase := range testCases {
+		testCase := testCase
+		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
-			actual, err := Parse(tc.spec)
-			if tc.expectedError == "" {
-				nextTime := actual.Next(tc.at)
+			actual, err := cron.Parse(testCase.spec)
+			if testCase.expectedError == "" {
+				nextTime := actual.Next(testCase.at)
 				require.NoError(t, err)
-				require.Equal(t, tc.expectedNext, nextTime)
-				require.Equal(t, tc.spec, actual.String())
+				require.Equal(t, testCase.expectedNext, nextTime)
+				require.Equal(t, testCase.spec, actual.String())
 			} else {
-				require.EqualError(t, err, tc.expectedError)
+				require.EqualError(t, err, testCase.expectedError)
 				require.Nil(t, actual)
 			}
 		})

Original file line number	Diff line number	Diff line change
`@@ -45,20 +45,20 @@ func (s cronSchedule) Next(t time.Time) time.Time {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func Parse(spec string) (WeeklySchedule, error) {`
`48`		`- s, err := defaultParser.Parse(spec)`
	`48`	`+ specSched, err := defaultParser.Parse(spec)`
`49`	`49`	`if err != nil {`
`50`	`50`	`return nil, xerrors.Errorf("parse schedule: %w", err)`
`51`	`51`	`}`
`52`	`52`
`53`		`- schedule, ok := s.(*cron.SpecSchedule)`
	`53`	`+ schedule, ok := specSched.(*cron.SpecSchedule)`
`54`	`54`	`if !ok {`
`55`		`- return nil, xerrors.Errorf("expected cron.SpecSchedule but got %T", s)`
	`55`	`+ return nil, xerrors.Errorf("expected *cron.SpecSchedule but got %T", specSched)`
`56`	`56`	`}`
`57`	`57`
`58`		`- cs := &cronSchedule{`
	`58`	`+ cronSched := &cronSchedule{`
`59`	`59`	`sched: schedule,`
`60`	`60`	`spec: spec,`
`61`	`61`	`}`
`62`		`- return cs, nil`
	`62`	`+ return cronSched, nil`
`63`	`63`
`64`	`64`	`}`