Skip to content

chore: remove organization requirement from convertGroup() #12195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 21, 2024
Merged

chore: remove organization requirement from convertGroup() #12195

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a1457b5
feat: convertGroups() no longer requires organization info
Emyrk Feb 16, 2024
11f2016
fix table formatter for nested structs
Emyrk Feb 16, 2024
33b10e8
make gen
Emyrk Feb 16, 2024
a5cadb2
update golden files
Emyrk Feb 16, 2024
3b0ea1b
include non-json user list
Emyrk Feb 16, 2024
5e4172a
Update FE
Emyrk Feb 16, 2024
4dc15a5
linting
Emyrk Feb 16, 2024
829316b
linting
Emyrk Feb 20, 2024
704faa2
update tests
Emyrk Feb 20, 2024
626391d
fix tests
Emyrk Feb 20, 2024
77be059
fix golden file header spacing
Emyrk Feb 20, 2024
89645b1
Lint
Emyrk Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update tests
  • Loading branch information
@Emyrk
Emyrk committed Feb 20, 2024
commit 704faa2c8889b16dbb10415532c6ef2be82ed93b
25 changes: 13 additions & 12 deletions enterprise/coderd/groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,8 @@ func TestGroup(t *testing.T) {
AddUsers: []string{user2.ID.String(), user3.ID.String()},
})
require.NoError(t, err)
require.Contains(t, group.Members, user2)
require.Contains(t, group.Members, user3)
require.Contains(t, group.Members, user2.ReducedUser)
require.Contains(t, group.Members, user3.ReducedUser)

ggroup, err := userAdminClient.Group(ctx, group.ID)
require.NoError(t, err)
Expand Down Expand Up @@ -665,15 +665,15 @@ func TestGroup(t *testing.T) {
AddUsers: []string{user1.ID.String(), user2.ID.String()},
})
require.NoError(t, err)
require.Contains(t, group.Members, user1)
require.Contains(t, group.Members, user2)
require.Contains(t, group.Members, user1.ReducedUser)
require.Contains(t, group.Members, user2.ReducedUser)

err = userAdminClient.DeleteUser(ctx, user1.ID)
require.NoError(t, err)

group, err = userAdminClient.Group(ctx, group.ID)
require.NoError(t, err)
require.NotContains(t, group.Members, user1)
require.NotContains(t, group.Members, user1.ReducedUser)
})

t.Run("IncludeSuspendedAndDormantUsers", func(t *testing.T) {
Expand All @@ -700,17 +700,17 @@ func TestGroup(t *testing.T) {
})
require.NoError(t, err)
require.Len(t, group.Members, 2)
require.Contains(t, group.Members, user1)
require.Contains(t, group.Members, user2)
require.Contains(t, group.Members, user1.ReducedUser)
require.Contains(t, group.Members, user2.ReducedUser)

user1, err = userAdminClient.UpdateUserStatus(ctx, user1.ID.String(), codersdk.UserStatusSuspended)
require.NoError(t, err)

group, err = userAdminClient.Group(ctx, group.ID)
require.NoError(t, err)
require.Len(t, group.Members, 2)
require.Contains(t, group.Members, user1)
require.Contains(t, group.Members, user2)
require.Contains(t, group.Members, user1.ReducedUser)
require.Contains(t, group.Members, user2.ReducedUser)

// cannot explicitly set a dormant user status so must create a new user
anotherUser, err := userAdminClient.CreateUser(ctx, codersdk.CreateUserRequest{
Expand All @@ -731,8 +731,8 @@ func TestGroup(t *testing.T) {
group, err = userAdminClient.Group(ctx, group.ID)
require.NoError(t, err)
require.Len(t, group.Members, 3)
require.Contains(t, group.Members, user1)
require.Contains(t, group.Members, user2)
require.Contains(t, group.Members, user1.ReducedUser)
require.Contains(t, group.Members, user2.ReducedUser)
})

t.Run("everyoneGroupReturnsEmpty", func(t *testing.T) {
Expand All @@ -754,7 +754,8 @@ func TestGroup(t *testing.T) {
require.Len(t, group.Members, 4)
require.Equal(t, "Everyone", group.Name)
require.Equal(t, user.OrganizationID, group.OrganizationID)
require.Contains(t, group.Members, user1, user2)
require.Contains(t, group.Members, user1.ReducedUser)
require.Contains(t, group.Members, user2.ReducedUser)
})
}

Expand Down