Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 88f22b7

Browse files
mafredrimafredri
committed
add orgid to test data
1 parent a6d9cf1 commit 88f22b7

File tree

1 file changed

+49
-40
lines changed

1 file changed

+49
-40
lines changed

‎coderd/audit_test.go

+49-40
Original file line numberDiff line numberDiff line change
@@ -241,83 +241,92 @@ func TestAuditLogsFilter(t *testing.T) {
241241

242242
// Create two logs with "Create"
243243
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
244+
OrganizationID: user.OrganizationID,
245+
Action: codersdk.AuditActionCreate,
246+
ResourceType: codersdk.ResourceTypeTemplate,
247+
ResourceID: template.ID,
248+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
248249
})
249250
require.NoError(t, err)
250251
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
252+
OrganizationID: user.OrganizationID,
253+
Action: codersdk.AuditActionCreate,
254+
ResourceType: codersdk.ResourceTypeUser,
255+
ResourceID: user.UserID,
256+
Time: time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
255257
})
256258
require.NoError(t, err)
257259

258260
// Create one log with "Delete"
259261
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
262+
OrganizationID: user.OrganizationID,
263+
Action: codersdk.AuditActionDelete,
264+
ResourceType: codersdk.ResourceTypeUser,
265+
ResourceID: user.UserID,
266+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
264267
})
265268
require.NoError(t, err)
266269

267270
// Create one log with "Start"
268271
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
272+
OrganizationID: user.OrganizationID,
273+
Action: codersdk.AuditActionStart,
274+
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
275+
ResourceID: workspace.LatestBuild.ID,
276+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
273277
})
274278
require.NoError(t, err)
275279

276280
// Create one log with "Stop"
277281
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
282+
OrganizationID: user.OrganizationID,
283+
Action: codersdk.AuditActionStop,
284+
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
285+
ResourceID: workspace.LatestBuild.ID,
286+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
282287
})
283288
require.NoError(t, err)
284289

285290
// Create one log with "Connect" and "Disconect".
286291
connectRequestID := uuid.New()
287292
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
293+
OrganizationID: user.OrganizationID,
294+
Action: codersdk.AuditActionConnect,
295+
RequestID: connectRequestID,
296+
ResourceType: codersdk.ResourceTypeWorkspaceAgent,
297+
ResourceID: workspace.LatestBuild.Resources[0].Agents[0].ID,
298+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
293299
})
294300
require.NoError(t, err)
295301

296302
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
303+
OrganizationID: user.OrganizationID,
304+
Action: codersdk.AuditActionDisconnect,
305+
RequestID: connectRequestID,
306+
ResourceType: codersdk.ResourceTypeWorkspaceAgent,
307+
ResourceID: workspace.LatestBuild.Resources[0].Agents[0].ID,
308+
Time: time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
302309
})
303310
require.NoError(t, err)
304311

305312
// Create one log with "Open" and "Close".
306313
openRequestID := uuid.New()
307314
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
315+
OrganizationID: user.OrganizationID,
316+
Action: codersdk.AuditActionOpen,
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, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
313321
})
314322
require.NoError(t, err)
315323
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
324+
OrganizationID: user.OrganizationID,
325+
Action: codersdk.AuditActionClose,
326+
RequestID: openRequestID,
327+
ResourceType: codersdk.ResourceTypeWorkspaceApp,
328+
ResourceID: workspace.LatestBuild.Resources[0].Agents[0].Apps[0].ID,
329+
Time: time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
321330
})
322331
require.NoError(t, err)
323332

0 commit comments

Comments
 (0)