Skip to content

Commit 77424d5

Browse files
committed
move placement tag utils into server-only
1 parent 084cb47 commit 77424d5

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

apps/supervisor/src/workloadManager/kubernetes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
type WorkloadManagerOptions,
66
} from "./types.js";
77
import type { EnvironmentType, MachinePreset, PlacementTag } from "@trigger.dev/core/v3";
8-
import { PlacementTagProcessor } from "@trigger.dev/core/v3";
8+
import { PlacementTagProcessor } from "@trigger.dev/core/v3/serverOnly";
99
import { env } from "../env.js";
1010
import { type K8sApi, createK8sApi, type k8s } from "../clients/kubernetes.js";
1111
import { getRunnerId } from "../util.js";

internal-packages/run-engine/src/engine/systems/dequeueSystem.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import type { BillingCache } from "../billingCache.js";
22
import { startSpan } from "@internal/tracing";
33
import { assertExhaustive } from "@trigger.dev/core";
4-
import { DequeuedMessage, RetryOptions, placementTag } from "@trigger.dev/core/v3";
4+
import { DequeuedMessage, RetryOptions } from "@trigger.dev/core/v3";
5+
import { placementTag } from "@trigger.dev/core/v3/serverOnly";
56
import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
67
import { PrismaClientOrTransaction } from "@trigger.dev/database";
78
import { getRunWithBackgroundWorkerTasks } from "../db/worker.js";

packages/core/src/v3/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export {
6969

7070
export * from "./utils/imageRef.js";
7171
export * from "./utils/interval.js";
72-
export * from "./utils/placementTags.js";
7372

7473
export * from "./config.js";
7574
export {

packages/core/src/v3/serverOnly/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ export * from "./shutdownManager.js";
66
export * from "./k8s.js";
77
export * from "./jumpHash.js";
88
export * from "../apiClient/version.js";
9+
export * from "./placementTags.js";

packages/core/src/v3/utils/placementTags.ts renamed to packages/core/src/v3/serverOnly/placementTags.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type PlacementTag } from "../schemas/index.js";
2-
import { SimpleStructuredLogger } from "./structuredLogger.js";
2+
import { SimpleStructuredLogger } from "../utils/structuredLogger.js";
33

44
export interface PlacementConfig {
55
enabled: boolean;
@@ -41,16 +41,10 @@ export class PlacementTagProcessor {
4141
private printTagWarnings(tag: PlacementTag) {
4242
if (!tag.values || tag.values.length === 0) {
4343
// No values provided
44-
this.logger.warn(
45-
"Placement tag has no values, using empty string",
46-
tag
47-
);
44+
this.logger.warn("Placement tag has no values, using empty string", tag);
4845
} else if (tag.values.length > 1) {
4946
// Multiple values provided
50-
this.logger.warn(
51-
"Placement tag has multiple values, only using first one",
52-
tag
53-
);
47+
this.logger.warn("Placement tag has multiple values, only using first one", tag);
5448
}
5549
}
5650
}
@@ -61,4 +55,4 @@ export class PlacementTagProcessor {
6155
*/
6256
export function placementTag(key: string, value: string): PlacementTag {
6357
return { key, values: [value] };
64-
}
58+
}

0 commit comments

Comments
 (0)