Skip to content

Commit 469e2cd

Browse files
mafredrimafredri
committed
add orgid to test data
1 parent a790c5e commit 469e2cd

File tree

1 file changed

+56
-43
lines changed

1 file changed

+56
-43
lines changed

‎coderd/audit_test.go

Lines changed: 56 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ func TestAuditLogs(t *testing.T) {
3232
user := coderdtest.CreateFirstUser(t, client)
3333

3434
err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
35-
ResourceID: user.UserID,
35+
ResourceID: user.UserID,
36+
OrganizationID: user.OrganizationID,
3637
})
3738
require.NoError(t, err)
3839

@@ -56,7 +57,8 @@ func TestAuditLogs(t *testing.T) {
5657
client2, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleOwner())
5758

5859
err := client2.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
59-
ResourceID: user2.ID,
60+
ResourceID: user2.ID,
61+
OrganizationID: user.OrganizationID,
6062
})
6163
require.NoError(t, err)
6264

@@ -125,6 +127,7 @@ func TestAuditLogs(t *testing.T) {
125127
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
126128
ResourceID: workspace.LatestBuild.ID,
127129
AdditionalFields: wriBytes,
130+
OrganizationID: user.OrganizationID,
128131
})
129132
require.NoError(t, err)
130133

@@ -160,7 +163,8 @@ func TestAuditLogs(t *testing.T) {
160163

161164
// Add an extra audit log in another organization
162165
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
163-
ResourceID: owner.UserID,
166+
ResourceID: owner.UserID,
167+
OrganizationID: uuid.New(),
164168
})
165169
require.NoError(t, err)
166170

@@ -241,83 +245,92 @@ func TestAuditLogsFilter(t *testing.T) {
241245

242246
// Create two logs with "Create"
243247
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
248253
})
249254
require.NoError(t, err)
250255
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
255261
})
256262
require.NoError(t, err)
257263

258264
// Create one log with "Delete"
259265
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
264271
})
265272
require.NoError(t, err)
266273

267274
// Create one log with "Start"
268275
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
273281
})
274282
require.NoError(t, err)
275283

276284
// Create one log with "Stop"
277285
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
282291
})
283292
require.NoError(t, err)
284293

285294
// Create one log with "Connect" and "Disconect".
286295
connectRequestID := uuid.New()
287296
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
293303
})
294304
require.NoError(t, err)
295305

296306
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
302313
})
303314
require.NoError(t, err)
304315

305316
// Create one log with "Open" and "Close".
306317
openRequestID := uuid.New()
307318
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
313325
})
314326
require.NoError(t, err)
315327
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
321334
})
322335
require.NoError(t, err)
323336

0 commit comments

Comments
 (0)