Removing more exportName stuff

This commit is contained in:
Eric Allam
2025-03-21 14:40:56 +00:00
parent 109bfaca00
commit 671ff26d50
11 changed files with 10 additions and 17 deletions
@@ -108,11 +108,10 @@ export class DeploymentPresenter {
tasks: {
select: {
slug: true,
exportName: true,
filePath: true,
},
orderBy: {
exportName: "asc",
slug: "asc",
},
},
sdkVersion: true,
@@ -191,7 +191,6 @@ export class SpanPresenter extends BasePresenter {
lockedBy: {
select: {
filePath: true,
exportName: true,
},
},
//relationships
@@ -24,7 +24,6 @@ export class TaskPresenter {
id: true,
slug: true,
filePath: true,
exportName: true,
friendlyId: true,
createdAt: true,
worker: {
@@ -24,7 +24,6 @@ export class TestPresenter extends BasePresenter {
id: task.id,
taskIdentifier: task.slug,
filePath: task.filePath,
exportName: task.exportName,
friendlyId: task.friendlyId,
triggerSource: task.triggerSource,
};
@@ -40,7 +39,6 @@ export class TestPresenter extends BasePresenter {
version: string;
slug: string;
filePath: string;
exportName: string;
friendlyId: string;
triggerSource: TaskTriggerSource;
}[]
@@ -53,10 +51,10 @@ export class TestPresenter extends BasePresenter {
WHERE "runtimeEnvironmentId" = ${envId}
),
latest_workers AS (SELECT * FROM workers WHERE rn = 1)
SELECT bwt.id, version, slug, "filePath", "exportName", bwt."friendlyId", bwt."triggerSource"
SELECT bwt.id, version, slug, "filePath", bwt."friendlyId", bwt."triggerSource"
FROM latest_workers
JOIN ${sqlDatabaseSchema}."BackgroundWorkerTask" bwt ON bwt."workerId" = latest_workers.id
ORDER BY bwt."exportName" ASC;`;
ORDER BY slug ASC;`;
} else {
const currentDeployment = await findCurrentWorkerDeployment(envId);
return currentDeployment?.worker?.tasks ?? [];
@@ -21,7 +21,6 @@ type Task = {
id: string;
taskIdentifier: string;
filePath: string;
exportName?: string;
friendlyId: string;
};
@@ -61,7 +61,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
id: task.friendlyId,
slug: task.slug,
filePath: task.filePath,
exportName: task.exportName,
exportName: task.exportName ?? "@deprecated",
})),
}
: undefined,
@@ -66,7 +66,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
updatedAt: backgroundWorker.updatedAt,
tasks: backgroundWorker.tasks.map((task) => ({
id: task.slug,
exportName: task.exportName,
exportName: task.exportName ?? "@deprecated",
filePath: task.filePath,
source: task.triggerSource,
retryConfig: task.retryConfig,
@@ -76,7 +76,6 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
lockedBy: {
select: {
filePath: true,
exportName: true,
},
},
},
@@ -150,7 +149,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
task: {
id: run.taskIdentifier,
filePath: run.lockedBy?.filePath,
exportName: run.lockedBy?.exportName,
exportName: "@deprecated",
},
run: {
id: run.friendlyId,
+1 -1
View File
@@ -382,7 +382,7 @@ function extractResourceProperties(attributes: KeyValue[]) {
attemptNumber: extractNumberAttribute(attributes, SemanticInternalAttributes.ATTEMPT_NUMBER),
taskSlug: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_SLUG, "unknown"),
taskPath: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_PATH),
taskExportName: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_EXPORT_NAME),
taskExportName: "@deprecated",
workerId: extractStringAttribute(attributes, SemanticInternalAttributes.WORKER_ID),
workerVersion: extractStringAttribute(attributes, SemanticInternalAttributes.WORKER_VERSION),
queueId: extractStringAttribute(attributes, SemanticInternalAttributes.QUEUE_ID),
+1 -1
View File
@@ -379,7 +379,7 @@ export const GetDeploymentResponseBody = z.object({
id: z.string(),
slug: z.string(),
filePath: z.string(),
exportName: z.string(),
exportName: z.string().optional(),
})
),
})
+2 -2
View File
@@ -11,7 +11,7 @@ const AlertWebhookRunFailedObject = z.object({
/** File path where the task is defined */
filePath: z.string(),
/** Name of the exported task function */
exportName: z.string(),
exportName: z.string().optional(),
/** Version of the task */
version: z.string(),
/** Version of the SDK used */
@@ -142,7 +142,7 @@ export const AlertWebhookDeploymentSuccessObject = z.object({
/** File path where the task is defined */
filePath: z.string(),
/** Name of the exported task function */
exportName: z.string(),
exportName: z.string().optional(),
/** Source of the trigger */
triggerSource: z.string(),
})