Skip to content

Commit afcc6d0

Browse files
committed
Keep readiness checks for preserved Worker triggers.
1 parent b0070e0 commit afcc6d0

2 files changed

Lines changed: 54 additions & 1 deletion

File tree

‎packages/deploy-cloudflare/src/version.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,8 +1364,11 @@ async function activateCloudflareVersionWithSecretsFile(
13641364
} else if (
13651365
desiredTriggerConfig.workers_dev ||
13661366
desiredTriggerConfig.routes.length > 0 ||
1367-
preserveRoutesRequested
1367+
preserveRoutesRequested ||
1368+
options.preserveTriggers ||
1369+
desiredTriggerConfig.preserve
13681370
) {
1371+
// Preserved triggers may still expose HTTP routes absent from the local configuration.
13691372
return {
13701373
ok: false,
13711374
reason: 'preview-unavailable',

‎packages/deploy-cloudflare/test/unit/version.test.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2895,6 +2895,56 @@ describe('Cloudflare version activation', () => {
28952895
).toBe(false);
28962896
});
28972897

2898+
it.each(['handoff', 'continued handoff'] as const)(
2899+
'refuses an unprobed %s with explicit empty local routes and preserved live triggers',
2900+
async (kind) => {
2901+
const preserved = triggersWith({
2902+
preserve: true,
2903+
workers_dev: false,
2904+
preview_urls: false,
2905+
routes: [],
2906+
...(kind === 'continued handoff' ? { preservePreviewUrls: true } : {}),
2907+
});
2908+
const previous = kind === 'handoff' ? customDomainTriggers('app.example.com') : preserved;
2909+
const runWrangler = runner({
2910+
upload: ok(`Worker Version ID: ${NEXT}`),
2911+
versions: ok(
2912+
JSON.stringify([
2913+
{
2914+
id: CURRENT,
2915+
number: 1,
2916+
annotations: { 'workers/message': encodeCloudflareVersionMessage([], previous) },
2917+
},
2918+
]),
2919+
),
2920+
});
2921+
const { preserve: _preserve, ...next } = preserved;
2922+
const fetcher = vi.fn(async () => Response.json({ ready: true }));
2923+
const result = await activateCloudflareVersion({
2924+
runWrangler,
2925+
verifyUploader: () => true,
2926+
workerName: 'my-worker',
2927+
preserveTriggers: kind === 'handoff',
2928+
requireVersionMetadata: true,
2929+
message: encodeCloudflareVersionMessage([], next),
2930+
fetch: fetcher,
2931+
});
2932+
expect.soft(result).toMatchObject({
2933+
ok: false,
2934+
reason: 'preview-unavailable',
2935+
versionId: NEXT,
2936+
previousVersionId: CURRENT,
2937+
});
2938+
expect(fetcher).not.toHaveBeenCalled();
2939+
expect(
2940+
runWrangler.mock.calls.some(
2941+
([args]) => (args[0] === 'versions' && args[1] === 'deploy') || args[0] === 'deploy',
2942+
),
2943+
).toBe(false);
2944+
expect(runWrangler.mock.calls.some(([args]) => args[0] === 'triggers')).toBe(false);
2945+
},
2946+
);
2947+
28982948
it('keeps refusing a workers.dev deploy that has no preview URL and no account subdomain', async () => {
28992949
const runWrangler = runner({ upload: ok(`Worker Version ID: ${NEXT}`) });
29002950
const fetcher = vi.fn(async () => Response.json({ ready: true }));

0 commit comments

Comments
 (0)