From 10d0f7fdb11d348d40475aeb9196c2c311731767 Mon Sep 17 00:00:00 2001
From: Ethan Dickson <ethan@coder.com>
Date: Wed, 3 Sep 2025 03:25:49 +0000
Subject: [PATCH] ci: improve 'tfail in goroutine' ruleguard rule

---
 coderd/files_test.go                   |  3 ++-
 enterprise/tailnet/pgcoord_test.go     |  4 ++--
 scaletest/createworkspaces/run_test.go |  2 +-
 scripts/rules.go                       | 12 ++++--------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/coderd/files_test.go b/coderd/files_test.go
index fb13cb30e48f1..b7f981d5e5c72 100644
--- a/coderd/files_test.go
+++ b/coderd/files_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/archive"
@@ -88,7 +89,7 @@ func TestPostFiles(t *testing.T) {
 				data := make([]byte, 1024)
 				_, err := client.Upload(ctx, codersdk.ContentTypeTar, bytes.NewReader(data))
 				end.Done()
-				require.NoError(t, err)
+				assert.NoError(t, err)
 			}()
 		}
 		wg.Done()
diff --git a/enterprise/tailnet/pgcoord_test.go b/enterprise/tailnet/pgcoord_test.go
index 15153c2c4090d..7923ffdb81519 100644
--- a/enterprise/tailnet/pgcoord_test.go
+++ b/enterprise/tailnet/pgcoord_test.go
@@ -409,8 +409,8 @@ func TestPGCoordinatorSingle_SendsHeartbeats(t *testing.T) {
 		if len(heartbeats) < 2 {
 			return false
 		}
-		require.Greater(t, heartbeats[0].Sub(start), time.Duration(0))
-		require.Greater(t, heartbeats[1].Sub(start), time.Duration(0))
+		assert.Greater(t, heartbeats[0].Sub(start), time.Duration(0))
+		assert.Greater(t, heartbeats[1].Sub(start), time.Duration(0))
 		return assert.Greater(t, heartbeats[1].Sub(heartbeats[0]), tailnet.HeartbeatPeriod*3/4)
 	}, testutil.WaitMedium, testutil.IntervalMedium)
 }
diff --git a/scaletest/createworkspaces/run_test.go b/scaletest/createworkspaces/run_test.go
index c63854ff8a1fd..bff4049397953 100644
--- a/scaletest/createworkspaces/run_test.go
+++ b/scaletest/createworkspaces/run_test.go
@@ -257,7 +257,7 @@ func Test_Runner(t *testing.T) {
 			err := runner.Run(runnerCtx, "1", logs)
 			logsStr := logs.String()
 			t.Log("Runner logs:\n\n" + logsStr)
-			require.ErrorIs(t, err, context.Canceled)
+			assert.ErrorIs(t, err, context.Canceled)
 			close(done)
 		}()
 
diff --git a/scripts/rules.go b/scripts/rules.go
index dce029a102d01..7fd3c0ca445c9 100644
--- a/scripts/rules.go
+++ b/scripts/rules.go
@@ -182,32 +182,28 @@ func doNotCallTFailNowInsideGoroutine(m dsl.Matcher) {
 	m.Match(`
 	go func($*_){
 		$*_
-		$require.$_($*_)
+		require.$_($*_)
 		$*_
 	}($*_)`).
-		At(m["require"]).
-		Where(m["require"].Text == "require").
 		Report("Do not call functions that may call t.FailNow in a goroutine, as this can cause data races (see testing.go:834)")
 
 	// require.Eventually runs the function in a goroutine.
 	m.Match(`
 	require.Eventually(t, func() bool {
 		$*_
-		$require.$_($*_)
+		require.$_($*_)
 		$*_
 	}, $*_)`).
-		At(m["require"]).
-		Where(m["require"].Text == "require").
 		Report("Do not call functions that may call t.FailNow in a goroutine, as this can cause data races (see testing.go:834)")
 
 	m.Match(`
 	go func($*_){
 		$*_
-		$t.$fail($*_)
+		t.$fail($*_)
 		$*_
 	}($*_)`).
 		At(m["fail"]).
-		Where(m["t"].Type.Implements("testing.TB") && m["fail"].Text.Matches("^(FailNow|Fatal|Fatalf)$")).
+		Where(m["fail"].Text.Matches("^(FailNow|Fatal|Fatalf)$")).
 		Report("Do not call functions that may call t.FailNow in a goroutine, as this can cause data races (see testing.go:834)")
 }