Skip to content

chore: fixup quotas to only include groups you are a member of #14271

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 5 commits into from
Aug 15, 2024
Merged

chore: fixup quotas to only include groups you are a member of #14271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e11299c
chore: fixup quotas to only include groups you are a member of
Emyrk Aug 14, 2024
7d27682
chore: add unit test to execercise the bug
Emyrk Aug 14, 2024
3de5030
linting
Emyrk Aug 15, 2024
c85052b
add unit test to add rows into the everyone group
Emyrk Aug 15, 2024
3a59b2c
fixup dbmem
Emyrk Aug 15, 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
Next Next commit
chore: fixup quotas to only include groups you are a member of 
Before all everyone groups were included in the allowance.
  • Loading branch information
@Emyrk
Emyrk committed Aug 14, 2024
commit e11299c5c0836a9e11b0ff06315569a202584db4
16 changes: 8 additions & 8 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions coderd/database/queries/quotas.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
-- name: GetQuotaAllowanceForUser :one
SELECT
coalesce(SUM(quota_allowance), 0)::BIGINT
coalesce(SUM(groups.quota_allowance), 0)::BIGINT
FROM
groups g
LEFT JOIN group_members gm ON
g.id = gm.group_id
WHERE
user_id = $1
OR
g.id = g.organization_id;
(
-- Select all groups this user is a member of. This will also include
-- the "Everyone" group for organizations the user is a member of.
SELECT * FROM group_members_expanded WHERE @user_id = user_id
) AS members
INNER JOIN groups ON
members.group_id = groups.id
;

-- name: GetQuotaConsumedForUser :one
WITH latest_builds AS (
Expand Down
Loading