make linter complain more

johnstcn · johnstcn · commit 80db0073fb71 · 2023-11-07T13:52:17.000Z
diff --git a/scripts/rules.go b/scripts/rules.go
@@ -54,7 +54,7 @@ func testingWithOwnerUser(m dsl.Matcher) {
 	m.Import("github.com/coder/coder/v2/cli/clitest")
 	m.Import("github.com/coder/coder/v2/enterprise/coderd/coderenttest")
 
-	// For the AGPL code, we just check for SetupConfig being called with a
+	// For both AGPL and enterprise code, we check for SetupConfig being called with a
 	// client authenticated as the Owner user.
 	m.Match(`
 	$_ := coderdtest.CreateFirstUser($t, $client)
@@ -67,6 +67,16 @@ func testingWithOwnerUser(m dsl.Matcher) {
 		At(m["SetupConfig"]).
 		Report(`The CLI will be operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
 
+	m.Match(`
+	$client, $_ := coderdenttest.New($t, $*_)
+	$*_
+	clitest.$SetupConfig($t, $client, $_)
+	`).Where(m["t"].Type.Implements("testing.TB") &&
+		m["SetupConfig"].Text.Matches("^SetupConfig$") &&
+		m.File().Name.Matches(`_test\.go$`)).
+		At(m["SetupConfig"]).
+		Report(`The CLI will be operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
+
 	// For the enterprise code, we check for any method called on the client.
 	// While we want to be a bit stricter here, some methods are known to require
 	// the owner user, so we exclude them.
@@ -78,7 +88,7 @@ func testingWithOwnerUser(m dsl.Matcher) {
 		m.File().Name.Matches(`_test\.go$`) &&
 		!m["Method"].Text.Matches(`^(UpdateAppearance|Licenses|AddLicense|InsertLicense|DeleteLicense|CreateWorkspaceProxy|Replicas|Regions)$`)).
 		At(m["Method"]).
-		Report(`The CLI will be operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
+		Report(`This client is operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
 
 	// Sadly, we need to match both one- and two-valued assignments separately.
 	m.Match(`
@@ -89,7 +99,7 @@ func testingWithOwnerUser(m dsl.Matcher) {
 		m.File().Name.Matches(`_test\.go$`) &&
 		!m["Method"].Text.Matches(`^(UpdateAppearance|Licenses|AddLicense|InsertLicense|DeleteLicense|CreateWorkspaceProxy|Replicas|Regions)$`)).
 		At(m["Method"]).
-		Report(`The CLI will be operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
+		Report(`This client is operating as the owner user, which has unrestricted permissions. Consider creating a different user.`)
 }
 
 // Use xerrors everywhere! It provides additional stacktrace info!
