Skip to content

Audit date filter/kira pilot #4845

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
Nov 3, 2022
Merged

Audit date filter/kira pilot #4845

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
1f0cb46
sql query
Kira-Pilot Oct 28, 2022
4886a91
added time_to
Kira-Pilot Oct 28, 2022
22b53ef
added validation error
Kira-Pilot Oct 31, 2022
0904902
documentation
Kira-Pilot Nov 1, 2022
8f5f3ca
Merge remote-tracking branch 'origin/main' into audit-date-filter/kir…
Kira-Pilot Nov 1, 2022
c3f04f5
attempt to add test
Kira-Pilot Nov 1, 2022
27f04e1
removed whiitespace
Kira-Pilot Nov 1, 2022
d9eab84
fix: ensure date_from and date_to are applied correct audit logs
deansheather Nov 2, 2022
3fa3a9a
added more tests
Kira-Pilot Nov 2, 2022
9acef91
ran make gen
Kira-Pilot Nov 2, 2022
492ec38
PR feedback
Kira-Pilot Nov 3, 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
added validation error
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Oct 31, 2022
commit 22b53ef3729f67b418500e70eeba3536873adec7
36 changes: 24 additions & 12 deletions coderd/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {

queryStr := r.URL.Query().Get("q")
filter, errs := auditSearchQuery(queryStr)
fmt.Println("BLOOP FILTER", filter)
fmt.Println("FILTER", filter.DateFrom)
fmt.Println("FILTER", filter.DateTo)

if len(errs) > 0 {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Expand All @@ -52,7 +53,8 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
Action: filter.Action,
Username: filter.Username,
Email: filter.Email,
TimeFrom: filter.TimeFrom,
DateFrom: filter.DateFrom,
DateTo: filter.DateTo,
})
if err != nil {
httpapi.InternalServerError(rw, err)
Expand Down Expand Up @@ -287,24 +289,34 @@ func auditSearchQuery(query string) (database.GetAuditLogsOffsetParams, []coders
const layout = "2006-01-02"

var (
timeFromString = parser.String(searchParams, "", "time_from")
timeToString = parser.String(searchParams, "", "time_to")
parsedTimeFrom, _ = time.Parse(layout, timeFromString)
parsedTimeTo, _ = time.Parse(layout, timeToString)
filter = database.GetAuditLogsOffsetParams{
dateFromString = parser.String(searchParams, "", "date_from")
dateToString = parser.String(searchParams, "", "date_to")
parsedDateFrom, _ = time.Parse(layout, dateFromString)
parsedDateTo, _ = time.Parse(layout, dateToString)
)

if dateToString != "" {
parsedDateTo = parsedDateTo.Add(23*time.Hour + 59*time.Minute + 59*time.Second) // parsedDateTo goes to 23:59
}

if dateToString != "" && parsedDateTo.Before(parsedDateFrom) {
return database.GetAuditLogsOffsetParams{}, []codersdk.ValidationError{
{Field: "q", Detail: fmt.Sprintf("DateTo value %q cannot be before than DateFrom", parsedDateTo)},
}
}

var (
filter = database.GetAuditLogsOffsetParams{
ResourceType: resourceTypeFromString(parser.String(searchParams, "", "resource_type")),
ResourceID: parser.UUID(searchParams, uuid.Nil, "resource_id"),
Action: actionFromString(parser.String(searchParams, "", "action")),
Username: parser.String(searchParams, "", "username"),
Email: parser.String(searchParams, "", "email"),
TimeFrom: parsedTimeFrom,
TimeTo: parsedTimeTo,
DateFrom: parsedDateFrom,
DateTo: parsedDateTo,
}
)

fmt.Println("FROM!", parsedTimeFrom)
fmt.Println("TO!", parsedTimeTo)

return filter, parser.Errors
}

Expand Down
12 changes: 6 additions & 6 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.

12 changes: 6 additions & 6 deletions coderd/database/queries/auditlogs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ WHERE
users.email = @email
ELSE true
END
-- Filter by time_from
-- Filter by date_from
AND CASE
WHEN @time_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
"time" >= @time_from
WHEN @date_from :: timestamp with time zone != '0001-01-01 00:00:00' THEN
"time" >= @date_from
ELSE true
END
-- Filter by time_to
-- Filter by date_to
AND CASE
WHEN @time_to :: timestamp with time zone != '0001-01-01 00:00:00' THEN
"time" <= @time_to
WHEN @date_to :: timestamp with time zone != '0001-01-01 00:00:00' THEN
"time" <= @date_to
ELSE true
END
ORDER BY
Expand Down
2 changes: 0 additions & 2 deletions site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,8 @@ export const getAuditLogs = async (
searchParams.set("offset", options.offset.toString())
}
if (options.q) {
console.log('q', options.q)
searchParams.set("q", options.q)
}
console.log('searchParams', searchParams)

const response = await axios.get(`/api/v2/audit?${searchParams.toString()}`)
return response.data
Expand Down