Skip to content

Commit 927edea

Browse files
committed
move deployment labels to core apps
1 parent a759bf7 commit 927edea

File tree

11 files changed

+12
-13
lines changed

11 files changed

+12
-13
lines changed

apps/webapp/app/consts.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
export const LIVE_ENVIRONMENT = "live";
22
export const DEV_ENVIRONMENT = "development";
3-
export const CURRENT_DEPLOYMENT_LABEL = "current";
4-
export const CURRENT_UNMANAGED_DEPLOYMENT_LABEL = "current-unmanaged";
53
export const MAX_LIVE_PROJECTS = 1;
64
export const DEFAULT_MAX_CONCURRENT_RUNS = 10;
75
export const MAX_CONCURRENT_RUNS_LIMIT = 20;

apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import {
1919
import { logger } from "~/services/logger.server";
2020
import { BasePresenter } from "./basePresenter.server";
2121
import { TaskRunStatus } from "~/database-types";
22-
import { CURRENT_DEPLOYMENT_LABEL } from "~/consts";
2322
import { concurrencyTracker } from "~/v3/services/taskRunConcurrencyTracker.server";
23+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
2424

2525
export type Task = {
2626
slug: string;

apps/webapp/app/routes/api.v1.worker-actions.deployments.$deploymentFriendlyId.dequeue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { json, TypedResponse } from "@remix-run/server-runtime";
2+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
23
import { WorkerApiDequeueResponseBody } from "@trigger.dev/worker";
34
import { z } from "zod";
4-
import { CURRENT_DEPLOYMENT_LABEL } from "~/consts";
55
import { $replica, prisma } from "~/db.server";
66
import { createLoaderWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
77

apps/webapp/app/v3/models/workerDeployment.server.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { Prettify } from "@trigger.dev/core";
22
import { BackgroundWorker, WorkerDeployment } from "@trigger.dev/database";
3-
import { CURRENT_DEPLOYMENT_LABEL, CURRENT_UNMANAGED_DEPLOYMENT_LABEL } from "~/consts";
3+
import {
4+
CURRENT_DEPLOYMENT_LABEL,
5+
CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
6+
} from "@trigger.dev/core/v3/apps";
47
import { Prisma, prisma } from "~/db.server";
58
import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
69

apps/webapp/app/v3/services/createDeployedBackgroundWorker.server.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { CreateBackgroundWorkerRequestBody } from "@trigger.dev/core/v3";
22
import type { BackgroundWorker } from "@trigger.dev/database";
3-
import { CURRENT_DEPLOYMENT_LABEL } from "~/consts";
3+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
44
import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
55
import { logger } from "~/services/logger.server";
6-
import { generateFriendlyId } from "../friendlyIdentifiers";
76
import { socketIo } from "../handleSocketIo.server";
87
import { updateEnvConcurrencyLimits } from "../runQueue.server";
98
import { PerformDeploymentAlertsService } from "./alerts/performDeploymentAlerts.server";

apps/webapp/app/v3/services/finalizeDeployment.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FinalizeDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
2-
import { CURRENT_DEPLOYMENT_LABEL } from "~/consts";
2+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
33
import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
44
import { logger } from "~/services/logger.server";
55
import { socketIo } from "../handleSocketIo.server";

apps/webapp/app/v3/services/rollbackDeployment.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { logger } from "~/services/logger.server";
22
import { BaseService } from "./baseService.server";
33
import { WorkerDeployment, WorkerInstanceGroupType } from "@trigger.dev/database";
4-
import { CURRENT_DEPLOYMENT_LABEL } from "~/consts";
4+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
55
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
66

77
export class RollbackDeploymentService extends BaseService {

apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ import {
2121
} from "@trigger.dev/core/v3";
2222
import { env } from "~/env.server";
2323
import { $transaction } from "~/db.server";
24-
import { CURRENT_UNMANAGED_DEPLOYMENT_LABEL } from "~/consts";
2524
import { resolveVariablesForEnvironment } from "~/v3/environmentVariables/environmentVariablesRepository.server";
2625
import { generateJWTTokenForEnvironment } from "~/services/apiAuth.server";
27-
import { fromFriendlyId } from "@trigger.dev/core/v3/apps";
26+
import { CURRENT_UNMANAGED_DEPLOYMENT_LABEL, fromFriendlyId } from "@trigger.dev/core/v3/apps";
2827
import { machinePresetFromName } from "~/v3/machinePresets.server";
2928
import { defaultMachine } from "@trigger.dev/platform/v3";
3029

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
export const MAX_TASK_RUN_ATTEMPTS = 250;
2-
export const CURRENT_DEPLOYMENT_LABEL = "current";

internal-packages/run-engine/src/engine/db/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
PrismaClientOrTransaction,
66
WorkerDeployment,
77
} from "@trigger.dev/database";
8-
import { CURRENT_DEPLOYMENT_LABEL } from "../consts";
8+
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
99

1010
type RunWithMininimalEnvironment = Prisma.TaskRunGetPayload<{
1111
include: {

packages/core/src/v3/apps/consts.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export const CURRENT_DEPLOYMENT_LABEL = "current";
2+
export const CURRENT_UNMANAGED_DEPLOYMENT_LABEL = "current-unmanaged";

0 commit comments

Comments
 (0)