address PR feedback

johnstcn · johnstcn · commit 22ed6c42d90d · 2024-08-26T11:49:30.000+01:00
diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go
@@ -863,7 +863,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *serpent.Command {
 		tickInterval     time.Duration
 		bytesPerTick     int64
 		ssh              bool
-		useHostUser      bool
+		useHostLogin     bool
 		app              string
 		template         string
 		targetWorkspaces string
@@ -928,7 +928,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *serpent.Command {
 			}
 
 			var owner string
-			if useHostUser {
+			if useHostLogin {
 				owner = codersdk.Me
 			}
 
@@ -1106,7 +1106,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *serpent.Command {
 			Env:         "CODER_SCALETEST_USE_HOST_LOGIN",
 			Default:     "false",
 			Description: "Connect as the currently logged in user.",
-			Value:       serpent.BoolOf(&useHostUser),
+			Value:       serpent.BoolOf(&useHostLogin),
 		},
 	}
 
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -277,7 +277,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 		}
 		if err := options.Authorizer.Authorize(context.Background(), ownerSubj, policy.ActionSSH, rbac.ResourceWorkspace); err != nil {
 			if rbac.IsUnauthorizedError(err) {
-				t.Fatal("DisableOwnerWorkspaceExec was set in some other test. Please move this test to its own package so that it does not impact other tests!")
+				t.Fatal("Side-effect of DisableOwnerWorkspaceExec detected in unrelated test. Please move the test that requires DisableOwnerWorkspaceExec to its own package so that it does not impact other tests!")
 			}
 			require.NoError(t, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can`
`277`	`277`	`}`
`278`	`278`	`if err := options.Authorizer.Authorize(context.Background(), ownerSubj, policy.ActionSSH, rbac.ResourceWorkspace); err != nil {`
`279`	`279`	`if rbac.IsUnauthorizedError(err) {`
`280`		`- t.Fatal("DisableOwnerWorkspaceExec was set in some other test. Please move this test to its own package so that it does not impact other tests!")`
	`280`	`+ t.Fatal("Side-effect of DisableOwnerWorkspaceExec detected in unrelated test. Please move the test that requires DisableOwnerWorkspaceExec to its own package so that it does not impact other tests!")`
`281`	`281`	`}`
`282`	`282`	`require.NoError(t, err)`
`283`	`283`	`}`