Add jurisdiction support in wrangler for d1

simonha9 · simonha9 · commit 629318e50f9f · 2025-10-31T12:11:59.000-05:00
diff --git a/.changeset/tasty-rockets-leave.md b/.changeset/tasty-rockets-leave.md
@@ -0,0 +1,5 @@
+---
+"wrangler": minor
+---
+
+Add jurisdiction support to d1 db creation via command-line argument
diff --git a/packages/wrangler/src/__tests__/d1/create.test.ts b/packages/wrangler/src/__tests__/d1/create.test.ts
@@ -82,4 +82,57 @@ describe("create", () => {
 			}"
 		`);
 	});
+
+	it("should fail if the jurisdiction provided is not supported", async () => {
+		writeWranglerConfig({ name: "worker" }, "wrangler.json");
+
+		await expect(runWrangler("d1 create test --jurisdiction something")).rejects
+			.toThrowErrorMatchingInlineSnapshot(`
+			[Error: Invalid values:
+			  Argument: jurisdiction, Given: "something", Choices: "eu", "fedramp"]
+		`);
+	});
+
+	it("should try send jurisdiction to the API if it is a valid input", async () => {
+		writeWranglerConfig({ name: "worker" }, "wrangler.json");
+
+		setIsTTY(false);
+		mockGetMemberships([
+			{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+		]);
+		msw.use(
+			http.post("*/accounts/:accountId/d1/database", async () => {
+				return HttpResponse.json({
+					result: {
+						uuid: "51e7c314-456e-4167-b6c3-869ad188fc23",
+						name: "test",
+						created_in_region: "WEUR",
+						jurisdiction: "eu",
+					},
+					success: true,
+					errors: [],
+					messages: [],
+				});
+			})
+		);
+		await runWrangler("d1 create test --jurisdiction eu --binding MY_TEST_DB");
+		expect(std.out).toMatchInlineSnapshot(`
+			"
+			 ⛅️ wrangler x.x.x
+			──────────────────
+			✅ Successfully created DB 'test' in region WEUR
+			Created your new D1 database.
+
+			To access your new D1 Database in your Worker, add the following snippet to your configuration file:
+			{
+			  \\"d1_databases\\": [
+			    {
+			      \\"binding\\": \\"MY_TEST_DB\\",
+			      \\"database_name\\": \\"test\\",
+			      \\"database_id\\": \\"51e7c314-456e-4167-b6c3-869ad188fc23\\"
+			    }
+			  ]
+			}"
+		`);
+	});
 });
diff --git a/packages/wrangler/src/d1/constants.ts b/packages/wrangler/src/d1/constants.ts
@@ -1,3 +1,4 @@
 export const DEFAULT_MIGRATION_PATH = "./migrations";
 export const DEFAULT_MIGRATION_TABLE = "d1_migrations";
 export const LOCATION_CHOICES = ["weur", "eeur", "apac", "oc", "wnam", "enam"];
+export const JURISDICTION_CHOICES = ["eu", "fedramp"];
diff --git a/packages/wrangler/src/d1/create.ts b/packages/wrangler/src/d1/create.ts
@@ -7,15 +7,16 @@ import { UserError } from "../errors";
 import { logger } from "../logger";
 import { requireAuth } from "../user";
 import { getValidBindingName } from "../utils/getValidBindingName";
-import { LOCATION_CHOICES } from "./constants";
+import { JURISDICTION_CHOICES, LOCATION_CHOICES } from "./constants";
 import type { ComplianceConfig } from "../environment-variables/misc-variables";
 import type { DatabaseCreationResult } from "./types";
 
 export async function createD1Database(
 	complianceConfig: ComplianceConfig,
 	accountId: string,
 	name: string,
-	location?: string
+	location?: string,
+	jurisdiction?: string
 ) {
 	try {
 		return await fetchResult<DatabaseCreationResult>(
@@ -29,6 +30,7 @@ export async function createD1Database(
 				body: JSON.stringify({
 					name,
 					...(location && { primary_location_hint: location }),
+					...(jurisdiction && { jurisdiction }),
 				}),
 			}
 		);
@@ -70,13 +72,28 @@ export const d1CreateCommand = createCommand({
 
 					`,
 		},
+		jurisdiction: {
+			type: "string",
+			choices: [...JURISDICTION_CHOICES],
+			description: dedent`
+				The location to restrict the D1 database to run and store data within to comply with local regulations. Note that if jurisdictions are set, the location hint is ignored. Options:
+					eu: The European Union
+					fedramp: FedRAMP-compliant data centers
+			`,
+		},
 		...sharedResourceCreationArgs,
 	},
 	positionalArgs: ["name"],
-	async handler({ name, location, env, ...args }, { config }) {
+	async handler({ name, location, jurisdiction, env, ...args }, { config }) {
 		const accountId = await requireAuth(config);
 
-		const db = await createD1Database(config, accountId, name, location);
+		const db = await createD1Database(
+			config,
+			accountId,
+			name,
+			location,
+			jurisdiction
+		);
 
 		logger.log(
 			`✅ Successfully created DB '${db.name}'${

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"wrangler": minor
 +---
++
 +Add jurisdiction support to d1 db creation via command-line argument