Skip to content

Commit 8496240

Browse files
code-ashercode-asher
committed
Remove unnecessary org ID from audit tests
1 parent c0d376f commit 8496240

File tree

1 file changed

+23
-32
lines changed

1 file changed

+23
-32
lines changed

‎coderd/audit_test.go

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

3333
err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
34-
OrganizationID: uuid.New(),
35-
ResourceID: user.UserID,
34+
ResourceID: user.UserID,
3635
})
3736
require.NoError(t, err)
3837

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

5857
err := client2.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
59-
OrganizationID: uuid.New(),
60-
ResourceID: user2.ID,
58+
ResourceID: user2.ID,
6159
})
6260
require.NoError(t, err)
6361

@@ -199,7 +197,6 @@ func TestAuditLogs(t *testing.T) {
199197
require.NoError(t, err)
200198

201199
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
202-
OrganizationID: uuid.New(),
203200
Action: codersdk.AuditActionStop,
204201
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
205202
ResourceID: workspace.LatestBuild.ID,
@@ -239,8 +236,7 @@ func TestAuditLogs(t *testing.T) {
239236

240237
// Add an extra audit log in another organization
241238
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
242-
ResourceID: owner.UserID,
243-
OrganizationID: uuid.New(),
239+
ResourceID: owner.UserID,
244240
})
245241
require.NoError(t, err)
246242

@@ -321,49 +317,44 @@ func TestAuditLogsFilter(t *testing.T) {
321317

322318
// Create two logs with "Create"
323319
err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
324-
Action: codersdk.AuditActionCreate,
325-
OrganizationID: uuid.New(),
326-
ResourceType: codersdk.ResourceTypeTemplate,
327-
ResourceID: template.ID,
328-
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
320+
Action: codersdk.AuditActionCreate,
321+
ResourceType: codersdk.ResourceTypeTemplate,
322+
ResourceID: template.ID,
323+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
329324
})
330325
require.NoError(t, err)
331326
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
332-
Action: codersdk.AuditActionCreate,
333-
OrganizationID: uuid.New(),
334-
ResourceType: codersdk.ResourceTypeUser,
335-
ResourceID: user.UserID,
336-
Time: time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
327+
Action: codersdk.AuditActionCreate,
328+
ResourceType: codersdk.ResourceTypeUser,
329+
ResourceID: user.UserID,
330+
Time: time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
337331
})
338332
require.NoError(t, err)
339333

340334
// Create one log with "Delete"
341335
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
342-
Action: codersdk.AuditActionDelete,
343-
OrganizationID: uuid.New(),
344-
ResourceType: codersdk.ResourceTypeUser,
345-
ResourceID: user.UserID,
346-
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
336+
Action: codersdk.AuditActionDelete,
337+
ResourceType: codersdk.ResourceTypeUser,
338+
ResourceID: user.UserID,
339+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
347340
})
348341
require.NoError(t, err)
349342

350343
// Create one log with "Start"
351344
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
352-
Action: codersdk.AuditActionStart,
353-
OrganizationID: uuid.New(),
354-
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
355-
ResourceID: workspace.LatestBuild.ID,
356-
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
345+
Action: codersdk.AuditActionStart,
346+
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
347+
ResourceID: workspace.LatestBuild.ID,
348+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
357349
})
358350
require.NoError(t, err)
359351

360352
// Create one log with "Stop"
361353
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
362-
Action: codersdk.AuditActionStop,
363-
OrganizationID: uuid.New(),
364-
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
365-
ResourceID: workspace.LatestBuild.ID,
366-
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
354+
Action: codersdk.AuditActionStop,
355+
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
356+
ResourceID: workspace.LatestBuild.ID,
357+
Time: time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
367358
})
368359
require.NoError(t, err)
369360

0 commit comments

Comments
 (0)