add orgid to test data

mafredri · mafredri · commit 88f22b715f14 · 2025-02-12T15:04:12.000Z
diff --git a/coderd/audit_test.go b/coderd/audit_test.go
@@ -241,83 +241,92 @@ 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
+			OrganizationID: user.OrganizationID,
+			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
 		})
 		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
+			OrganizationID: user.OrganizationID,
+			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
 		})
 		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
+			OrganizationID: user.OrganizationID,
+			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
 		})
 		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
+			OrganizationID: user.OrganizationID,
+			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
 		})
 		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
+			OrganizationID: user.OrganizationID,
+			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
 		})
 		require.NoError(t, err)
 
 		// Create one log with "Connect" and "Disconect".
 		connectRequestID := uuid.New()
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionConnect,
-			RequestID:    connectRequestID,
-			ResourceType: codersdk.ResourceTypeWorkspaceAgent,
-			ResourceID:   workspace.LatestBuild.Resources[0].Agents[0].ID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			OrganizationID: user.OrganizationID,
+			Action:         codersdk.AuditActionConnect,
+			RequestID:      connectRequestID,
+			ResourceType:   codersdk.ResourceTypeWorkspaceAgent,
+			ResourceID:     workspace.LatestBuild.Resources[0].Agents[0].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.AuditActionDisconnect,
-			RequestID:    connectRequestID,
-			ResourceType: codersdk.ResourceTypeWorkspaceAgent,
-			ResourceID:   workspace.LatestBuild.Resources[0].Agents[0].ID,
-			Time:         time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
+			OrganizationID: user.OrganizationID,
+			Action:         codersdk.AuditActionDisconnect,
+			RequestID:      connectRequestID,
+			ResourceType:   codersdk.ResourceTypeWorkspaceAgent,
+			ResourceID:     workspace.LatestBuild.Resources[0].Agents[0].ID,
+			Time:           time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
 		})
 		require.NoError(t, err)
 
 		// Create one log with "Open" and "Close".
 		openRequestID := uuid.New()
 		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			Action:       codersdk.AuditActionOpen,
-			RequestID:    openRequestID,
-			ResourceType: codersdk.ResourceTypeWorkspaceApp,
-			ResourceID:   workspace.LatestBuild.Resources[0].Agents[0].Apps[0].ID,
-			Time:         time.Date(2022, 8, 15, 14, 30, 45, 100, time.UTC), // 2022-8-15 14:30:45
+			OrganizationID: user.OrganizationID,
+			Action:         codersdk.AuditActionOpen,
+			RequestID:      openRequestID,
+			ResourceType:   codersdk.ResourceTypeWorkspaceApp,
+			ResourceID:     workspace.LatestBuild.Resources[0].Agents[0].Apps[0].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.AuditActionClose,
-			RequestID:    openRequestID,
-			ResourceType: codersdk.ResourceTypeWorkspaceApp,
-			ResourceID:   workspace.LatestBuild.Resources[0].Agents[0].Apps[0].ID,
-			Time:         time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
+			OrganizationID: user.OrganizationID,
+			Action:         codersdk.AuditActionClose,
+			RequestID:      openRequestID,
+			ResourceType:   codersdk.ResourceTypeWorkspaceApp,
+			ResourceID:     workspace.LatestBuild.Resources[0].Agents[0].Apps[0].ID,
+			Time:           time.Date(2022, 8, 15, 14, 35, 0o0, 100, time.UTC), // 2022-8-15 14:35:00
 		})
 		require.NoError(t, err)
 
