Fix D1 Export error handling when presigned URLs are invalid (#8131)

* Fix D1 Export error handling when presigned URLs are invalid

* Update packages/wrangler/src/d1/export.ts

Co-authored-by: Max Rozen <3822106+rozenmd@users.noreply.github.com>

* fix test

* pnpm run prettify

* changeset

---------

Co-authored-by: Max Rozen <3822106+rozenmd@users.noreply.github.com>

Author: lambrospetrou

.changeset/olive-gifts-flash.md

@@ -0,0 +1,5 @@
+---
+"wrangler": minor
+---
+
+D1 export will now show an error when the presigned URL is invalid

packages/wrangler/src/__tests__/d1/export.test.ts

@@ -114,65 +114,8 @@ describe("export", () => {
 		]);
 		const mockSqlContent = "PRAGMA defer_foreign_keys=TRUE;";
 
-		msw.use(
-			http.post(
-				"*/accounts/:accountId/d1/database/:databaseId/export",
-				async ({ request }) => {
-					// This endpoint is polled recursively. If we respond immediately,
-					// the callstack builds up quickly leading to a hard-to-debug OOM error.
-					// This timeout ensures that if the endpoint is accidently polled infinitely
-					// the test will timeout before breaching available memory
-					await setTimeout(10);
-
-					const body = (await request.json()) as Record<string, unknown>;
-
-					// First request, initiates a new task
-					if (!body.current_bookmark) {
-						return HttpResponse.json(
-							{
-								success: true,
-								result: {
-									success: true,
-									type: "export",
-									at_bookmark: "yyyy",
-									status: "active",
-									messages: [
-										"Generating xxxx-yyyy.sql",
-										"Uploaded part 2", // out-of-order uploads ok
-										"Uploaded part 1",
-									],
-								},
-							},
-							{ status: 202 }
-						);
-					}
-					// Subsequent request, sees that it is complete
-					else {
-						return HttpResponse.json(
-							{
-								success: true,
-								result: {
-									success: true,
-									type: "export",
-									at_bookmark: "yyyy",
-									status: "complete",
-									result: {
-										filename: "xxxx-yyyy.sql",
-										signed_url: "https://example.com/xxxx-yyyy.sql",
-									},
-									messages: [
-										"Uploaded part 3",
-										"Uploaded part 4",
-										"Finished uploading xxxx-yyyy.sql in 4 parts.",
-									],
-								},
-							},
-							{ status: 200 }
-						);
-					}
-				}
-			)
-		);
+		mockResponses();
+
 		msw.use(
 			http.get("https://example.com/xxxx-yyyy.sql", async () => {
 				return HttpResponse.text(mockSqlContent, { status: 200 });
@@ -182,4 +125,95 @@ describe("export", () => {
 		await runWrangler("d1 export db --remote --output test-remote.sql");
 		expect(fs.readFileSync("test-remote.sql", "utf8")).toBe(mockSqlContent);
 	});
+
+	it("should handle remote presigned URL errors", async () => {
+		setIsTTY(false);
+		writeWranglerConfig({
+			d1_databases: [
+				{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+			],
+		});
+		mockGetMemberships([
+			{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+		]);
+
+		mockResponses();
+
+		msw.use(
+			http.get("https://example.com/xxxx-yyyy.sql", async () => {
+				return HttpResponse.text(
+					`<?xml version="1.0" encoding="UTF-8"?><Error><Code>AccessDenied</Code><Message>Access Denied</Message></Error>`,
+					{ status: 403 }
+				);
+			})
+		);
+
+		await expect(
+			runWrangler("d1 export db --remote --output test-remote.sql")
+		).rejects.toThrowError(
+			/There was an error while downloading from the presigned URL with status code: 403/
+		);
+	});
 });
+
+function mockResponses() {
+	msw.use(
+		http.post(
+			"*/accounts/:accountId/d1/database/:databaseId/export",
+			async ({ request }) => {
+				// This endpoint is polled recursively. If we respond immediately,
+				// the callstack builds up quickly leading to a hard-to-debug OOM error.
+				// This timeout ensures that if the endpoint is accidently polled infinitely
+				// the test will timeout before breaching available memory
+				await setTimeout(10);
+
+				const body = (await request.json()) as Record<string, unknown>;
+
+				// First request, initiates a new task
+				if (!body.current_bookmark) {
+					return HttpResponse.json(
+						{
+							success: true,
+							result: {
+								success: true,
+								type: "export",
+								at_bookmark: "yyyy",
+								status: "active",
+								messages: [
+									"Generating xxxx-yyyy.sql",
+									"Uploaded part 2", // out-of-order uploads ok
+									"Uploaded part 1",
+								],
+							},
+						},
+						{ status: 202 }
+					);
+				}
+				// Subsequent request, sees that it is complete
+				else {
+					return HttpResponse.json(
+						{
+							success: true,
+							result: {
+								success: true,
+								type: "export",
+								at_bookmark: "yyyy",
+								status: "complete",
+								result: {
+									filename: "xxxx-yyyy.sql",
+									signed_url: "https://example.com/xxxx-yyyy.sql",
+								},
+								messages: [
+									"Uploaded part 3",
+									"Uploaded part 4",
+									"Finished uploading xxxx-yyyy.sql in 4 parts.",
+								],
+							},
+						},
+						{ status: 200 }
+					);
+				}
+			}
+		)
+	);
+}

packages/wrangler/src/d1/export.ts

@@ -193,6 +193,11 @@ async function exportRemotely(
 		startMessage: `Downloading SQL to ${output}`,
 		async promise() {
 			const contents = await fetch(finalResponse.result.signed_url);
+			if (!contents.ok) {
+				throw new Error(
+					`There was an error while downloading from the presigned URL with status code: ${contents.status}`
+				);
+			}
 			await fs.writeFile(output, contents.body || "");
 		},
 	});