test: de-flake on-demand revalidation tests

it turns out...

> By default, tag-based purges apply to all of the site’s deploys. To target a specific deploy,
> specify one or more of the following [...]

from https://docs.netlify.com/build/caching/caching-overview/#use-a-function-with-the-purgecache-helper-to-purge-by-cache-tag

Whoops. So concurrent tests were conflicting with one another's expectations.

Author: serhalp

tests/e2e/fixtures/edge-site/netlify/functions/purge-cdn.ts

@@ -1,6 +1,9 @@
-import { type Config, purgeCache } from "@netlify/functions";
+import { type Config, type Context, purgeCache } from "@netlify/functions";
 
-const handler = async (request: Request): Promise<Response> => {
+const handler = async (
+  request: Request,
+  context: Context,
+): Promise<Response> => {
   const url = new URL(request.url);
   const tagToPurge = url.searchParams.get("tag");
 
@@ -14,8 +17,17 @@ const handler = async (request: Request): Promise<Response> => {
     );
   }
 
-  console.log("Purging", tagToPurge);
-  await purgeCache({ tags: [tagToPurge] });
+  // e2e tests exclusively create manual deploys, so this assumption is safe
+  if (!context.url.hostname.includes("--")) {
+    return Response.json(
+      { error: "No deploy alias found in hostname (missing --)" },
+      { status: 400 },
+    );
+  }
+  await purgeCache({
+    tags: [tagToPurge],
+    deployAlias: context.url.hostname.split("--")[0],
+  });
 
   return new Response(null, { status: 204 });
 };

tests/e2e/fixtures/react-router-edge-site/netlify/functions/purge-cdn.ts

@@ -1,6 +1,6 @@
-import { type Config, purgeCache } from '@netlify/functions'
+import { type Config, type Context, purgeCache } from '@netlify/functions'
 
-const handler = async (request: Request): Promise<Response> => {
+const handler = async (request: Request, context: Context): Promise<Response> => {
   const url = new URL(request.url)
   const tagToPurge = url.searchParams.get('tag')
 
@@ -14,8 +14,14 @@ const handler = async (request: Request): Promise<Response> => {
     )
   }
 
-  console.log('Purging', tagToPurge)
-  await purgeCache({ tags: [tagToPurge] })
+  // e2e tests exclusively create manual deploys, so this assumption is safe
+  if (!context.url.hostname.includes('--')) {
+    return Response.json({ error: 'No deploy alias found in hostname (missing --)' }, { status: 400 })
+  }
+  await purgeCache({
+    tags: [tagToPurge],
+    deployAlias: context.url.hostname.split('--')[0],
+  })
 
   return new Response(null, { status: 204 })
 }

tests/e2e/fixtures/react-router-serverless-site/netlify/functions/purge-cdn.ts

@@ -1,6 +1,6 @@
-import { type Config, purgeCache } from '@netlify/functions'
+import { type Config, type Context, purgeCache } from '@netlify/functions'
 
-const handler = async (request: Request): Promise<Response> => {
+const handler = async (request: Request, context: Context): Promise<Response> => {
   const url = new URL(request.url)
   const tagToPurge = url.searchParams.get('tag')
 
@@ -14,8 +14,14 @@ const handler = async (request: Request): Promise<Response> => {
     )
   }
 
-  console.log('Purging', tagToPurge)
-  await purgeCache({ tags: [tagToPurge] })
+  // e2e tests exclusively create manual deploys, so this assumption is safe
+  if (!context.url.hostname.includes('--')) {
+    return Response.json({ error: 'No deploy alias found in hostname (missing --)' }, { status: 400 })
+  }
+  await purgeCache({
+    tags: [tagToPurge],
+    deployAlias: context.url.hostname.split('--')[0],
+  })
 
   return new Response(null, { status: 204 })
 }

tests/e2e/fixtures/serverless-site/netlify/functions/purge-cdn.ts

@@ -1,6 +1,9 @@
-import { type Config, purgeCache } from "@netlify/functions";
+import { type Config, type Context, purgeCache } from "@netlify/functions";
 
-const handler = async (request: Request): Promise<Response> => {
+const handler = async (
+  request: Request,
+  context: Context,
+): Promise<Response> => {
   const url = new URL(request.url);
   const tagToPurge = url.searchParams.get("tag");
 
@@ -14,8 +17,17 @@ const handler = async (request: Request): Promise<Response> => {
     );
   }
 
-  console.log("Purging", tagToPurge);
-  await purgeCache({ tags: [tagToPurge] });
+  // e2e tests exclusively create manual deploys, so this assumption is safe
+  if (!context.url.hostname.includes("--")) {
+    return Response.json(
+      { error: "No deploy alias found in hostname (missing --)" },
+      { status: 400 },
+    );
+  }
+  await purgeCache({
+    tags: [tagToPurge],
+    deployAlias: context.url.hostname.split("--")[0],
+  });
 
   return new Response(null, { status: 204 });
 };