Merge branch 'main' of github.com:/coder/coder into dk/system-notifications-o11y

dannykopping · dannykopping · commit 0e6fdaefb22c · 2024-07-08T15:52:02.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 	"golang.org/x/exp/slices"
@@ -183,20 +184,29 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
 		// given
 		agent := mustCreateAgentWithLogs(ctx, t, db, user, org, tmpl, tv, now.Add(-8*24*time.Hour), t.Name())
 
+		// Make sure that agent logs have been collected.
+		agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
+			AgentID: agent,
+		})
+		require.NoError(t, err)
+		require.NotZero(t, agentLogs, "agent logs must be present")
+
 		// when
 		closer := dbpurge.New(ctx, logger, db)
 		defer closer.Close()
 
 		// then
-		require.Eventually(t, func() bool {
-			agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
+		assert.Eventually(t, func() bool {
+			agentLogs, err = db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
 				AgentID: agent,
 			})
 			if err != nil {
 				return false
 			}
 			return !containsAgentLog(agentLogs, t.Name())
 		}, testutil.WaitShort, testutil.IntervalFast)
+		require.NoError(t, err)
+		require.NotContains(t, agentLogs, t.Name())
 	})
 
 	t.Run("AgentConnectedSixDaysAgo_LogsValid", func(t *testing.T) {
diff --git a/coderd/notifications/manager_test.go b/coderd/notifications/manager_test.go
@@ -7,13 +7,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coder/serpent"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/serpent"
-
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 
