From 8d66a9d40607da6e502b8cb539d342b48e135d52 Mon Sep 17 00:00:00 2001 From: Christopher Serr Date: Sat, 14 Nov 2026 17:53:58 +0100 Subject: [PATCH] Fix PR Preview Cleanup Cloudflare Pages rejects deployment listings larger than 25 entries with HTTP 400. Cleanup requested 100, so every Remove PR preview run failed before deleting any previews. Request 25 deployments per page and use the same size to detect the last page when Cloudflare omits pagination metadata. Keep collecting every page before deleting deployments so cleanup removes older builds without skipping entries as the list changes. Add a regression case that rejects oversized requests and checks both pagination response forms, with matching PR deployments on separate pages and other PR deployments left untouched. --- .github/scripts/preview-cloudflare.mts | 7 ++- .github/scripts/preview-cloudflare.test.mts | 64 +++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/.github/scripts/preview-cloudflare.mts b/.github/scripts/preview-cloudflare.mts index 668fa4a6..de1db5a0 100644 --- a/.github/scripts/preview-cloudflare.mts +++ b/.github/scripts/preview-cloudflare.mts @@ -91,11 +91,14 @@ export async function deletePreviewDeployments( ) { const branch = await checkPreviewProject(client, number); const deployments: Deployment[] = []; + // Pages rejects deployment lists larger than 25 with HTTP 400. Use the + // same size to detect the final page when pagination metadata is absent. + const perPage = 25; // Collect every page before deleting anything. Otherwise deletions shift // the remaining pages and can leave older PR builds behind. for (let page = 1; ; page++) { const response = await client.get( - `/deployments?env=preview&per_page=100&page=${page}`, + `/deployments?env=preview&per_page=${perPage}&page=${page}`, ); deployments.push( ...response.result.filter( @@ -108,7 +111,7 @@ export async function deletePreviewDeployments( if ( totalPages !== undefined ? page >= totalPages - : response.result.length < 100 + : response.result.length < perPage ) { break; } diff --git a/.github/scripts/preview-cloudflare.test.mts b/.github/scripts/preview-cloudflare.test.mts index 3b8b13b5..4900e7a8 100644 --- a/.github/scripts/preview-cloudflare.test.mts +++ b/.github/scripts/preview-cloudflare.test.mts @@ -128,6 +128,70 @@ test("removes every PR build and its alias without touching other PRs or product ); }); +test("uses supported page sizes and collects every page before deleting", async () => { + for (const includePaginationInfo of [true, false]) { + const deployments = [ + deployment("latest", "pr-42"), + ...Array.from({ length: 24 }, (_, index) => + deployment(`other-${index}`, "pr-43"), + ), + deployment("old", "pr-42"), + ]; + const pages: number[] = []; + const deleted: string[] = []; + const client = cloudflareClient( + account, + "lso-previews", + "test-token", + (input, init) => { + const url = new URL( + input instanceof Request ? input.url : input.toString(), + ); + let result: unknown = { production_branch: "master" }; + let resultInfo: { total_pages: number } | undefined; + if (init?.method === "DELETE") { + assert.deepEqual(pages, [1, 2]); + deleted.push(url.pathname.split("/").at(-1)!); + result = null; + } else if (url.pathname.endsWith("/deployments")) { + const perPage = Number(url.searchParams.get("per_page")); + // Model the endpoint's limit rather than accepting an + // oversized request that Cloudflare rejects with HTTP 400. + if (perPage < 1 || perPage > 25) { + return Promise.resolve( + new Response(null, { status: 400 }), + ); + } + const page = Number(url.searchParams.get("page")); + pages.push(page); + result = deployments.slice( + (page - 1) * perPage, + page * perPage, + ); + if (includePaginationInfo) { + resultInfo = { + total_pages: Math.ceil( + deployments.length / perPage, + ), + }; + } + } + return Promise.resolve( + new Response( + JSON.stringify({ + success: true, + result, + result_info: resultInfo, + }), + ), + ); + }, + ); + assert.equal(await deletePreviewDeployments(client, 42), 2); + assert.deepEqual(deleted, ["latest", "old"]); + } +}); + test("empty and already-deleted previews are safe to clean up repeatedly", async () => { for (const entries of [[], [deployment("gone", "pr-42")]]) { const client = cloudflareClient(