Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding wrangler commands for R2 bucket lock rule configuration #7977

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding wrangler commands for R2 bucket lock rule configuration #7977

wants to merge 1 commit into from
+1,096 −3

Conversation

jkoe-cf
Copy link
Contributor

@jkoe-cf jkoe-cf commented Jan 31, 2025 •
edited by jonesphillip
Loading

What this PR solves / how to test
Allows user to configure lock configuration on an R2 bucket

  • Tests
    • TODO (before merge)
    • Tests included
    • Tests not necessary because:
  • E2E Tests CI Job required? (Use "e2e" label or ask maintainer to run separately)
    • I don't know
    • Required
    • Not required because: changes covered by unit tests
  • Public documentation

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Jan 31, 2025 •
edited
Loading

🦋 Changeset detected

Latest commit: 8887bc4

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
wrangler Minor
@cloudflare/vitest-pool-workers Patch

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

@jkoe-cf jkoe-cf force-pushed the jkoe/R2-2612 branch 4 times, most recently from 219cdf7 to f348a78 Compare February 3, 2025 19:51
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 3, 2025 •
edited
Loading

A wrangler prerelease is available for testing. You can install this latest build in your project with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-wrangler-7977

You can reference the automatically updated head of this PR with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/prs/7977/npm-package-wrangler-7977

Or you can use npx with this latest build directly:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-wrangler-7977 dev path/to/script.js
Additional artifacts:

cloudflare-workers-bindings-extension:

wget https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-workers-bindings-extension-7977 -O ./cloudflare-workers-bindings-extension.0.0.0-v13c6efbb8.vsix && code --install-extension ./cloudflare-workers-bindings-extension.0.0.0-v13c6efbb8.vsix

create-cloudflare:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-create-cloudflare-7977 --no-auto-update

@cloudflare/kv-asset-handler:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-kv-asset-handler-7977

miniflare:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-miniflare-7977

@cloudflare/pages-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-pages-shared-7977

@cloudflare/unenv-preset:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-unenv-preset-7977

@cloudflare/vite-plugin:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-vite-plugin-7977

@cloudflare/vitest-pool-workers:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-vitest-pool-workers-7977

@cloudflare/workers-editor-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-workers-editor-shared-7977

@cloudflare/workers-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-workers-shared-7977

@cloudflare/workflows-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13210681159/npm-package-cloudflare-workflows-shared-7977

Note that these links will no longer work once the GitHub Actions artifact expires.

[email protected] includes the following runtime dependencies:

Package Constraint Resolved
miniflare workspace:* 3.20250129.0
workerd 1.20250204.0 1.20250204.0
workerd --version 1.20250204.0 2025-02-04

Please ensure constraints are pinned, and miniflare/workerd minor versions match.

@jkoe-cf jkoe-cf force-pushed the jkoe/R2-2612 branch 8 times, most recently from 8baf320 to 911107e Compare February 4, 2025 23:17
@jkoe-cf jkoe-cf marked this pull request as ready for review February 5, 2025 00:53
@jkoe-cf jkoe-cf requested a review from a team as a code owner February 5, 2025 00:53
@jkoe-cf jkoe-cf force-pushed the jkoe/R2-2612 branch 3 times, most recently from 743f60e to 3b406c5 Compare February 6, 2025 22:02
emily-shen
emily-shen requested changes Feb 7, 2025
View reviewed changes
packages/wrangler/src/r2/lifecycle.ts
@@ -97,7 +97,7 @@ export const r2BucketLifecycleAddCommand = createCommand({
},
"expire-date": {
describe: "Date after which objects expire (YYYY-MM-DD)",
type: "number",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh - is this a bugfix? was this broken previously? (if it was, can you add another patch changeset to document the fix?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was intended as a bugfix (found it while writing tests) will add another changeset!

packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts
},
prefix: {
describe:
"Prefix condition for the bucket lock rule (leave empty for all prefixes)",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Prefix condition for the bucket lock rule (leave empty for all prefixes)",
"Prefix condition for the bucket lock rule (set to "" for all prefixes)",

packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts Show resolved Hide resolved
packages/wrangler/src/r2/lock.ts Outdated Show resolved Hide resolved
packages/wrangler/src/index.ts Show resolved Hide resolved
@emily-shen
Copy link
Contributor

would also be good to get some tests for invalid input 🧡

@jonesphillip jonesphillip mentioned this pull request Feb 7, 2025
Open
@jkoe-cf jkoe-cf force-pushed the jkoe/R2-2612 branch 3 times, most recently from 7b4ce6a to ba6d6cb Compare February 8, 2025 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emily-shen emily-shen emily-shen requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
workers-sdk
Status: In Review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jkoe-cf @emily-shen