improve errors handling

defelmnq · defelmnq · commit 157e08694f8a · 2024-10-22T03:12:56.000+02:00
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -158,7 +158,7 @@ func TestSMTPDispatch(t *testing.T) {
 		Smarthost: serpent.HostPort{Host: "localhost", Port: fmt.Sprintf("%d", mockSMTPSrv.PortNumber())},
 		Hello:     "localhost",
 	}
-	handler := newDispatchInterceptor(dispatch.NewSMTPHandler(cfg.SMTP, defaultHelpers(), logger.Named("smtp")))
+	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})
diff --git a/coderd/notifications/utils_test.go b/coderd/notifications/utils_test.go
@@ -111,7 +111,7 @@ type chanHandler struct {
 	calls chan dispatchCall
 }
 
-func (c chanHandler) Dispatcher(payload types.MessagePayload, title, body string) (dispatch.DeliveryFunc, error) {
+func (c chanHandler) Dispatcher(payload types.MessagePayload, title, body string, _ template.FuncMap) (dispatch.DeliveryFunc, error) {
 	result := make(chan dispatchResult)
 	call := dispatchCall{
 		payload: payload,

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func TestSMTPDispatch(t *testing.T) {`
`158`	`158`	`Smarthost: serpent.HostPort{Host: "localhost", Port: fmt.Sprintf("%d", mockSMTPSrv.PortNumber())},`
`159`	`159`	`Hello: "localhost",`
`160`	`160`	`}`
`161`		`- handler := newDispatchInterceptor(dispatch.NewSMTPHandler(cfg.SMTP, defaultHelpers(), logger.Named("smtp")))`
	`161`	`+ handler := newDispatchInterceptor(dispatch.NewSMTPHandler(cfg.SMTP, logger.Named("smtp")))`
`162`	`162`	`mgr, err := notifications.NewManager(cfg, store, defaultHelpers(), createMetrics(), logger.Named("manager"))`
`163`	`163`	`require.NoError(t, err)`
`164`	`164`	`mgr.WithHandlers(map[database.NotificationMethod]notifications.Handler{method: handler})`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ type chanHandler struct {`
`111`	`111`	`calls chan dispatchCall`
`112`	`112`	`}`
`113`	`113`
`114`		`-func (c chanHandler) Dispatcher(payload types.MessagePayload, title, body string) (dispatch.DeliveryFunc, error) {`
	`114`	`+func (c chanHandler) Dispatcher(payload types.MessagePayload, title, body string, _ template.FuncMap) (dispatch.DeliveryFunc, error) {`
`115`	`115`	`result := make(chan dispatchResult)`
`116`	`116`	`call := dispatchCall{`
`117`	`117`	`payload: payload,`