Skip to content

refactor(coderd): fetch owner information when authorizing workspace agent #9123

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
Aug 21, 2023
Merged

refactor(coderd): fetch owner information when authorizing workspace agent #9123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11c20d6
use dbtestutil in httpmw test, refactor
johnstcn Aug 15, 2023
da03c4b
add new query
johnstcn Aug 15, 2023
317537c
remove old query
johnstcn Aug 15, 2023
8e2430d
alter query
johnstcn Aug 16, 2023
4aa23c6
mockgen
johnstcn Aug 16, 2023
41561b9
rm unused tx in dbfake
johnstcn Aug 16, 2023
0cb0d18
add TODO
johnstcn Aug 17, 2023
e6ce0f5
fix dbfake
johnstcn Aug 18, 2023
b1d4084
return latest workspace build
johnstcn Aug 18, 2023
b64a870
fixup! return latest workspace build
johnstcn Aug 18, 2023
73de552
fix TestWorkspaceAgentListen/FailNonLatestBuild
johnstcn Aug 18, 2023
1218fa4
the bug was inside you all along
johnstcn Aug 18, 2023
8e222e3
linter
johnstcn Aug 18, 2023
e8844ae
Merge remote-tracking branch 'origin/main' into cj/GetWorkspaceAgentA…
johnstcn Aug 21, 2023
06bbda2
address comments in dbfake impl
johnstcn Aug 21, 2023
3e21545
match indentation
johnstcn Aug 21, 2023
3a603fc
reword error
johnstcn Aug 21, 2023
267aa6c
rm unnecessary pubsub close
johnstcn Aug 21, 2023
6e0d3b3
rename misleading argument
johnstcn Aug 21, 2023
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
alter query
  • Loading branch information
@johnstcn
johnstcn committed Aug 18, 2023
commit 8e2430d765104b17e3808002b0adb537d6f4ef3b
39 changes: 15 additions & 24 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.

39 changes: 15 additions & 24 deletions coderd/database/queries/workspaceagents.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,31 +199,10 @@ SELECT
users.username AS owner_name,
users.status AS owner_status,
array_cat(
-- All users are members
array_append(users.rbac_roles, 'member'),
(
SELECT
array_agg(org_roles)
FROM
organization_members,
-- All org_members get the org-member role for their orgs
unnest(
array_append(roles, 'organization-member:' || organization_members.organization_id::text)
) AS org_roles
WHERE
user_id = users.id
)
) :: text[] AS owner_roles,
(
SELECT
array_agg(
group_members.group_id :: text
)
FROM
group_members
WHERE
user_id = users.id
) :: text[] AS owner_groups
array_append(ARRAY[]::text[], 'organization-member:' || organization_members.organization_id::text)
)::text[] as owner_roles,
array_agg(COALESCE(group_members.group_id::text, ''))::text[] AS owner_groups
FROM users
INNER JOIN
workspaces
Expand All @@ -241,6 +220,18 @@ FROM users
workspace_agents
ON
workspace_agents.resource_id = workspace_resources.id
INNER JOIN -- every user is a member of some org
organization_members
ON
organization_members.user_id = users.id
LEFT JOIN -- as they may not be a member of any groups
group_members
ON
group_members.user_id = users.id
WHERE
workspace_agents.auth_token = @auth_token
AND
users.status = 'active' -- workspaces that belong to inactive users should not be
GROUP BY
workspace_agents.id, workspaces.id, users.id, organization_members.organization_id
LIMIT 1;
8 changes: 7 additions & 1 deletion coderd/httpmw/workspaceagent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,13 @@ func TestWorkspaceAgent(t *testing.T) {
func setup(t testing.TB, db database.Store, authToken uuid.UUID, mw func(http.Handler) http.Handler) (*http.Request, http.Handler) {
t.Helper()
org := dbgen.Organization(t, db, database.Organization{})
user := dbgen.User(t, db, database.User{})
user := dbgen.User(t, db, database.User{
Status: database.UserStatusActive,
})
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{
UserID: user.ID,
OrganizationID: org.ID,
})
templateVersion := dbgen.TemplateVersion(t, db, database.TemplateVersion{
OrganizationID: org.ID,
CreatedBy: user.ID,
Expand Down