@@ -31,7 +31,8 @@ func TestAuditLogs(t *testing.T) {
31
31
user := coderdtest .CreateFirstUser (t , client )
32
32
33
33
err := client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
34
- ResourceID : user .UserID ,
34
+ OrganizationID : uuid .New (),
35
+ ResourceID : user .UserID ,
35
36
})
36
37
require .NoError (t , err )
37
38
@@ -55,7 +56,8 @@ func TestAuditLogs(t *testing.T) {
55
56
client2 , user2 := coderdtest .CreateAnotherUser (t , client , user .OrganizationID , rbac .RoleOwner ())
56
57
57
58
err := client2 .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
58
- ResourceID : user2 .ID ,
59
+ OrganizationID : uuid .New (),
60
+ ResourceID : user2 .ID ,
59
61
})
60
62
require .NoError (t , err )
61
63
@@ -120,6 +122,7 @@ func TestAuditLogs(t *testing.T) {
120
122
require .NoError (t , err )
121
123
122
124
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
125
+ OrganizationID : uuid .New (),
123
126
Action : codersdk .AuditActionStop ,
124
127
ResourceType : codersdk .ResourceTypeWorkspaceBuild ,
125
128
ResourceID : workspace .LatestBuild .ID ,
@@ -241,44 +244,49 @@ func TestAuditLogsFilter(t *testing.T) {
241
244
242
245
// Create two logs with "Create"
243
246
err := client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
244
- Action : codersdk .AuditActionCreate ,
245
- ResourceType : codersdk .ResourceTypeTemplate ,
246
- ResourceID : template .ID ,
247
- Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
247
+ Action : codersdk .AuditActionCreate ,
248
+ OrganizationID : uuid .New (),
249
+ ResourceType : codersdk .ResourceTypeTemplate ,
250
+ ResourceID : template .ID ,
251
+ Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
248
252
})
249
253
require .NoError (t , err )
250
254
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
251
- Action : codersdk .AuditActionCreate ,
252
- ResourceType : codersdk .ResourceTypeUser ,
253
- ResourceID : user .UserID ,
254
- Time : time .Date (2022 , 8 , 16 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-16 14:30:45
255
+ Action : codersdk .AuditActionCreate ,
256
+ OrganizationID : uuid .New (),
257
+ ResourceType : codersdk .ResourceTypeUser ,
258
+ ResourceID : user .UserID ,
259
+ Time : time .Date (2022 , 8 , 16 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-16 14:30:45
255
260
})
256
261
require .NoError (t , err )
257
262
258
263
// Create one log with "Delete"
259
264
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
260
- Action : codersdk .AuditActionDelete ,
261
- ResourceType : codersdk .ResourceTypeUser ,
262
- ResourceID : user .UserID ,
263
- Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
265
+ Action : codersdk .AuditActionDelete ,
266
+ OrganizationID : uuid .New (),
267
+ ResourceType : codersdk .ResourceTypeUser ,
268
+ ResourceID : user .UserID ,
269
+ Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
264
270
})
265
271
require .NoError (t , err )
266
272
267
273
// Create one log with "Start"
268
274
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
269
- Action : codersdk .AuditActionStart ,
270
- ResourceType : codersdk .ResourceTypeWorkspaceBuild ,
271
- ResourceID : workspace .LatestBuild .ID ,
272
- Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
275
+ Action : codersdk .AuditActionStart ,
276
+ OrganizationID : uuid .New (),
277
+ ResourceType : codersdk .ResourceTypeWorkspaceBuild ,
278
+ ResourceID : workspace .LatestBuild .ID ,
279
+ Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
273
280
})
274
281
require .NoError (t , err )
275
282
276
283
// Create one log with "Stop"
277
284
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
278
- Action : codersdk .AuditActionStop ,
279
- ResourceType : codersdk .ResourceTypeWorkspaceBuild ,
280
- ResourceID : workspace .LatestBuild .ID ,
281
- Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
285
+ Action : codersdk .AuditActionStop ,
286
+ OrganizationID : uuid .New (),
287
+ ResourceType : codersdk .ResourceTypeWorkspaceBuild ,
288
+ ResourceID : workspace .LatestBuild .ID ,
289
+ Time : time .Date (2022 , 8 , 15 , 14 , 30 , 45 , 100 , time .UTC ), // 2022-8-15 14:30:45
282
290
})
283
291
require .NoError (t , err )
284
292
0 commit comments