Repository navigation
Add per-project R2 firmware bucket overrides - #15
Merged
Merged
Conversation
Allow firmware projects to use dedicated R2 buckets via R2_FIRMWARE_BUCKET_NAME__<PROJECT> / R2_FIRMWARE_PUBLIC_URL__<PROJECT> (and optional per-bucket credentials), keeping global R2_FIRMWARE_* as defaults so GarageDoor/Web3E behaviour is unchanged. zigbee-gateway uses esp-firmware + the documented public URL. Co-authored-by: James Brown <JamesSmartCell@users.noreply.github.com>
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
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.
Summary
Adds generic per-project R2 firmware bucket support so
zigbee-gatewaycan upload to / serve from a dedicated bucket, while GarageDoor/Web3E keep existing global defaults.Design
Per-project env overrides (project
zigbee-gateway→ suffixZIGBEE_GATEWAY):Optional bucket-scoped credentials (fall back to global
R2_*):Resolution order: per-project override → global
R2_FIRMWARE_*→R2_BUCKET_NAME/R2_PUBLIC_URL.Global
R2_FIRMWARE_BUCKET_NAME/R2_FIRMWARE_PUBLIC_URLare not repurposed.POST /api/firmware/:projectusesuploadFirmwareToR2(project, ...), soGET /api/firmware/zigbee-gateway/latestreturns the public URL from the new bucket withsha256/size.Pi env lines for Rob
If the R2 API token for
esp-firmwareis bucket-scoped (does not share the camera/global token), also add:Leave existing
R2_FIRMWARE_BUCKET_NAME/R2_FIRMWARE_PUBLIC_URLas-is for other projects.Tests
cloudflare-r2-urlcoverage for per-project bucket/URL/creds and GarageDoor fallback/latestforzigbee-gatewaypublic URLDo not merge until Rob has set the Pi env (master auto-deploys).