Skip to content

Commit c3f04f5

Browse files
committed
attempt to add test
1 parent 8f5f3ca commit c3f04f5

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

coderd/audit.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,13 @@ func (api *API) generateFakeAuditLog(rw http.ResponseWriter, r *http.Request) {
145145
if params.ResourceID == uuid.Nil {
146146
params.ResourceID = uuid.New()
147147
}
148+
if params.Time.IsZero() {
149+
params.Time = time.Now()
150+
}
148151

149152
_, err = api.Database.InsertAuditLog(ctx, database.InsertAuditLogParams{
150153
ID: uuid.New(),
151-
Time: time.Now(),
154+
Time: params.Time,
152155
UserID: user.ID,
153156
Ip: ipNet,
154157
UserAgent: r.UserAgent(),

coderd/audit_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package coderd_test
33
import (
44
"context"
55
"testing"
6+
"time"
67

78
"github.com/google/uuid"
89
"github.com/stretchr/testify/require"
@@ -54,12 +55,14 @@ func TestAuditLogsFilter(t *testing.T) {
5455
err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
5556
Action: codersdk.AuditActionCreate,
5657
ResourceType: codersdk.ResourceTypeTemplate,
58+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
5759
})
5860
require.NoError(t, err)
5961
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
6062
Action: codersdk.AuditActionCreate,
6163
ResourceType: codersdk.ResourceTypeUser,
6264
ResourceID: userResourceID,
65+
Time: time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
6366
})
6467
require.NoError(t, err)
6568

@@ -127,6 +130,11 @@ func TestAuditLogsFilter(t *testing.T) {
127130
SearchQuery: "action:invalid",
128131
ExpectedResult: 3,
129132
},
133+
{
134+
Name: "FilterWithDateFrom",
135+
SearchQuery: "action:create date_from:2022-08-15 date_to:2022-08-15",
136+
ExpectedResult: 1,
137+
},
130138
}
131139

132140
for _, testCase := range testCases {

codersdk/audit.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ type CreateTestAuditLogRequest struct {
127127
Action AuditAction `json:"action,omitempty"`
128128
ResourceType ResourceType `json:"resource_type,omitempty"`
129129
ResourceID uuid.UUID `json:"resource_id,omitempty"`
130+
Time time.Time `json:"time,omitempty"`
130131
}
131132

132133
// AuditLogs retrieves audit logs from the given page.

0 commit comments

Comments
 (0)