Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tinybirdco/sdk",
"version": "0.0.74",
"version": "0.0.75",
"description": "TypeScript SDK for Tinybird Forward - define datasources and pipes as TypeScript",
"type": "module",
"main": "./dist/index.js",
Expand Down
66 changes: 66 additions & 0 deletions src/api/deploy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,72 @@ describe("Deploy API", () => {
expect(parsed.searchParams.get("allow_destructive_operations")).toBe("true");
});

it("skips stale deployment cleanup in check mode", async () => {
let listed = false;
const deletedIds: string[] = [];
let capturedUrl: string | null = null;

server.use(
http.get(`${BASE_URL}/v1/deployments`, () => {
listed = true;
return HttpResponse.json(
createDeploymentsListResponse({
deployments: [
{ id: "in-flight", status: "pending", live: false },
],
})
);
}),
http.delete(`${BASE_URL}/v1/deployments/:id`, ({ params }) => {
deletedIds.push(params.id as string);
return HttpResponse.json({ result: "success" });
}),
http.post(`${BASE_URL}/v1/deploy`, ({ request }) => {
capturedUrl = request.url;
return HttpResponse.json(
createDeploySuccessResponse({ deploymentId: "deploy-check" })
);
})
);

await deployToMain(config, resources, {
pollIntervalMs: 1,
check: true,
});

expect(listed).toBe(false);
expect(deletedIds).toEqual([]);
const parsed = new URL(capturedUrl ?? "");
expect(parsed.searchParams.get("check")).toBe("true");
});

it("deletes stale non-live deployments on a normal deploy", async () => {
const deletedIds: string[] = [];

server.use(
http.get(`${BASE_URL}/v1/deployments`, () => {
return HttpResponse.json(
createDeploymentsListResponse({
deployments: [
{ id: "stale-1", status: "pending", live: false },
{ id: "live-1", status: "live", live: true },
{ id: "stale-2", status: "failed", live: false },
],
})
);
}),
http.delete(`${BASE_URL}/v1/deployments/:id`, ({ params }) => {
deletedIds.push(params.id as string);
return HttpResponse.json({ result: "success" });
})
);
setupSuccessfulDeployFlow("deploy-cleanup");

await deployToMain(config, resources, { pollIntervalMs: 1 });

expect(deletedIds).toEqual(["stale-1", "stale-2"]);
});

it("adds actionable guidance to Forward/Classic workspace errors", async () => {
server.use(
http.post(`${BASE_URL}/v1/deploy`, () => {
Expand Down
61 changes: 32 additions & 29 deletions src/api/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,37 +217,40 @@ export async function deployToMain(
);
}

// Step 0: Clean up any stale non-live deployments that might block the new deployment
try {
const deploymentsUrl = `${baseUrl}/v1/deployments`;
const deploymentsResponse = await tinybirdFetch(deploymentsUrl, {
headers: {
Authorization: `Bearer ${config.token}`,
},
});

if (deploymentsResponse.ok) {
const deploymentsBody = (await deploymentsResponse.json()) as DeploymentsListResponse;
const staleDeployments = deploymentsBody.deployments.filter(
(d) => !d.live && d.status !== "live"
);

for (const stale of staleDeployments) {
if (debug) {
console.log(`[debug] Cleaning up stale deployment: ${stale.id} (status: ${stale.status})`);
// Step 0: Clean up any stale non-live deployments that might block the new deployment.
// Skipped in check mode so validation runs don't tear down in-flight deployments.
if (!options?.check) {
try {
const deploymentsUrl = `${baseUrl}/v1/deployments`;
const deploymentsResponse = await tinybirdFetch(deploymentsUrl, {
headers: {
Authorization: `Bearer ${config.token}`,
},
});

if (deploymentsResponse.ok) {
const deploymentsBody = (await deploymentsResponse.json()) as DeploymentsListResponse;
const staleDeployments = deploymentsBody.deployments.filter(
(d) => !d.live && d.status !== "live"
);

for (const stale of staleDeployments) {
if (debug) {
console.log(`[debug] Cleaning up stale deployment: ${stale.id} (status: ${stale.status})`);
}
await tinybirdFetch(`${baseUrl}/v1/deployments/${stale.id}`, {
method: "DELETE",
headers: {
Authorization: `Bearer ${config.token}`,
},
});
}
await tinybirdFetch(`${baseUrl}/v1/deployments/${stale.id}`, {
method: "DELETE",
headers: {
Authorization: `Bearer ${config.token}`,
},
});
}
}
} catch (e) {
// Ignore errors during cleanup - we'll try to deploy anyway
if (debug) {
console.log(`[debug] Failed to clean up stale deployments: ${e}`);
} catch (e) {
// Ignore errors during cleanup - we'll try to deploy anyway
if (debug) {
console.log(`[debug] Failed to clean up stale deployments: ${e}`);
}
}
}

Expand Down
Loading