Skip to content

feat: add owner groups to workspace data #12841

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 19 commits into from
Apr 5, 2024
Merged

feat: add owner groups to workspace data #12841

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
36451d5
feat: add owner groups to workspace data
f0ssel Apr 1, 2024
9a5f7f1
remove file
f0ssel Apr 1, 2024
a8277a0
rename
f0ssel Apr 2, 2024
e788b3b
remove new query
f0ssel Apr 2, 2024
8e2c4fe
lint
f0ssel Apr 2, 2024
6b305f6
update tf provider
f0ssel Apr 3, 2024
48108f8
update tests
f0ssel Apr 3, 2024
80cfdc8
update tf
f0ssel Apr 3, 2024
b3cd5f1
add groups to dbauthz role
f0ssel Apr 3, 2024
9ae8efb
rebase
f0ssel Apr 3, 2024
da9163e
use GetWorkspaceOwnerGroups
f0ssel Apr 3, 2024
0f472eb
use query for group names
f0ssel Apr 3, 2024
9add629
lint
f0ssel Apr 3, 2024
f55ccc1
dbauthz test
f0ssel Apr 3, 2024
8afb039
test
f0ssel Apr 4, 2024
cf0fd5a
fix test
f0ssel Apr 4, 2024
a4da4c6
make query return group over name
f0ssel Apr 4, 2024
9b82463
add sql behavior
f0ssel Apr 4, 2024
ebae3f8
update query docs
f0ssel Apr 5, 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
add sql behavior
  • Loading branch information
@f0ssel
f0ssel committed Apr 4, 2024
commit 9b82463525b31e22dbb11c8672b0404c4953dd9f
4 changes: 2 additions & 2 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2250,7 +2250,7 @@ func (q *FakeQuerier) GetGroupMembers(_ context.Context, id uuid.UUID) ([]databa
return users, nil
}

func (q *FakeQuerier) GetGroupsByOrganizationAndUserID(ctx context.Context, arg database.GetGroupsByOrganizationAndUserIDParams) ([]database.Group, error) {
func (q *FakeQuerier) GetGroupsByOrganizationAndUserID(_ context.Context, arg database.GetGroupsByOrganizationAndUserIDParams) ([]database.Group, error) {
err := validateDatabaseType(arg)
if err != nil {
return nil, err
Expand All @@ -2266,7 +2266,7 @@ func (q *FakeQuerier) GetGroupsByOrganizationAndUserID(ctx context.Context, arg
}
groups := []database.Group{}
for _, group := range q.groups {
if slices.Contains(groupIds, group.ID) {
if slices.Contains(groupIds, group.ID) && group.OrganizationID == arg.OrganizationID {
groups = append(groups, group)
}
}
Expand Down
Loading