Skip to content

Commit 77c0c28

Browse files
committed
pq issue
1 parent 2a53a0b commit 77c0c28

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

coderd/users.go

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/go-chi/chi/v5"
1111
"github.com/go-chi/render"
1212
"github.com/google/uuid"
13-
"golang.org/x/sync/errgroup"
1413
"golang.org/x/xerrors"
1514

1615
"cdr.dev/slog"
@@ -1281,33 +1280,20 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
12811280
return user, req.OrganizationID, err
12821281
}
12831282

1284-
// Notify user admins
1285-
// Get all users with user admin permission including owners
1286-
var owners, userAdmins []database.GetUsersRow
1287-
var eg errgroup.Group
1288-
eg.Go(func() error {
1289-
var err error
1290-
owners, err = store.GetUsers(ctx, database.GetUsersParams{
1291-
RbacRole: []string{codersdk.RoleOwner},
1292-
})
1293-
if err != nil {
1294-
return xerrors.Errorf("get owners: %w", err)
1295-
}
1296-
return nil
1283+
// Notify all users with user admin permission including owners
1284+
// Notice: we can't scrape the user information in parallel as pq
1285+
// fails with: unexpected describe rows response: 'D'
1286+
owners, err := store.GetUsers(ctx, database.GetUsersParams{
1287+
RbacRole: []string{codersdk.RoleOwner},
12971288
})
1298-
eg.Go(func() error {
1299-
var err error
1300-
userAdmins, err = store.GetUsers(ctx, database.GetUsersParams{
1301-
RbacRole: []string{codersdk.RoleUserAdmin},
1302-
})
1303-
if err != nil {
1304-
return xerrors.Errorf("get user admins: %w", err)
1305-
}
1306-
return nil
1289+
if err != nil {
1290+
return user, req.OrganizationID, xerrors.Errorf("get owners: %w", err)
1291+
}
1292+
userAdmins, err := store.GetUsers(ctx, database.GetUsersParams{
1293+
RbacRole: []string{codersdk.RoleUserAdmin},
13071294
})
1308-
err = eg.Wait()
13091295
if err != nil {
1310-
return database.User{}, uuid.Nil, err
1296+
return user, req.OrganizationID, xerrors.Errorf("get user admins: %w", err)
13111297
}
13121298

13131299
for _, u := range append(owners, userAdmins...) {

0 commit comments

Comments
 (0)