Skip to content

Commit 93263d9

Browse files
matt-aitkenmatt-aitken
committed
More deletions
1 parent 9d01c88 commit 93263d9

File tree

9 files changed

+6
-57
lines changed

9 files changed

+6
-57
lines changed

‎internal-packages/database/prisma/migrations/20250502154714_waitpoint_added_resolvers/migration.sql‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎internal-packages/database/prisma/migrations/20250502155009_waitpoint_resolve_index_for_dashboard/migration.sql‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎internal-packages/database/prisma/migrations/20250505164454_waitpoint_resolve_status_index/migration.sql‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎internal-packages/database/prisma/migrations/20250505164720_waitpoint_drop_type_status_index/migration.sql‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎internal-packages/database/prisma/migrations/20250505165445_waitpoint_drop_type_index/migration.sql‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎internal-packages/database/prisma/schema.prisma‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,9 +2100,6 @@ model Waitpoint {
21002100
type WaitpointType
21012101
status WaitpointStatus @default(PENDING)
21022102
2103-
/// This is what will resolve the waitpoint, used to filter waitpoints in the dashboard
2104-
resolver WaitpointResolver @default(ENGINE)
2105-
21062103
completedAt DateTime?
21072104
21082105
/// If it's an Event type waitpoint, this is the event. It can also be provided for the DATETIME type
@@ -2153,16 +2150,19 @@ model Waitpoint {
21532150
createdAt DateTime @default(now())
21542151
updatedAt DateTime @updatedAt
21552152
2153+
/// Denormized column that holds the raw tags
21562154
/// Denormalized column that holds the raw tags
21572155
tags String[]
21582156
21592157
/// Quickly find an idempotent waitpoint
21602158
@@unique([environmentId, idempotencyKey])
21612159
/// Quickly find a batch waitpoint
21622160
@@index([completedByBatchId])
2163-
/// Dashboard filtering
2164-
@@index([environmentId, resolver, id(sort: Desc)])
2165-
@@index([environmentId, resolver, status, id(sort: Desc)])
2161+
/// Used on the Waitpoint dashboard pages
2162+
/// Time period filtering
2163+
@@index([environmentId, type, createdAt(sort: Desc)])
2164+
/// Status filtering
2165+
@@index([environmentId, type, status])
21662166
}
21672167

21682168
enum WaitpointType {
@@ -2177,15 +2177,6 @@ enum WaitpointStatus {
21772177
COMPLETED
21782178
}
21792179

2180-
enum WaitpointResolver {
2181-
/// The engine itself will resolve the waitpoint
2182-
ENGINE
2183-
/// A token will resolve the waitpoint, i.e. the user completes a token
2184-
TOKEN
2185-
/// A HTTP callback will resolve the waitpoint, i.e. the user uses our waitForHttpCallback function
2186-
HTTP_CALLBACK
2187-
}
2188-
21892180
model TaskRunWaitpoint {
21902181
id String @id @default(cuid())
21912182

‎internal-packages/run-engine/src/engine/tests/checkpoints.test.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ describe("RunEngine checkpoints", () => {
9191
const waitpointResult = await engine.createManualWaitpoint({
9292
environmentId: authenticatedEnvironment.id,
9393
projectId: authenticatedEnvironment.projectId,
94-
resolver: "TOKEN",
9594
});
9695
expect(waitpointResult.waitpoint.status).toBe("PENDING");
9796

@@ -350,7 +349,6 @@ describe("RunEngine checkpoints", () => {
350349
const waitpoint1 = await engine.createManualWaitpoint({
351350
environmentId: authenticatedEnvironment.id,
352351
projectId: authenticatedEnvironment.projectId,
353-
resolver: "TOKEN",
354352
});
355353

356354
const blocked1 = await engine.blockRunWithWaitpoint({
@@ -401,7 +399,6 @@ describe("RunEngine checkpoints", () => {
401399
const waitpoint2 = await engine.createManualWaitpoint({
402400
environmentId: authenticatedEnvironment.id,
403401
projectId: authenticatedEnvironment.projectId,
404-
resolver: "TOKEN",
405402
});
406403

407404
const blocked2 = await engine.blockRunWithWaitpoint({
@@ -554,7 +551,6 @@ describe("RunEngine checkpoints", () => {
554551
const waitpointResult = await engine.createManualWaitpoint({
555552
environmentId: authenticatedEnvironment.id,
556553
projectId: authenticatedEnvironment.projectId,
557-
resolver: "TOKEN",
558554
});
559555
expect(waitpointResult.waitpoint.status).toBe("PENDING");
560556

@@ -848,7 +844,6 @@ describe("RunEngine checkpoints", () => {
848844
const waitpoint = await engine.createManualWaitpoint({
849845
environmentId: authenticatedEnvironment.id,
850846
projectId: authenticatedEnvironment.projectId,
851-
resolver: "TOKEN",
852847
});
853848
expect(waitpoint.waitpoint.status).toBe("PENDING");
854849

‎internal-packages/run-engine/src/engine/tests/releaseConcurrency.test.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ describe("RunEngine Releasing Concurrency", () => {
102102
const result = await engine.createManualWaitpoint({
103103
environmentId: authenticatedEnvironment.id,
104104
projectId: authenticatedEnvironment.projectId,
105-
resolver: "TOKEN",
106105
});
107106

108107
// Block the run, not specifying any release concurrency option
@@ -155,7 +154,6 @@ describe("RunEngine Releasing Concurrency", () => {
155154
const result2 = await engine.createManualWaitpoint({
156155
environmentId: authenticatedEnvironment.id,
157156
projectId: authenticatedEnvironment.projectId,
158-
resolver: "TOKEN",
159157
});
160158

161159
const executingWithWaitpointSnapshot2 = await engine.blockRunWithWaitpoint({
@@ -304,7 +302,6 @@ describe("RunEngine Releasing Concurrency", () => {
304302
const result = await engine.createManualWaitpoint({
305303
environmentId: authenticatedEnvironment.id,
306304
projectId: authenticatedEnvironment.projectId,
307-
resolver: "TOKEN",
308305
});
309306

310307
// Block the run, not specifying any release concurrency option
@@ -358,7 +355,6 @@ describe("RunEngine Releasing Concurrency", () => {
358355
const result2 = await engine.createManualWaitpoint({
359356
environmentId: authenticatedEnvironment.id,
360357
projectId: authenticatedEnvironment.projectId,
361-
resolver: "TOKEN",
362358
});
363359

364360
const executingWithWaitpointSnapshot2 = await engine.blockRunWithWaitpoint({
@@ -494,7 +490,6 @@ describe("RunEngine Releasing Concurrency", () => {
494490
const result = await engine.createManualWaitpoint({
495491
environmentId: authenticatedEnvironment.id,
496492
projectId: authenticatedEnvironment.projectId,
497-
resolver: "TOKEN",
498493
});
499494

500495
// Block the run, not specifying any release concurrency option
@@ -548,7 +543,6 @@ describe("RunEngine Releasing Concurrency", () => {
548543
const result2 = await engine.createManualWaitpoint({
549544
environmentId: authenticatedEnvironment.id,
550545
projectId: authenticatedEnvironment.projectId,
551-
resolver: "TOKEN",
552546
});
553547

554548
const executingWithWaitpointSnapshot2 = await engine.blockRunWithWaitpoint({
@@ -674,7 +668,6 @@ describe("RunEngine Releasing Concurrency", () => {
674668
const result = await engine.createManualWaitpoint({
675669
environmentId: authenticatedEnvironment.id,
676670
projectId: authenticatedEnvironment.projectId,
677-
resolver: "TOKEN",
678671
});
679672

680673
await engine.releaseConcurrencySystem.consumeToken(
@@ -837,7 +830,6 @@ describe("RunEngine Releasing Concurrency", () => {
837830
const result = await engine.createManualWaitpoint({
838831
environmentId: authenticatedEnvironment.id,
839832
projectId: authenticatedEnvironment.projectId,
840-
resolver: "TOKEN",
841833
});
842834

843835
await engine.releaseConcurrencySystem.consumeToken(
@@ -1020,7 +1012,6 @@ describe("RunEngine Releasing Concurrency", () => {
10201012
const result = await engine.createManualWaitpoint({
10211013
environmentId: authenticatedEnvironment.id,
10221014
projectId: authenticatedEnvironment.projectId,
1023-
resolver: "TOKEN",
10241015
});
10251016

10261017
await engine.releaseConcurrencySystem.consumeToken(
@@ -1194,7 +1185,6 @@ describe("RunEngine Releasing Concurrency", () => {
11941185
const result = await engine.createManualWaitpoint({
11951186
environmentId: authenticatedEnvironment.id,
11961187
projectId: authenticatedEnvironment.projectId,
1197-
resolver: "TOKEN",
11981188
});
11991189

12001190
// Block the run, not specifying any release concurrency option
@@ -1349,7 +1339,6 @@ describe("RunEngine Releasing Concurrency", () => {
13491339
const result = await engine.createManualWaitpoint({
13501340
environmentId: authenticatedEnvironment.id,
13511341
projectId: authenticatedEnvironment.projectId,
1352-
resolver: "TOKEN",
13531342
});
13541343

13551344
// Block the run, specifying the release concurrency option as true

‎internal-packages/run-engine/src/engine/tests/waitpoints.test.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ describe("RunEngine Waitpoints", () => {
345345
const result = await engine.createManualWaitpoint({
346346
environmentId: authenticatedEnvironment.id,
347347
projectId: authenticatedEnvironment.projectId,
348-
resolver: "TOKEN",
349348
});
350349
expect(result.waitpoint.status).toBe("PENDING");
351350

@@ -486,7 +485,6 @@ describe("RunEngine Waitpoints", () => {
486485
projectId: authenticatedEnvironment.projectId,
487486
//fail after 200ms
488487
timeout: new Date(Date.now() + 200),
489-
resolver: "TOKEN",
490488
});
491489

492490
//block the run
@@ -609,7 +607,6 @@ describe("RunEngine Waitpoints", () => {
609607
engine.createManualWaitpoint({
610608
environmentId: authenticatedEnvironment.id,
611609
projectId: authenticatedEnvironment.projectId,
612-
resolver: "TOKEN",
613610
})
614611
)
615612
);
@@ -754,7 +751,6 @@ describe("RunEngine Waitpoints", () => {
754751
environmentId: authenticatedEnvironment.id,
755752
projectId: authenticatedEnvironment.projectId,
756753
timeout,
757-
resolver: "TOKEN",
758754
});
759755
expect(result.waitpoint.status).toBe("PENDING");
760756
expect(result.waitpoint.completedAfter).toStrictEqual(timeout);
@@ -904,7 +900,6 @@ describe("RunEngine Waitpoints", () => {
904900
environmentId: authenticatedEnvironment.id,
905901
projectId: authenticatedEnvironment.projectId,
906902
idempotencyKey,
907-
resolver: "TOKEN",
908903
});
909904
expect(result.waitpoint.status).toBe("PENDING");
910905
expect(result.waitpoint.idempotencyKey).toBe(idempotencyKey);
@@ -1057,7 +1052,6 @@ describe("RunEngine Waitpoints", () => {
10571052
projectId: authenticatedEnvironment.projectId,
10581053
idempotencyKey,
10591054
idempotencyKeyExpiresAt: new Date(Date.now() + 200),
1060-
resolver: "TOKEN",
10611055
});
10621056
expect(result.waitpoint.status).toBe("PENDING");
10631057
expect(result.waitpoint.idempotencyKey).toBe(idempotencyKey);
@@ -1068,7 +1062,6 @@ describe("RunEngine Waitpoints", () => {
10681062
projectId: authenticatedEnvironment.projectId,
10691063
idempotencyKey,
10701064
idempotencyKeyExpiresAt: new Date(Date.now() + 200),
1071-
resolver: "TOKEN",
10721065
});
10731066
expect(sameWaitpointResult.waitpoint.id).toBe(result.waitpoint.id);
10741067

@@ -1224,7 +1217,6 @@ describe("RunEngine Waitpoints", () => {
12241217
const waitpoint = await engine.createManualWaitpoint({
12251218
environmentId: authenticatedEnvironment.id,
12261219
projectId: authenticatedEnvironment.projectId,
1227-
resolver: "TOKEN",
12281220
});
12291221
expect(waitpoint.waitpoint.status).toBe("PENDING");
12301222

0 commit comments

Comments
 (0)