fix(r2): validate bucket names (#9165)

* fix(r2): validate bucket names

* fixup! review feedback

Author: vicb

.changeset/lemon-pants-jam.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+validate r2 bucket names

fixtures/pages-functions-app/functions/r2/create.ts

@@ -1,8 +1,8 @@
 type Env = {
-	BUCKET: R2Bucket;
+	bucket: R2Bucket;
 };
 
 export const onRequestPut: PagesFunction<Env> = async ({ env }) => {
-	const object = await env.BUCKET.put("test", "Hello world!");
+	const object = await env.bucket.put("test", "Hello world!");
 	return new Response(JSON.stringify(object));
 };

fixtures/pages-functions-app/functions/r2/get.ts

@@ -1,8 +1,8 @@
 type Env = {
-	BUCKET: R2Bucket;
+	bucket: R2Bucket;
 };
 
 export const onRequestGet: PagesFunction<Env> = async ({ env }) => {
-	const object = await env.BUCKET.get("test");
+	const object = await env.bucket.get("test");
 	return new Response(JSON.stringify(object));
 };

fixtures/pages-functions-app/package.json

@@ -5,7 +5,7 @@
 	"main": "dist/worker.js",
 	"scripts": {
 		"check:type": "tsc",
-		"dev": "wrangler pages dev public --binding=NAME=VALUE --binding=OTHER_NAME=THING=WITH=EQUALS --r2=BUCKET --port 8789",
+		"dev": "wrangler pages dev public --binding=NAME=VALUE --binding=OTHER_NAME=THING=WITH=EQUALS --r2=bucket --port 8789",
 		"test:ci": "vitest run",
 		"test:watch": "vitest",
 		"type:tests": "tsc -p ./tests/tsconfig.json"

fixtures/pages-functions-app/tests/index.test.ts

@@ -16,7 +16,7 @@ describe("Pages Functions", () => {
 			[
 				"--binding=NAME=VALUE",
 				"--binding=OTHER_NAME=THING=WITH=EQUALS",
-				"--r2=BUCKET",
+				"--r2=bucket",
 				"--port=0",
 				"--inspector-port=0",
 			]
@@ -58,7 +58,7 @@ describe("Pages Functions", () => {
 		const env = await response.json();
 		expect(env).toEqual({
 			ASSETS: {},
-			BUCKET: {},
+			bucket: {},
 			NAME: "VALUE",
 			OTHER_NAME: "THING=WITH=EQUALS",
 			VAR_1: "var #1 value",

fixtures/pages-workerjs-directory/package.json

@@ -4,7 +4,7 @@
 	"sideEffects": false,
 	"scripts": {
 		"check:type": "tsc",
-		"dev": "wrangler pages dev public --d1=D1 --d1=PUT=elsewhere --kv KV --kv KV_REF=other_kv --r2 R2 --r2=R2_REF=other_r2 --port 8794",
+		"dev": "wrangler pages dev public --d1=D1 --d1=PUT=elsewhere --kv KV --kv KV_REF=other_kv --r2 r2bucket --r2=R2_REF=other-r2 --port 8794",
 		"test:ci": "vitest run",
 		"type:tests": "tsc -p ./tests/tsconfig.json"
 	},

fixtures/pages-workerjs-directory/public/_worker.js/index.js

@@ -42,7 +42,7 @@ export default {
 		}
 
 		if (pathname === "/r2") {
-			await env.R2.put("key", "value");
+			await env.r2bucket.put("key", "value");
 
 			await env.R2_REF.put("key", "value");
 

fixtures/pages-workerjs-directory/tests/index.test.ts

@@ -23,8 +23,8 @@ describe("Pages _worker.js/ directory", () => {
 				"--d1=PUT=elsewhere",
 				"--kv=KV",
 				"--kv=KV_REF=other_kv",
-				"--r2=R2",
-				"--r2=R2_REF=other_r2",
+				"--r2=r2bucket",
+				"--r2=R2_REF=other-r2",
 			]
 		);
 		try {

packages/wrangler/e2e/__snapshots__/pages-dev.test.ts.snap

@@ -17,9 +17,9 @@ Your Worker has access to the following bindings:
   - D1_BINDING_2_TOML: D1_NAME_2_TOML (D1_ID_2_TOML) [simulated locally]
   - D1_BINDING_3_ARGS: local-D1_BINDING_3_ARGS=D1_NAME_3_ARGS (D1_NAME_3_ARGS) [simulated locally]
 - R2 Buckets:
-  - R2_BINDING_1_TOML: NEW_R2_BUCKET_1 [simulated locally]
-  - R2_BINDING_2_TOML: R2_BUCKET_2_TOML [simulated locally]
-  - R2_BINDING_3_TOML: R2_BUCKET_3_ARGS [simulated locally]
+  - R2_BINDING_1_TOML: new-r2-bucket-1 [simulated locally]
+  - R2_BINDING_2_TOML: r2-bucket-2-toml [simulated locally]
+  - R2_BINDING_3_TOML: r2-bucket-3-args [simulated locally]
 - Services:
   - SERVICE_BINDING_1_TOML: NEW_SERVICE_NAME_1 [not connected]
   - SERVICE_BINDING_2_TOML: SERVICE_NAME_2_TOML [not connected]

packages/wrangler/e2e/pages-dev.test.ts

@@ -115,7 +115,7 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
 					}`,
 			});
 			const worker = helper.runLongLived(
-				`${cmd} --inspector-port ${inspectorPort} . --port ${port} --service TEST_SERVICE=test-worker --kv TEST_KV --do TEST_DO=TestDurableObject@a --d1 TEST_D1 --r2 TEST_R2`
+				`${cmd} --inspector-port ${inspectorPort} . --port ${port} --service TEST_SERVICE=test-worker --kv TEST_KV --do TEST_DO=TestDurableObject@a --d1 TEST_D1 --r2 test-r2`
 			);
 			await worker.waitForReady();
 			expect(normalizeOutput(worker.currentOutput)).toContain(
@@ -127,7 +127,7 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
 					- D1 Databases:
 					  - TEST_D1: local-TEST_D1 (TEST_D1) [simulated locally]
 					- R2 Buckets:
-					  - TEST_R2: TEST_R2 [simulated locally]
+					  - test-r2: test-r2 [simulated locally]
 					- Services:
 					  - TEST_SERVICE: test-worker [not connected]
 		`
@@ -342,7 +342,7 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
 				` --kv KV_BINDING_1_TOML=NEW_KV_ID_1 KV_BINDING_3_ARGS=KV_ID_3_ARGS`,
 				` --do DO_BINDING_1_TOML=NEW_DO_1@NEW_DO_SCRIPT_1 DO_BINDING_3_ARGS=DO_3_ARGS@DO_SCRIPT_3_ARGS`,
 				` --d1 D1_BINDING_1_TOML=NEW_D1_NAME_1 D1_BINDING_3_ARGS=D1_NAME_3_ARGS`,
-				` --r2 R2_BINDING_1_TOML=NEW_R2_BUCKET_1 R2_BINDING_3_TOML=R2_BUCKET_3_ARGS`,
+				` --r2 R2_BINDING_1_TOML=new-r2-bucket-1 R2_BINDING_3_TOML=r2-bucket-3-args`,
 				` --service SERVICE_BINDING_1_TOML=NEW_SERVICE_NAME_1 SERVICE_BINDING_3_TOML=SERVICE_NAME_3_ARGS`,
 				` --ai AI_BINDING_2_TOML`,
 			];
@@ -402,12 +402,12 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
 				# to override
 				[[r2_buckets]]
 				binding = 'R2_BINDING_1_TOML'
-				bucket_name = 'R2_BUCKET_1_TOML'
+				bucket_name = 'r2-bucket-1-toml'
 
 				# to merge as is
 				[[r2_buckets]]
 				binding = 'R2_BINDING_2_TOML'
-				bucket_name = 'R2_BUCKET_2_TOML'
+				bucket_name = 'r2-bucket-2-toml'
 
 				# to override
 				[[services]]