Skip to content

feat: Add audit log filters #4078

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 11 commits into from
Sep 19, 2022
Merged

feat: Add audit log filters #4078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26d399e
Update the API
BrunoQuaresma Sep 15, 2022
3f23deb
Fix database fake and expect
BrunoQuaresma Sep 15, 2022
244d0a1
Fix test
BrunoQuaresma Sep 16, 2022
10e4f33
Fix action filter query
BrunoQuaresma Sep 16, 2022
a678105
Fix query
BrunoQuaresma Sep 16, 2022
8e740de
Cast types
BrunoQuaresma Sep 16, 2022
43a3b71
Update query
BrunoQuaresma Sep 16, 2022
2e54641
Fix types in go
BrunoQuaresma Sep 16, 2022
897562a
Fix query
BrunoQuaresma Sep 16, 2022
897f289
Add limit
BrunoQuaresma Sep 16, 2022
d407d9b
Add test cases
BrunoQuaresma Sep 16, 2022
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
Fix query
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Sep 16, 2022
commit 897562a54a86e28bc917546177575cb65c9ff75e
4 changes: 2 additions & 2 deletions coderd/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ func auditSearchQuery(query string) (database.GetAuditLogsOffsetParams, []coders
// other parsing.
parser := httpapi.NewQueryParamParser()
filter := database.GetAuditLogsOffsetParams{
ResourceType: database.ResourceType(parser.String(searchParams, "", "resource_type")),
Action: database.AuditAction(parser.String(searchParams, "", "action")),
ResourceType: parser.String(searchParams, "", "resource_type"),
Action: parser.String(searchParams, "", "action"),
}

return filter, parser.Errors
Expand Down
4 changes: 2 additions & 2 deletions coderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2337,11 +2337,11 @@ func (q *fakeQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAu
continue
}

if arg.Action != "" && !strings.Contains(string(alog.Action), string(arg.Action)) {
if arg.Action != "" && !strings.Contains(string(alog.Action), arg.Action) {
continue
}

if arg.ResourceType != "" && !strings.Contains(string(alog.ResourceType), string(arg.ResourceType)) {
if arg.ResourceType != "" && !strings.Contains(string(alog.ResourceType), arg.ResourceType) {
continue
}

Expand Down
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.

8 changes: 4 additions & 4 deletions coderd/database/queries/auditlogs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ LEFT JOIN
WHERE
-- Filter resource_type
CASE
WHEN @resource_type :: resource_type != '' THEN
resource_type = @resource_type
WHEN @resource_type :: text != '' THEN
resource_type = @resource_type :: resource_type
ELSE true
END
-- Filter action
AND CASE
WHEN @action :: audit_action != '' THEN
action = @action
WHEN @action :: text != '' THEN
action = @action :: audit_action
ELSE true
END
ORDER BY
Expand Down