Skip to content

chore: Readd resource workers #477

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

Merged
merged 3 commits into from
Apr 12, 2025
Merged

chore: Readd resource workers #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89b1574
chore: Readd resource workers
adityachoudhari26 Apr 12, 2025
d0dc8f2
Merge branch 'main' into readd-resource-queues
jsbroks Apr 12, 2025
ab575ef
Merge branch 'main' into readd-resource-queues
jsbroks Apr 12, 2025
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
12 changes: 6 additions & 6 deletions apps/event-worker/src/utils/upsert-release-targets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { and, eq } from "@ctrlplane/db";
import * as SCHEMA from "@ctrlplane/db/schema";
import { logger } from "@ctrlplane/logger";

Check failure on line 7 in apps/event-worker/src/utils/upsert-release-targets.ts

View workflow job for this annotation

GitHub Actions / Lint 

'logger' is defined but never used. Allowed unused vars must match /^_/u

const getReleaseTargetInsertsForSystem = async (
db: Tx,
Expand Down Expand Up @@ -55,10 +55,10 @@
),
).then((results) => results.flat());

// if (releaseTargetInserts.length === 0) return [];
// return db
// .insert(SCHEMA.releaseTarget)
// .values(releaseTargetInserts)
// .onConflictDoNothing()
// .returning();``
if (releaseTargetInserts.length === 0) return [];
return db
.insert(SCHEMA.releaseTarget)
.values(releaseTargetInserts)
.onConflictDoNothing()
.returning();
};
17 changes: 6 additions & 11 deletions apps/event-worker/src/workers/new-resource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ const queue = getQueue(Channel.EvaluateReleaseTarget);
export const newResourceWorker = createWorker(
Channel.NewResource,
async ({ data: resource }) => {
console.log("new resource", resource);
return;
// db.transaction(async (tx) => {
// const rts = await upsertReleaseTargets(tx, resource);
// await queue.addBulk(
// rts.map((rt) => ({
// name: `${rt.resourceId}-${rt.environmentId}-${rt.deploymentId}`,
// data: rt,
// })),
// );
// }),
const rts = await upsertReleaseTargets(db, resource);
const jobs = rts.map((rt) => ({
name: `${rt.resourceId}-${rt.environmentId}-${rt.deploymentId}`,
data: rt,
}));
await queue.addBulk(jobs);
},
);
72 changes: 31 additions & 41 deletions apps/event-worker/src/workers/updated-resources/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,43 @@ export const updatedResourceWorker = createWorker(
where: eq(SCHEMA.releaseTarget.resourceId, resource.id),
});

await upsertReleaseTargets(db, resource);

const endTime = performance.now();

logger.info(
`finished processing updated resource ${resource.id} in ${endTime - startTime}ms`,
const upsertedReleaseTargets = await upsertReleaseTargets(db, resource);
const releaseTargetsToDelete = currentReleaseTargets.filter(
(rt) => !upsertedReleaseTargets.some((nrt) => nrt.id === rt.id),
);

return;

// db.transaction(async (tx) => {
// const currentReleaseTargets = await tx.query.releaseTarget.findMany({
// where: eq(SCHEMA.releaseTarget.resourceId, resource.id),
// });
await db.delete(SCHEMA.releaseTarget).where(
inArray(
SCHEMA.releaseTarget.id,
releaseTargetsToDelete.map((rt) => rt.id),
),
);

// const newReleaseTargets = await upsertReleaseTargets(tx, resource);
// const releaseTargetsToDelete = currentReleaseTargets.filter(
// (rt) => !newReleaseTargets.some((nrt) => nrt.id === rt.id),
// );
const dispatchExitHooksPromise = dispatchExitHooks(
db,
resource,
currentReleaseTargets,
upsertedReleaseTargets,
);

// await tx.delete(SCHEMA.releaseTarget).where(
// inArray(
// SCHEMA.releaseTarget.id,
// releaseTargetsToDelete.map((rt) => rt.id),
// ),
// );
const addToEvaluateQueuePromise = getQueue(
Channel.EvaluateReleaseTarget,
).addBulk(
upsertedReleaseTargets.map((rt) => ({
name: `${rt.resourceId}-${rt.environmentId}-${rt.deploymentId}`,
data: rt,
})),
);

// const dispatchExitHooksPromise = dispatchExitHooks(
// tx,
// resource,
// currentReleaseTargets,
// newReleaseTargets,
// );
await Promise.allSettled([
dispatchExitHooksPromise,
addToEvaluateQueuePromise,
]);

// const addToEvaluateQueuePromise = getQueue(
// Channel.EvaluateReleaseTarget,
// ).addBulk(
// newReleaseTargets.map((rt) => ({
// name: `${rt.resourceId}-${rt.environmentId}-${rt.deploymentId}`,
// data: rt,
// })),
// );
const endTime = performance.now();

// await Promise.allSettled([
// dispatchExitHooksPromise,
// addToEvaluateQueuePromise,
// ]);
// });
logger.info(
`finished processing updated resource ${resource.id} in ${endTime - startTime}ms`,
);
},
);
Loading