Skip to content

feat(coderd): add new dispatch logic for coder inbox #16764

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 22 commits into from
Mar 5, 2025
Merged

feat(coderd): add new dispatch logic for coder inbox #16764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
61111c9
add new notification method
defelmnq Mar 3, 2025
10276a5
add missing migration file
defelmnq Mar 3, 2025
9573813
add coder inbox delivery target
defelmnq Mar 3, 2025
4485b59
update golden files with targets
defelmnq Mar 3, 2025
02113f6
fix missing details in test
defelmnq Mar 3, 2025
1c2f5d2
fix enqueue functions
defelmnq Mar 3, 2025
9134ea2
fix tests on notifications
defelmnq Mar 3, 2025
9a58bf7
fix missing index
defelmnq Mar 3, 2025
7e088ac
improve EnqueueWithData function to have multiple methods
defelmnq Mar 3, 2025
548335b
Merge remote-tracking branch 'origin/main' into notif-inbox/inte-403
defelmnq Mar 3, 2025
b995d9d
rename migration
defelmnq Mar 3, 2025
ab1e9ed
work on tests
defelmnq Mar 3, 2025
61746c8
finishing up tests
defelmnq Mar 3, 2025
e265ea0
fix tests
defelmnq Mar 3, 2025
e56c155
cleanup testing variables
defelmnq Mar 3, 2025
ac36085
add tests for notifications inbox
defelmnq Mar 4, 2025
ad59e8b
filter coder inbox from UI
defelmnq Mar 4, 2025
a11f505
add missing inbox tests
defelmnq Mar 4, 2025
fe58472
fix tests
defelmnq Mar 4, 2025
15933fe
fixes from review
defelmnq Mar 4, 2025
aae0f98
improve testing logic
defelmnq Mar 4, 2025
5a5f2d6
change tests for user id
defelmnq Mar 5, 2025
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
finishing up tests
  • Loading branch information
@defelmnq
defelmnq committed Mar 3, 2025
commit 61746c85832e1c3af9eacffaef655f7a48efcd4d
2 changes: 1 addition & 1 deletion coderd/notifications/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ type enqueueInterceptor struct {
}

func newEnqueueInterceptor(db notifications.Store, metadataFn func() database.FetchNewMessageMetadataRow) *enqueueInterceptor {
return &enqueueInterceptor{Store: db, payload: make(chan types.MessagePayload, 1), metadataFn: metadataFn}
return &enqueueInterceptor{Store: db, payload: make(chan types.MessagePayload, 2), metadataFn: metadataFn}
}

func (e *enqueueInterceptor) EnqueueNotificationMessage(_ context.Context, arg database.EnqueueNotificationMessageParams) error {
Expand Down
5 changes: 3 additions & 2 deletions coderd/notifications/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ func TestInflightDispatchesMetric(t *testing.T) {
// Barrier handler will wait until all notification messages are in-flight.
barrier := newBarrierHandler(msgCount, handler)
mgr.WithHandlers(map[database.NotificationMethod]notifications.Handler{
method: barrier,
method: barrier,
database.NotificationMethodInbox: &fakeHandler{},
})

enq, err := notifications.NewStoreEnqueuer(cfg, store, defaultHelpers(), logger.Named("enqueuer"), quartz.NewReal())
Expand Down Expand Up @@ -381,7 +382,7 @@ func TestInflightDispatchesMetric(t *testing.T) {

// Wait for the updates to be synced and the metric to reflect that.
require.Eventually(t, func() bool {
return promtest.ToFloat64(metrics.InflightDispatches) == 0
return promtest.ToFloat64(metrics.InflightDispatches.WithLabelValues(string(method), tmpl.String())) == 0
}, testutil.WaitShort, testutil.IntervalFast)
}

Expand Down
5 changes: 4 additions & 1 deletion coderd/notifications/notifications_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ func TestSMTPDispatch(t *testing.T) {
handler := newDispatchInterceptor(dispatch.NewSMTPHandler(cfg.SMTP, logger.Named("smtp")))
mgr, err := notifications.NewManager(cfg, store, defaultHelpers(), createMetrics(), logger.Named("manager"))
require.NoError(t, err)
mgr.WithHandlers(map[database.NotificationMethod]notifications.Handler{method: handler})
mgr.WithHandlers(map[database.NotificationMethod]notifications.Handler{
method: handler,
database.NotificationMethodInbox: &fakeHandler{},
})
t.Cleanup(func() {
assert.NoError(t, mgr.Stop(ctx))
})
Expand Down
Loading