Skip to content

Commit b742171

Browse files
workers-devprodpenalosavicb
authored
V3 Backport [#9257]: Revert R2 bucket validation for commands (#9259)
* revert R2 bucket validation for pages dev * add changeset * Update packages/wrangler/src/pages/dev.ts Co-authored-by: Victor Berchet <[email protected]> * format --------- Co-authored-by: Samuel Macleod <[email protected]> Co-authored-by: Victor Berchet <[email protected]>
1 parent 10c307a commit b742171

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

.changeset/great-berries-grow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Relax R2 bucket validation for `pages dev` commands

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
115115
}`,
116116
});
117117
const worker = helper.runLongLived(
118-
`${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`
118+
`${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`
119119
);
120120
await worker.waitForReady();
121121
expect(normalizeOutput(worker.currentOutput)).toContain(
@@ -127,7 +127,7 @@ describe.sequential.each([{ cmd: "wrangler pages dev" }])(
127127
- D1 Databases:
128128
- TEST_D1: local-TEST_D1 (TEST_D1) [simulated locally]
129129
- R2 Buckets:
130-
- test-r2: test-r2 [simulated locally]
130+
- TEST_R2: TEST_R2 [simulated locally]
131131
- Services:
132132
- TEST_SERVICE: test-worker [not connected]
133133
`

packages/wrangler/src/pages/dev.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { logger } from "../logger";
1616
import * as metrics from "../metrics";
1717
import { isNavigatorDefined } from "../navigator-user-agent";
1818
import { getBasePath } from "../paths";
19-
import { bucketFormatMessage, isValidR2BucketName } from "../r2/helpers";
2019
import * as shellquote from "../utils/shell-quote";
2120
import { printWranglerBanner } from "../wrangler-banner";
2221
import { buildFunctions } from "./buildFunctions";
@@ -1273,15 +1272,8 @@ function getBindingsFromArgs(args: PagesDevArguments): Partial<
12731272
return;
12741273
}
12751274

1276-
const bucketName = ref || binding.toString();
1277-
1278-
if (!isValidR2BucketName(bucketName)) {
1279-
logger.error(
1280-
`The bucket name "${bucketName}" is invalid. ${bucketFormatMessage}`
1281-
);
1282-
return;
1283-
}
1284-
1275+
// The generated `bucket_name` might be invalid as per https://developers.cloudflare.com/r2/buckets/create-buckets/#bucket-level-operations
1276+
// However this name only applies to the dev environment and is not validated by miniflare.
12851277
return { binding, bucket_name: ref || binding.toString() };
12861278
})
12871279
.filter(Boolean) as EnvironmentNonInheritable["r2_buckets"];

0 commit comments

Comments
 (0)