fix(wrangler): improve R2 CORS validation and error messaging#12456
Merged
petebacondarwin merged 5 commits intocloudflare:mainfrom Apr 15, 2026
Merged
fix(wrangler): improve R2 CORS validation and error messaging#12456petebacondarwin merged 5 commits intocloudflare:mainfrom
petebacondarwin merged 5 commits intocloudflare:mainfrom
Conversation
🦋 Changeset detectedLatest commit: a960018 The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
petebacondarwin
force-pushed
the
fix/r2-cors-validation
branch
from
ccdf0cc to
0715785
Compare
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers
|
petebacondarwin
force-pushed
the
fix/r2-cors-validation
branch
from
cae1255 to
4358e89
Compare
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers
|
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
wrangler
commit: |
venkatnikhilm
changed the title
…sts for S3 format detection
petebacondarwin
force-pushed
the
fix/r2-cors-validation
branch
from
4358e89 to
a960018
Compare
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers |
petebacondarwin
requested review from
a team and
petebacondarwin
and removed request for
a team
petebacondarwin
approved these changes
Apr 15, 2026
workers-devprod
approved these changes
Apr 15, 2026
Contributor
workers-devprod
left a comment
workers-devprod
left a comment
There was a problem hiding this comment.
Codeowners reviews satisfied
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR addresses #8486 by adding local validation to the r2 bucket cors set command.
Previously, users providing AWS S3-formatted CORS files (using CORSRules or PascalCase keys like AllowedOrigins) would receive a generic 10040 API error from the server. This PR intercepts these common formatting mistakes locally, providing a descriptive error message and a link to the correct Cloudflare R2 documentation.
Validation conducted:
pnpm run check --filter wranglerin the project root with 0 errors.Changes:
Modified
packages/wrangler/src/r2/cors.tsto include a validation layer usingparseJSON.Added detection for AWS-specific top-level keys and PascalCase property keys.
Included an official documentation link in the error output.
Tests
Public documentation