Allow creating test audits with nil org

code-asher · code-asher · commit 6d2c42715ec1 · 2024-07-19T14:53:48.000-08:00
Not all audit entries have organization IDs, so this will allow us to
test those cases.
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -145,9 +145,6 @@ func (api *API) generateFakeAuditLog(rw http.ResponseWriter, r *http.Request) {
 	if len(params.AdditionalFields) == 0 {
 		params.AdditionalFields = json.RawMessage("{}")
 	}
-	if params.OrganizationID == uuid.Nil {
-		params.OrganizationID = uuid.New()
-	}
 
 	_, err = api.Database.InsertAuditLog(ctx, database.InsertAuditLogParams{
 		ID:               uuid.New(),
diff --git a/coderd/audit_test.go b/coderd/audit_test.go
@@ -31,7 +31,8 @@ func TestAuditLogs(t *testing.T) {
 		user := coderdtest.CreateFirstUser(t, client)
 
 		err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			ResourceID: user.UserID,
+			OrganizationID: uuid.New(),
+			ResourceID:     user.UserID,
 		})
 		require.NoError(t, err)
 
@@ -55,7 +56,8 @@ func TestAuditLogs(t *testing.T) {
 		client2, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleOwner())
 
 		err := client2.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			ResourceID: user2.ID,
+			OrganizationID: uuid.New(),
+			ResourceID:     user2.ID,
 		})
 		require.NoError(t, err)
 
@@ -120,6 +122,7 @@ func TestAuditLogs(t *testing.T) {
 		require.NoError(t, err)
 
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
+			OrganizationID:   uuid.New(),
 			Action:           codersdk.AuditActionStop,
 			ResourceType:     codersdk.ResourceTypeWorkspaceBuild,
 			ResourceID:       workspace.LatestBuild.ID,
@@ -241,44 +244,49 @@ func TestAuditLogsFilter(t *testing.T) {
 
 		// Create two logs with "Create"
 		err := client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionCreate,
-			ResourceType: codersdk.ResourceTypeTemplate,
-			ResourceID:   template.ID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			Action:         codersdk.AuditActionCreate,
+			OrganizationID: uuid.New(),
+			ResourceType:   codersdk.ResourceTypeTemplate,
+			ResourceID:     template.ID,
+			Time:           time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
 		})
 		require.NoError(t, err)
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionCreate,
-			ResourceType: codersdk.ResourceTypeUser,
-			ResourceID:   user.UserID,
-			Time:         time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
+			Action:         codersdk.AuditActionCreate,
+			OrganizationID: uuid.New(),
+			ResourceType:   codersdk.ResourceTypeUser,
+			ResourceID:     user.UserID,
+			Time:           time.Date(2022, 8, 16, 14, 30, 45, 100, time.UTC), // 2022-8-16 14:30:45
 		})
 		require.NoError(t, err)
 
 		// Create one log with "Delete"
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionDelete,
-			ResourceType: codersdk.ResourceTypeUser,
-			ResourceID:   user.UserID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			Action:         codersdk.AuditActionDelete,
+			OrganizationID: uuid.New(),
+			ResourceType:   codersdk.ResourceTypeUser,
+			ResourceID:     user.UserID,
+			Time:           time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
 		})
 		require.NoError(t, err)
 
 		// Create one log with "Start"
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionStart,
-			ResourceType: codersdk.ResourceTypeWorkspaceBuild,
-			ResourceID:   workspace.LatestBuild.ID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			Action:         codersdk.AuditActionStart,
+			OrganizationID: uuid.New(),
+			ResourceType:   codersdk.ResourceTypeWorkspaceBuild,
+			ResourceID:     workspace.LatestBuild.ID,
+			Time:           time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
 		})
 		require.NoError(t, err)
 
 		// Create one log with "Stop"
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionStop,
-			ResourceType: codersdk.ResourceTypeWorkspaceBuild,
-			ResourceID:   workspace.LatestBuild.ID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			Action:         codersdk.AuditActionStop,
+			OrganizationID: uuid.New(),
+			ResourceType:   codersdk.ResourceTypeWorkspaceBuild,
+			ResourceID:     workspace.LatestBuild.ID,
+			Time:           time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
 		})
 		require.NoError(t, err)
 

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,6 @@ func (api API) generateFakeAuditLog(rw http.ResponseWriter, r http.Request) {`
`145`	`145`	`if len(params.AdditionalFields) == 0 {`
`146`	`146`	`params.AdditionalFields = json.RawMessage("{}")`
`147`	`147`	`}`
`148`		`- if params.OrganizationID == uuid.Nil {`
`149`		`- params.OrganizationID = uuid.New()`
`150`		`- }`
`151`	`148`
`152`	`149`	`_, err = api.Database.InsertAuditLog(ctx, database.InsertAuditLogParams{`
`153`	`150`	`ID: uuid.New(),`