@@ -32,7 +32,8 @@ func TestAuditLogs(t *testing.T) {
32
32
user := coderdtest .CreateFirstUser (t ,client )
33
33
34
34
err := client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
35
- ResourceID :user .UserID ,
35
+ ResourceID :user .UserID ,
36
+ OrganizationID :user .OrganizationID ,
36
37
})
37
38
require .NoError (t ,err )
38
39
@@ -56,7 +57,8 @@ func TestAuditLogs(t *testing.T) {
56
57
client2 ,user2 := coderdtest .CreateAnotherUser (t ,client ,user .OrganizationID ,rbac .RoleOwner ())
57
58
58
59
err := client2 .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
59
- ResourceID :user2 .ID ,
60
+ ResourceID :user2 .ID ,
61
+ OrganizationID :user .OrganizationID ,
60
62
})
61
63
require .NoError (t ,err )
62
64
@@ -125,6 +127,7 @@ func TestAuditLogs(t *testing.T) {
125
127
ResourceType :codersdk .ResourceTypeWorkspaceBuild ,
126
128
ResourceID :workspace .LatestBuild .ID ,
127
129
AdditionalFields :wriBytes ,
130
+ OrganizationID :user .OrganizationID ,
128
131
})
129
132
require .NoError (t ,err )
130
133
@@ -160,7 +163,8 @@ func TestAuditLogs(t *testing.T) {
160
163
161
164
// Add an extra audit log in another organization
162
165
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
163
- ResourceID :owner .UserID ,
166
+ ResourceID :owner .UserID ,
167
+ OrganizationID :uuid .New (),
164
168
})
165
169
require .NoError (t ,err )
166
170
@@ -241,83 +245,92 @@ func TestAuditLogsFilter(t *testing.T) {
241
245
242
246
// Create two logs with "Create"
243
247
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
248
+ OrganizationID :user .OrganizationID ,
249
+ Action :codersdk .AuditActionCreate ,
250
+ ResourceType :codersdk .ResourceTypeTemplate ,
251
+ ResourceID :template .ID ,
252
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
248
253
})
249
254
require .NoError (t ,err )
250
255
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
256
+ OrganizationID :user .OrganizationID ,
257
+ Action :codersdk .AuditActionCreate ,
258
+ ResourceType :codersdk .ResourceTypeUser ,
259
+ ResourceID :user .UserID ,
260
+ Time :time .Date (2022 ,8 ,16 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-16 14:30:45
255
261
})
256
262
require .NoError (t ,err )
257
263
258
264
// Create one log with "Delete"
259
265
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
266
+ OrganizationID :user .OrganizationID ,
267
+ Action :codersdk .AuditActionDelete ,
268
+ ResourceType :codersdk .ResourceTypeUser ,
269
+ ResourceID :user .UserID ,
270
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
264
271
})
265
272
require .NoError (t ,err )
266
273
267
274
// Create one log with "Start"
268
275
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
276
+ OrganizationID :user .OrganizationID ,
277
+ Action :codersdk .AuditActionStart ,
278
+ ResourceType :codersdk .ResourceTypeWorkspaceBuild ,
279
+ ResourceID :workspace .LatestBuild .ID ,
280
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
273
281
})
274
282
require .NoError (t ,err )
275
283
276
284
// Create one log with "Stop"
277
285
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
286
+ OrganizationID :user .OrganizationID ,
287
+ Action :codersdk .AuditActionStop ,
288
+ ResourceType :codersdk .ResourceTypeWorkspaceBuild ,
289
+ ResourceID :workspace .LatestBuild .ID ,
290
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
282
291
})
283
292
require .NoError (t ,err )
284
293
285
294
// Create one log with "Connect" and "Disconect".
286
295
connectRequestID := uuid .New ()
287
296
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
288
- Action :codersdk .AuditActionConnect ,
289
- RequestID :connectRequestID ,
290
- ResourceType :codersdk .ResourceTypeWorkspaceAgent ,
291
- ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].ID ,
292
- Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
297
+ OrganizationID :user .OrganizationID ,
298
+ Action :codersdk .AuditActionConnect ,
299
+ RequestID :connectRequestID ,
300
+ ResourceType :codersdk .ResourceTypeWorkspaceAgent ,
301
+ ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].ID ,
302
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
293
303
})
294
304
require .NoError (t ,err )
295
305
296
306
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
297
- Action :codersdk .AuditActionDisconnect ,
298
- RequestID :connectRequestID ,
299
- ResourceType :codersdk .ResourceTypeWorkspaceAgent ,
300
- ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].ID ,
301
- Time :time .Date (2022 ,8 ,15 ,14 ,35 ,0o0 ,100 ,time .UTC ),// 2022-8-15 14:35:00
307
+ OrganizationID :user .OrganizationID ,
308
+ Action :codersdk .AuditActionDisconnect ,
309
+ RequestID :connectRequestID ,
310
+ ResourceType :codersdk .ResourceTypeWorkspaceAgent ,
311
+ ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].ID ,
312
+ Time :time .Date (2022 ,8 ,15 ,14 ,35 ,0o0 ,100 ,time .UTC ),// 2022-8-15 14:35:00
302
313
})
303
314
require .NoError (t ,err )
304
315
305
316
// Create one log with "Open" and "Close".
306
317
openRequestID := uuid .New ()
307
318
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
308
- Action :codersdk .AuditActionOpen ,
309
- RequestID :openRequestID ,
310
- ResourceType :codersdk .ResourceTypeWorkspaceApp ,
311
- ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].Apps [0 ].ID ,
312
- Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
319
+ OrganizationID :user .OrganizationID ,
320
+ Action :codersdk .AuditActionOpen ,
321
+ RequestID :openRequestID ,
322
+ ResourceType :codersdk .ResourceTypeWorkspaceApp ,
323
+ ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].Apps [0 ].ID ,
324
+ Time :time .Date (2022 ,8 ,15 ,14 ,30 ,45 ,100 ,time .UTC ),// 2022-8-15 14:30:45
313
325
})
314
326
require .NoError (t ,err )
315
327
err = client .CreateTestAuditLog (ctx , codersdk.CreateTestAuditLogRequest {
316
- Action :codersdk .AuditActionClose ,
317
- RequestID :openRequestID ,
318
- ResourceType :codersdk .ResourceTypeWorkspaceApp ,
319
- ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].Apps [0 ].ID ,
320
- Time :time .Date (2022 ,8 ,15 ,14 ,35 ,0o0 ,100 ,time .UTC ),// 2022-8-15 14:35:00
328
+ OrganizationID :user .OrganizationID ,
329
+ Action :codersdk .AuditActionClose ,
330
+ RequestID :openRequestID ,
331
+ ResourceType :codersdk .ResourceTypeWorkspaceApp ,
332
+ ResourceID :workspace .LatestBuild .Resources [0 ].Agents [0 ].Apps [0 ].ID ,
333
+ Time :time .Date (2022 ,8 ,15 ,14 ,35 ,0o0 ,100 ,time .UTC ),// 2022-8-15 14:35:00
321
334
})
322
335
require .NoError (t ,err )
323
336