address PR comments

johnstcn · johnstcn · commit 19e896a2b62b · 2024-01-08T09:09:46.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -444,8 +444,7 @@ func New(options *Options) *API {
 					CurrentVersion:         buildinfo.Version(),
 					CurrentAPIMajorVersion: provisionersdk.CurrentMajor,
 					Store:                  options.Database,
-					TimeNowFn:              dbtime.Now,
-					StaleInterval:          provisionerdserver.DefaultHeartbeatInterval * 3,
+					// TimeNow and StaleInterval set to defaults, see healthcheck/provisioner.go
 				},
 			})
 		}
diff --git a/coderd/healthcheck/provisioner.go b/coderd/healthcheck/provisioner.go
@@ -36,7 +36,7 @@ type ProvisionerDaemonsReportDeps struct {
 	Store                  ProvisionerDaemonsStore
 
 	// Optional
-	TimeNowFn     func() time.Time // Defaults to dbtime.Now
+	TimeNow       func() time.Time // Defaults to dbtime.Now
 	StaleInterval time.Duration    // Defaults to 3 heartbeats
 
 	Dismissed bool
@@ -52,10 +52,10 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
 	r.Warnings = make([]health.Message, 0)
 	r.Dismissed = opts.Dismissed
 
-	if opts.TimeNowFn == nil {
-		opts.TimeNowFn = dbtime.Now
+	if opts.TimeNow == nil {
+		opts.TimeNow = dbtime.Now
 	}
-	now := opts.TimeNowFn()
+	now := opts.TimeNow()
 
 	if opts.StaleInterval == 0 {
 		opts.StaleInterval = provisionerdserver.DefaultHeartbeatInterval * 3
diff --git a/coderd/healthcheck/provisioner_test.go b/coderd/healthcheck/provisioner_test.go
@@ -136,7 +136,7 @@ func TestProvisionerDaemonReport(t *testing.T) {
 				deps.CurrentAPIMajorVersion = provisionersdk.CurrentMajor
 			}
 			now := dbtime.Now()
-			deps.TimeNowFn = func() time.Time {
+			deps.TimeNow = func() time.Time {
 				return now
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func TestProvisionerDaemonReport(t *testing.T) {`
`136`	`136`	`deps.CurrentAPIMajorVersion = provisionersdk.CurrentMajor`
`137`	`137`	`}`
`138`	`138`	`now := dbtime.Now()`
`139`		`- deps.TimeNowFn = func() time.Time {`
	`139`	`+ deps.TimeNow = func() time.Time {`
`140`	`140`	`return now`
`141`	`141`	`}`
`142`	`142`