make lint/fmt

dannykopping · dannykopping · commit 061b2bfb99f2 · 2024-08-05T13:54:11.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -748,12 +748,12 @@ func TestCustomNotificationMethod(t *testing.T) {
 
 	// GIVEN: a notification template which has a method explicitly set
 	var (
-		template = notifications.TemplateWorkspaceDormant
+		template      = notifications.TemplateWorkspaceDormant
 		defaultMethod = database.NotificationMethodSmtp
-		customMethod = database.NotificationMethodWebhook
+		customMethod  = database.NotificationMethodWebhook
 	)
 	out, err := db.UpdateNotificationTemplateMethodByID(ctx, database.UpdateNotificationTemplateMethodByIDParams{
-		ID: template,
+		ID:     template,
 		Method: database.NullNotificationMethod{NotificationMethod: customMethod, Valid: true},
 	})
 	require.NoError(t, err)
@@ -762,8 +762,8 @@ func TestCustomNotificationMethod(t *testing.T) {
 	// GIVEN: a manager configured with multiple dispatch methods
 	cfg := defaultNotificationsConfig(defaultMethod)
 	cfg.SMTP = codersdk.NotificationsEmailConfig{
-		From: "danny@coder.com",
-		Hello: "localhost",
+		From:      "danny@coder.com",
+		Hello:     "localhost",
 		Smarthost: serpent.HostPort{Host: "localhost", Port: fmt.Sprintf("%d", mockSMTPSrv.PortNumber())},
 	}
 	cfg.Webhook = codersdk.NotificationsWebhookConfig{
@@ -782,6 +782,7 @@ func TestCustomNotificationMethod(t *testing.T) {
 	// WHEN: a notification of that template is enqueued, it should be delivered with the configured method - not the default.
 	user := createSampleUser(t, db)
 	msgID, err := enq.Enqueue(ctx, user.ID, template, map[string]string{}, "test")
+	require.NoError(t, err)
 
 	// THEN: the notification should be received by the custom dispatch method
 	mgr.Run(ctx)
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -33,21 +33,21 @@ type notifier struct {
 	quit     chan any
 	done     chan any
 
-	handlers      map[database.NotificationMethod]Handler
+	handlers map[database.NotificationMethod]Handler
 	metrics  *Metrics
 }
 
 func newNotifier(cfg codersdk.NotificationsConfig, id uuid.UUID, log slog.Logger, db Store, hr map[database.NotificationMethod]Handler, metrics *Metrics) *notifier {
 	return &notifier{
-		id:            id,
-		cfg:           cfg,
-		log:           log.Named("notifier").With(slog.F("notifier_id", id)),
-		quit:          make(chan any),
-		done:          make(chan any),
-		tick:          time.NewTicker(cfg.FetchInterval.Value()),
-		store:         db,
-		handlers:      hr,
-		metrics:       metrics,
+		id:       id,
+		cfg:      cfg,
+		log:      log.Named("notifier").With(slog.F("notifier_id", id)),
+		quit:     make(chan any),
+		done:     make(chan any),
+		tick:     time.NewTicker(cfg.FetchInterval.Value()),
+		store:    db,
+		handlers: hr,
+		metrics:  metrics,
 	}
 }
 
