Skip to content

feat(coderd): insert provisioner daemons #11207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Dec 18, 2023
Merged

feat(coderd): insert provisioner daemons #11207

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e1d30f9
feat(coderd): insert provisioner daemons
johnstcn Dec 14, 2023
f7810e5
add UpdateProvisionerDaemonLastSeenAt
johnstcn Dec 14, 2023
6e7856a
add heartbeat
johnstcn Dec 14, 2023
a56bd15
fix provisionerdaemon test
johnstcn Dec 14, 2023
5545bf5
fix tests
johnstcn Dec 14, 2023
b7bb176
fix more tests
johnstcn Dec 15, 2023
86a5d77
address comments
johnstcn Dec 15, 2023
195065e
unexport heartbeatFn, heartbeatInterval
johnstcn Dec 15, 2023
2f81f5a
clarify 403
johnstcn Dec 15, 2023
65ab6b1
address more comments
johnstcn Dec 15, 2023
0506994
fix: ensure TagOwner is an empty string and not nil so that unique c…
johnstcn Dec 15, 2023
71848e6
make golden files
johnstcn Dec 15, 2023
6fdadca
add coalesce in idx_provisioner_daemons_name_owner_key
johnstcn Dec 18, 2023
d50cfaf
add a test to ensure users cannot sneak daemons for other users in
johnstcn Dec 18, 2023
2cd4069
Merge remote-tracking branch 'origin/main' into cj/populate-provision…
johnstcn Dec 18, 2023
ff7113f
add missing dbauthz unit test
johnstcn Dec 18, 2023
9a6e19d
fixup! add coalesce in idx_provisioner_daemons_name_owner_key
johnstcn Dec 18, 2023
9ae1a74
consistent casing
johnstcn Dec 18, 2023
9585b75
remove need for nil check in heartbeat()
johnstcn Dec 18, 2023
0b87a08
Merge remote-tracking branch 'origin/main' into cj/populate-provision…
johnstcn Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove need for nil check in heartbeat()
  • Loading branch information
@johnstcn
johnstcn committed Dec 18, 2023
commit 9585b75d4bd31ede211af33285eb83b1d34ace21
22 changes: 13 additions & 9 deletions coderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ type Options struct {

// HeartbeatFn is the function that will be called at the interval
// specified by HeartbeatInterval.
// This is only used in tests.
// The default function just calls UpdateProvisionerDaemonLastSeenAt.
// This is mainly used for testing.
HeartbeatFn func(context.Context) error
}

Expand Down Expand Up @@ -182,6 +183,16 @@ func NewServer(
if options.HeartbeatInterval == 0 {
options.HeartbeatInterval = DefaultHeartbeatInterval
}
// Avoid a nil check in s.heartbeat.
if options.HeartbeatFn == nil {
options.HeartbeatFn = func(hbCtx context.Context) error {
//nolint:gocritic // This is specifically for updating the last seen at timestamp.
return db.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsSystemRestricted(hbCtx), database.UpdateProvisionerDaemonLastSeenAtParams{
ID: id,
LastSeenAt: sql.NullTime{Time: time.Now(), Valid: true},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed this was s.timeNow(), but turned into time.Now(). I suppose that's OK? Should it be dbtime.Now(), though?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be s.timeNow, will hotfix 👍 Thanks for the catch

})
}
}

s := &server{
lifecycleCtx: lifecycleCtx,
Expand Down Expand Up @@ -261,14 +272,7 @@ func (s *server) heartbeat(ctx context.Context) error {
case <-ctx.Done():
return nil
default:
if s.heartbeatFn != nil {
return s.heartbeatFn(ctx)
}
//nolint:gocritic // This is specifically for updating the last seen at timestamp.
return s.Database.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsSystemRestricted(ctx), database.UpdateProvisionerDaemonLastSeenAtParams{
ID: s.ID,
LastSeenAt: sql.NullTime{Time: s.timeNow(), Valid: true},
})
return s.heartbeatFn(ctx)
}
}

Expand Down