Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: transaction ...: in use: for query #2278

Merged
merged 9 commits into from
Oct 11, 2024
Merged

fix: transaction ...: in use: for query #2278

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13371ce
fix: transaction ...: in use: for query
Flo4604 Oct 8, 2024
518f77a
Merge branch 'main' into fix/v1_permissions_createRole_transaction_error
Flo4604 Oct 8, 2024
479043a
docs: explain for future self
chronark Oct 8, 2024
a61f1ad
Merge branch 'main' into fix/v1_permissions_createRole_transaction_error
chronark Oct 8, 2024
e4ae521
fix: another racecondition
Flo4604 Oct 8, 2024
2beb1e6
Merge branch 'main' into fix/v1_permissions_createRole_transaction_error
Flo4604 Oct 8, 2024
cb025c9
Merge branch 'main' into fix/v1_permissions_createRole_transaction_error
Flo4604 Oct 9, 2024
41ca6b9
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 10, 2024
2539db5
Merge branch 'main' into fix/v1_permissions_createRole_transaction_error
Flo4604 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions apps/api/src/pkg/audit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,31 @@ export async function insertGenericAuditLogs(

const { cache, logger, db } = c.get("services");

const auditLogsInserts = [];
const auditLogTargetInserts = [];

for (const log of arr) {
const cacheKey = [log.workspaceId, log.bucket].join(":");
let { val: bucket, err } = await cache.auditLogBucketByWorkspaceIdAndName.swr(
cacheKey,
async () => {
const bucket = await (tx ?? db.primary).query.auditLogBucket.findFirst({
// do not use the transaction here, otherwise we may run into race conditions
// https://github.com/unkeyed/unkey/pull/2278
const bucket = await db.readonly.query.auditLogBucket.findFirst({
where: (table, { eq, and }) =>
and(eq(table.workspaceId, log.workspaceId), eq(table.name, log.bucket)),
});

if (!bucket) {
return undefined;
}

return {
id: bucket.id,
};
},
);

if (err) {
logger.error("Could not find audit log bucket for workspace", {
workspaceId: log.workspaceId,
Expand All @@ -68,7 +76,9 @@ export async function insertGenericAuditLogs(

if (!bucket) {
const bucketId = newId("auditLogBucket");
await (tx ?? db.primary).insert(schema.auditLogBucket).values({
// do not use the transaction here, otherwise we may run into race conditions
// https://github.com/unkeyed/unkey/pull/2278
await db.primary.insert(schema.auditLogBucket).values({
chronark marked this conversation as resolved.
Show resolved Hide resolved
id: bucketId,
workspaceId: log.workspaceId,
name: log.bucket,
Expand All @@ -79,7 +89,7 @@ export async function insertGenericAuditLogs(
}

const auditLogId = newId("auditLog");
await (tx ?? db.primary).insert(schema.auditLog).values({
auditLogsInserts.push({
id: auditLogId,
workspaceId: log.workspaceId,
bucketId: bucket.id,
Expand All @@ -96,8 +106,9 @@ export async function insertGenericAuditLogs(
actorName: log.actor.name,
actorMeta: log.actor.meta,
});
await (tx ?? db.primary).insert(schema.auditLogTarget).values(
log.resources.map((r) => ({

auditLogTargetInserts.push(
...log.resources.map((r) => ({
workspaceId: log.workspaceId,
bucketId: bucket.id,
auditLogId,
Expand All @@ -109,4 +120,8 @@ export async function insertGenericAuditLogs(
})),
);
}

await (tx ?? db.primary).insert(schema.auditLog).values(auditLogsInserts);

await (tx ?? db.primary).insert(schema.auditLogTarget).values(auditLogTargetInserts);
}
Loading