make gen

dannykopping · dannykopping · commit 7e5b4ccc835e · 2024-07-08T09:47:38.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go
@@ -60,10 +60,6 @@ type Manager struct {
 // helpers is a map of template helpers which are used to customize notification messages to use global settings like
 // access URL etc.
 func NewManager(cfg codersdk.NotificationsConfig, store Store, metrics *Metrics, log slog.Logger) (*Manager, error) {
-	if metrics == nil {
-		panic("nil metrics passed to notifications manager")
-	}
-
 	method, err := dispatchMethodFromCfg(cfg)
 	if err != nil {
 		return nil, err
@@ -211,6 +207,11 @@ func (m *Manager) BufferedUpdatesCount() (success int, failure int) {
 
 // syncUpdates updates messages in the store based on the given successful and failed message dispatch results.
 func (m *Manager) syncUpdates(ctx context.Context) {
+	// Ensure we update the metrics to reflect the current state after each invocation.
+	defer func() {
+		m.metrics.PendingUpdates.Set(float64(len(m.success) + len(m.failure)))
+	}()
+
 	select {
 	case <-ctx.Done():
 		return
@@ -220,10 +221,6 @@ func (m *Manager) syncUpdates(ctx context.Context) {
 	nSuccess := len(m.success)
 	nFailure := len(m.failure)
 
-	defer func() {
-		m.metrics.PendingUpdates.Set(float64(len(m.success) + len(m.failure)))
-	}()
-
 	// Nothing to do.
 	if nSuccess+nFailure == 0 {
 		return
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -516,7 +516,6 @@ func TestInvalidConfig(t *testing.T) {
 	cfg.LeasePeriod = serpent.Duration(leasePeriod)
 	cfg.DispatchTimeout = serpent.Duration(leasePeriod)
 
-	// TODO
 	_, err := notifications.NewManager(cfg, db, createMetrics(), logger.Named("manager"))
 	require.ErrorIs(t, err, notifications.ErrInvalidDispatchTimeout)
 }

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,6 @@ func TestInvalidConfig(t *testing.T) {`
`516`	`516`	`cfg.LeasePeriod = serpent.Duration(leasePeriod)`
`517`	`517`	`cfg.DispatchTimeout = serpent.Duration(leasePeriod)`
`518`	`518`
`519`		`- // TODO`
`520`	`519`	`_, err := notifications.NewManager(cfg, db, createMetrics(), logger.Named("manager"))`
`521`	`520`	`require.ErrorIs(t, err, notifications.ErrInvalidDispatchTimeout)`
`522`	`521`	`}`