Skip to content

Commit 6d2c427

Browse files
committed
Allow creating test audits with nil org
Not all audit entries have organization IDs, so this will allow us to test those cases.
1 parent 554c4ab commit 6d2c427

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

coderd/audit.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ func (api *API) generateFakeAuditLog(rw http.ResponseWriter, r *http.Request) {
145145
if len(params.AdditionalFields) == 0 {
146146
params.AdditionalFields = json.RawMessage("{}")
147147
}
148-
if params.OrganizationID == uuid.Nil {
149-
params.OrganizationID = uuid.New()
150-
}
151148

152149
_, err = api.Database.InsertAuditLog(ctx, database.InsertAuditLogParams{
153150
ID: uuid.New(),

coderd/audit_test.go

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

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

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

5758
err := client2.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
58-
ResourceID: user2.ID,
59+
OrganizationID: uuid.New(),
60+
ResourceID: user2.ID,
5961
})
6062
require.NoError(t, err)
6163

@@ -120,6 +122,7 @@ func TestAuditLogs(t *testing.T) {
120122
require.NoError(t, err)
121123

122124
err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
125+
OrganizationID: uuid.New(),
123126
Action: codersdk.AuditActionStop,
124127
ResourceType: codersdk.ResourceTypeWorkspaceBuild,
125128
ResourceID: workspace.LatestBuild.ID,
@@ -241,44 +244,49 @@ func TestAuditLogsFilter(t *testing.T) {
241244

242245
// Create two logs with "Create"
243246
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
248252
})
249253
require.NoError(t, err)
250254
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
255260
})
256261
require.NoError(t, err)
257262

258263
// Create one log with "Delete"
259264
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
264270
})
265271
require.NoError(t, err)
266272

267273
// Create one log with "Start"
268274
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
273280
})
274281
require.NoError(t, err)
275282

276283
// Create one log with "Stop"
277284
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
282290
})
283291
require.NoError(t, err)
284292

0 commit comments

Comments
 (0)