Skip to content

feat: integrate agentAPI with resources monitoring logic #16438

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.

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 32 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9d42cad
work on new agent version
defelmnq Feb 4, 2025
7b2d19e
improve function for resources monitoring
defelmnq Feb 10, 2025
0124d60
add missing files
defelmnq Feb 10, 2025
3661e8c
work on resources monitor tests
defelmnq Feb 11, 2025
a5a788e
apply fmt and lint
defelmnq Feb 11, 2025
91d1515
work on dbauthz tests
defelmnq Feb 11, 2025
0bc7632
work on dbauthz
defelmnq Feb 11, 2025
3085041
work on rbac
defelmnq Feb 11, 2025
120a37b
continue to iterate
defelmnq Feb 11, 2025
dd8ed40
continue to iterate
defelmnq Feb 11, 2025
0a8941b
continue to iterate
defelmnq Feb 11, 2025
f3388b4
work on tests
defelmnq Feb 11, 2025
523f6fd
improve testing
defelmnq Feb 11, 2025
06adbf7
improve error messages
defelmnq Feb 11, 2025
c7b03d0
rework architecture of resources monitor
defelmnq Feb 12, 2025
2c3d171
improve resourcesmonitor struct
defelmnq Feb 12, 2025
18b65e0
improve resourcesmonitor struct
defelmnq Feb 12, 2025
c95b05a
change proto payload for get resources monitoring config
defelmnq Feb 12, 2025
c79b6cb
change proto payload for get resources monitoring config
defelmnq Feb 12, 2025
b28d4fa
rework fetcher and tests
defelmnq Feb 13, 2025
7701624
fix tests
defelmnq Feb 13, 2025
5fad903
fix tests
defelmnq Feb 13, 2025
b611ae5
fix tests
defelmnq Feb 13, 2025
3c65b8a
fix logic
defelmnq Feb 13, 2025
63c5869
improve testing fetcher and rename struct
defelmnq Feb 13, 2025
2d3eeb5
lint
defelmnq Feb 13, 2025
e17aafc
work on dbauthz
defelmnq Feb 13, 2025
c5a4201
improve dbauthz for fetching
defelmnq Feb 13, 2025
262a672
change dbauthz permissions
defelmnq Feb 13, 2025
dbca96e
finalise tests
defelmnq Feb 13, 2025
3145eab
fix comments from github
defelmnq Feb 13, 2025
3bec324
add collectedAt
defelmnq Feb 14, 2025
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
work on rbac
  • Loading branch information
defelmnq committed Feb 11, 2025
commit 3085041845d0637f3be2d8f754ad7f508eb9311e
2 changes: 0 additions & 2 deletions coderd/apidoc/docs.go

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

2 changes: 0 additions & 2 deletions coderd/apidoc/swagger.json

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

9 changes: 0 additions & 9 deletions coderd/rbac/object_gen.go

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

6 changes: 0 additions & 6 deletions coderd/rbac/policy/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,4 @@ var RBACPermissions = map[string]PermissionDefinition{
ActionUpdate: actDef("update IdP sync settings"),
},
},
"workspace_agent_resource_monitor": {
Actions: map[Action]ActionDefinition{
ActionRead: actDef("read workspace agent resource monitor"),
ActionCreate: actDef("create workspace agent resource monitor"),
},
},
}
15 changes: 0 additions & 15 deletions coderd/rbac/roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -777,21 +777,6 @@ func TestRolePermissions(t *testing.T) {
},
},
},
{
Name: "ResourceMonitor",
Actions: []policy.Action{policy.ActionRead, policy.ActionCreate},
Resource: rbac.ResourceWorkspaceAgentResourceMonitor,
AuthorizeMap: map[bool][]hasAuthSubjects{
true: {owner},
false: {
memberMe, orgMemberMe, otherOrgMember,
orgAdmin, otherOrgAdmin,
orgAuditor, otherOrgAuditor,
templateAdmin, orgTemplateAdmin, otherOrgTemplateAdmin,
userAdmin, orgUserAdmin, otherOrgUserAdmin,
},
},
},
}

// We expect every permission to be tested above.
Expand Down
134 changes: 66 additions & 68 deletions codersdk/rbacresources_gen.go

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

Loading
Loading