Skip to content

Make audit log end dates exclusive #199

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
yummybomb merged 1 commit into from
Jul 10, 2026
Merged

Make audit log end dates exclusive #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 7 additions & 12 deletions cmd/audit_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,17 @@ func (c AuditLogsCmd) Search(ctx context.Context, in AuditLogsSearchInput) error
var err error
start := time.Now().UTC().Add(-24 * time.Hour)
if in.Start != "" {
start, _, err = parseAuditLogTime(in.Start)
start, err = parseAuditLogTime(in.Start)
if err != nil {
return fmt.Errorf("--start: %w", err)
}
}
end := time.Now().UTC()
if in.End != "" {
var dateOnly bool
end, dateOnly, err = parseAuditLogTime(in.End)
end, err = parseAuditLogTime(in.End)
if err != nil {
return fmt.Errorf("--end: %w", err)
}
// End is exclusive; a date-only end means the whole of that day.
if dateOnly {
end = end.Add(24 * time.Hour)
}
}
if !start.Before(end) {
return fmt.Errorf("--start must be before --end")
Expand Down Expand Up @@ -164,14 +159,14 @@ func peekForMore(pager *pagination.PageTokenPaginationAutoPager[kernel.AuditLogE
return true
}

func parseAuditLogTime(value string) (t time.Time, dateOnly bool, err error) {
func parseAuditLogTime(value string) (time.Time, error) {
if t, err := time.Parse(time.RFC3339, value); err == nil {
return t, false, nil
return t, nil
}
if t, err := time.Parse("2006-01-02", value); err == nil {
return t, true, nil
return t, nil
}
return time.Time{}, false, fmt.Errorf("invalid time %q (expected RFC3339 like 2026-07-01T15:04:05Z or a date like 2026-07-01)", value)
return time.Time{}, fmt.Errorf("invalid time %q (expected RFC3339 like 2026-07-01T15:04:05Z or a date like 2026-07-01)", value)
}

func formatAuditLogUser(entry kernel.AuditLogEntry) string {
Expand Down Expand Up @@ -238,7 +233,7 @@ var auditLogsSearchCmd = &cobra.Command{
func init() {
addJSONOutputFlag(auditLogsSearchCmd)
auditLogsSearchCmd.Flags().String("start", "", "Start of the search window, RFC3339 or YYYY-MM-DD (default: 24 hours ago)")
auditLogsSearchCmd.Flags().String("end", "", "End of the search window, RFC3339 or YYYY-MM-DD inclusive (default: now)")
auditLogsSearchCmd.Flags().String("end", "", "Exclusive end of the search window, RFC3339 or YYYY-MM-DD (default: now)")
auditLogsSearchCmd.Flags().String("search", "", "Free-text search")
auditLogsSearchCmd.Flags().String("method", "", "Filter by HTTP method (e.g. GET)")
auditLogsSearchCmd.Flags().String("exclude-method", "", "Exclude an HTTP method")
Expand Down
8 changes: 4 additions & 4 deletions cmd/audit_logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,18 @@ func TestAuditLogsSearchDefaultsWindowToLast24Hours(t *testing.T) {
assert.WithinDuration(t, time.Now().UTC(), gotEnd, time.Minute)
}

func TestAuditLogsSearchDateOnlyEndCoversWholeDay(t *testing.T) {
func TestAuditLogsSearchDateOnlyEndIsExclusive(t *testing.T) {
capturePtermOutput(t)
fake := &FakeAuditLogsService{
ListAutoPagingFunc: func(ctx context.Context, query kernel.AuditLogListParams, opts ...option.RequestOption) *pagination.PageTokenPaginationAutoPager[kernel.AuditLogEntry] {
assert.Equal(t, time.Date(2026, 7, 1, 0, 0, 0, 0, time.UTC), query.Start)
assert.Equal(t, time.Date(2026, 7, 2, 0, 0, 0, 0, time.UTC), query.End)
assert.Equal(t, time.Date(2026, 6, 30, 0, 0, 0, 0, time.UTC), query.Start)
assert.Equal(t, time.Date(2026, 7, 1, 0, 0, 0, 0, time.UTC), query.End)
return auditLogPager()
},
}
c := AuditLogsCmd{auditLogs: fake}

err := c.Search(context.Background(), AuditLogsSearchInput{Start: "2026-07-01", End: "2026-07-01", Limit: 100})
err := c.Search(context.Background(), AuditLogsSearchInput{Start: "2026-06-30", End: "2026-07-01", Limit: 100})
require.NoError(t, err)
}

Expand Down
Loading