chore: remove CreateAnotherUserWithUser (coder#6068)

This was not idiomatic Go!

Author: kylecarbs

cli/create_test.go

@@ -87,7 +87,7 @@ func TestCreate(t *testing.T) {
 		_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 		cmd, root := clitest.New(t, "create", "my-workspace", "-y")
 
-		member := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
+		member, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		clitest.SetupConfig(t, member, root)
 		cmdCtx, done := context.WithTimeout(context.Background(), testutil.WaitLong)
 		go func() {

cli/delete_test.go

@@ -77,7 +77,7 @@ func TestDelete(t *testing.T) {
 		adminClient := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
 		adminUser := coderdtest.CreateFirstUser(t, adminClient)
 		orgID := adminUser.OrganizationID
-		client := coderdtest.CreateAnotherUser(t, adminClient, orgID)
+		client, _ := coderdtest.CreateAnotherUser(t, adminClient, orgID)
 		user, err := client.User(context.Background(), codersdk.Me)
 		require.NoError(t, err)
 

cli/userlist_test.go

@@ -87,12 +87,9 @@ func TestUserShow(t *testing.T) {
 
 	t.Run("Table", func(t *testing.T) {
 		t.Parallel()
-		ctx := context.Background()
 		client := coderdtest.New(t, nil)
 		admin := coderdtest.CreateFirstUser(t, client)
-		other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
-		otherUser, err := other.User(ctx, codersdk.Me)
-		require.NoError(t, err, "fetch other user")
+		_, otherUser := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
 		cmd, root := clitest.New(t, "users", "show", otherUser.Username)
 		clitest.SetupConfig(t, client, root)
 		doneChan := make(chan struct{})
@@ -114,7 +111,7 @@ func TestUserShow(t *testing.T) {
 		ctx := context.Background()
 		client := coderdtest.New(t, nil)
 		admin := coderdtest.CreateFirstUser(t, client)
-		other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+		other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
 		otherUser, err := other.User(ctx, codersdk.Me)
 		require.NoError(t, err, "fetch other user")
 		cmd, root := clitest.New(t, "users", "show", otherUser.Username, "-o", "json")

cli/userstatus_test.go

@@ -17,7 +17,7 @@ func TestUserStatus(t *testing.T) {
 	t.Parallel()
 	client := coderdtest.New(t, nil)
 	admin := coderdtest.CreateFirstUser(t, client)
-	other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+	other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
 	otherUser, err := other.User(context.Background(), codersdk.Me)
 	require.NoError(t, err, "fetch user")
 

coderd/apikey_test.go

@@ -137,7 +137,7 @@ func TestSessionExpiry(t *testing.T) {
 	// this test it works because we don't copy the value (and we use pointers).
 	dc.SessionDuration.Value = time.Second
 
-	userClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
+	userClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
 
 	// Find the session cookie, and ensure it has the correct expiry.
 	token := userClient.SessionToken()

coderd/authorize_test.go

@@ -24,10 +24,10 @@ func TestCheckPermissions(t *testing.T) {
 	})
 	// Create adminClient, member, and org adminClient
 	adminUser := coderdtest.CreateFirstUser(t, adminClient)
-	memberClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
+	memberClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
 	memberUser, err := memberClient.User(ctx, codersdk.Me)
 	require.NoError(t, err)
-	orgAdminClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID, rbac.RoleOrgAdmin(adminUser.OrganizationID))
+	orgAdminClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID, rbac.RoleOrgAdmin(adminUser.OrganizationID))
 	orgAdminUser, err := orgAdminClient.User(ctx, codersdk.Me)
 	require.NoError(t, err)
 

coderd/coderdtest/coderdtest.go

@@ -447,12 +447,7 @@ func CreateFirstUser(t *testing.T, client *codersdk.Client) codersdk.CreateFirst
 }
 
 // CreateAnotherUser creates and authenticates a new user.
-func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) *codersdk.Client {
-	userClient, _ := createAnotherUserRetry(t, client, organizationID, 5, roles...)
-	return userClient
-}
-
-func CreateAnotherUserWithUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) (*codersdk.Client, codersdk.User) {
+func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) (*codersdk.Client, codersdk.User) {
 	return createAnotherUserRetry(t, client, organizationID, 5, roles...)
 }
 

coderd/organizations_test.go

@@ -46,7 +46,7 @@ func TestOrganizationByUserAndName(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
 		first := coderdtest.CreateFirstUser(t, client)
-		other := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
+		other, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()

coderd/roles_test.go

@@ -19,8 +19,8 @@ func TestListRoles(t *testing.T) {
 	client := coderdtest.New(t, nil)
 	// Create admin, member, and org admin
 	admin := coderdtest.CreateFirstUser(t, client)
-	member := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
-	orgAdmin := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleOrgAdmin(admin.OrganizationID))
+	member, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+	orgAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleOrgAdmin(admin.OrganizationID))
 
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	t.Cleanup(cancel)

coderd/templateversions_test.go

@@ -47,7 +47,7 @@ func TestTemplateVersion(t *testing.T) {
 
 		ctx, _ := testutil.Context(t)
 
-		client1, _ := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
+		client1, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 
 		_, err := client1.TemplateVersion(ctx, version.ID)
 		require.NoError(t, err)