feat(cloudflare/r2): add bucket custom domains#241
Open
agcty wants to merge 4 commits intoalchemy-run:mainfrom
Open
feat(cloudflare/r2): add bucket custom domains#241agcty wants to merge 4 commits intoalchemy-run:mainfrom
agcty wants to merge 4 commits intoalchemy-run:mainfrom
Conversation
Author
|
Verification update:
|
john-royal
requested changes
May 5, 2026
Contributor
john-royal
left a comment
john-royal
left a comment
There was a problem hiding this comment.
Just some minor changes here. Once you make those, should be good to go.
Comment on lines
+503
to
+524
| Effect.flatMap((bucket) => | ||
| Effect.gen(function* () { | ||
| const jurisdiction = bucket.jurisdiction ?? "default"; | ||
| const existingDomains = | ||
| output?.domains && output.domains.length > 0 | ||
| ? yield* listCustomDomains(bucket.name!, jurisdiction) | ||
| : []; | ||
| const ownedDomains = new Set( | ||
| output?.domains.map((domain) => domain.domain) ?? [], | ||
| ); | ||
| return { | ||
| bucketName: bucket.name!, | ||
| storageClass: bucket.storageClass ?? "Standard", | ||
| jurisdiction, | ||
| location: normalizeLocation(bucket.location), | ||
| accountId: acct, | ||
| domains: existingDomains.filter((domain) => | ||
| ownedDomains.has(domain.domain), | ||
| ), | ||
| }; | ||
| }), | ||
| ), |
Contributor
There was a problem hiding this comment.
We can probably remove this bit entirely since we don't actually read this result.
Comment on lines
+291
to
+305
| for (const previousDomain of previous) { | ||
| if (!desiredDomains.has(previousDomain.domain)) { | ||
| yield* deleteBucketDomainCustom({ | ||
| accountId, | ||
| bucketName, | ||
| domain: previousDomain.domain, | ||
| jurisdiction, | ||
| }).pipe( | ||
| Effect.catchIf( | ||
| isMissingCustomDomainOrBucket, | ||
| () => Effect.void, | ||
| ), | ||
| ); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Can we do this in parallel instead of sequentially using Effect.forEach with concurrency: "unbounded"?
Comment on lines
+307
to
+313
| const applied: R2Bucket.CustomDomain[] = []; | ||
| for (const domain of desired) { | ||
| const zoneId = yield* resolveZoneId(domain.zone); | ||
| const observedDomain = observedByDomain.get(domain.domain); | ||
| if (!sameCustomDomainConfig(observedDomain, domain, zoneId)) { | ||
| if (observedDomain) { | ||
| if (observedDomain.zoneId !== zoneId) { |
Contributor
There was a problem hiding this comment.
Same thing here. I'd change to const applied = yield* Effect.forEach(..., { concurrency: "unbounded" }) so these run in parallel instead of sequentially.
Comment on lines
+360
to
+368
| const refreshed = yield* r2 | ||
| .getBucketDomainCustom({ | ||
| accountId, | ||
| bucketName, | ||
| domain: domain.domain, | ||
| jurisdiction, | ||
| }) | ||
| .pipe(Effect.map(toCustomDomainAttributes)); | ||
| applied.push(refreshed); |
Contributor
There was a problem hiding this comment.
Do the createBucketDomainCustom and updateBucketDomainCustom functions return the attributes we're looking for? If yes, we can optimize by relying on those results instead of making another API call here.
Comment on lines
+167
to
+208
| const isZoneIdString = (zone: string): boolean => /^[a-f0-9]{32}$/i.test(zone); | ||
|
|
||
| const matchesHostname = (zoneName: string, hostname: string): boolean => | ||
| hostname === zoneName || hostname.endsWith(`.${zoneName}`); | ||
|
|
||
| const normalizeDomains = ( | ||
| domains: R2BucketProps["domains"], | ||
| ): R2BucketCustomDomain[] => | ||
| domains === undefined ? [] : Array.isArray(domains) ? domains : [domains]; | ||
|
|
||
| const toCustomDomainAttributes = ( | ||
| domain: | ||
| | r2.GetBucketDomainCustomResponse | ||
| | r2.ListBucketDomainCustomsResponse["domains"][number], | ||
| ): R2Bucket.CustomDomain => ({ | ||
| domain: domain.domain, | ||
| zoneId: domain.zoneId ?? undefined, | ||
| enabled: domain.enabled, | ||
| ciphers: domain.ciphers ?? undefined, | ||
| minTLS: domain.minTLS ?? undefined, | ||
| status: "status" in domain ? domain.status : undefined, | ||
| }); | ||
|
|
||
| const sameCustomDomainConfig = ( | ||
| observed: R2Bucket.CustomDomain | undefined, | ||
| desired: R2BucketCustomDomain, | ||
| zoneId: string, | ||
| ): boolean => | ||
| observed !== undefined && | ||
| observed.zoneId === zoneId && | ||
| observed.enabled === (desired.enabled ?? true) && | ||
| deepEqual(observed.ciphers, desired.ciphers) && | ||
| observed.minTLS === desired.minTLS; | ||
|
|
||
| const isMissingCustomDomainOrBucket = (error: unknown): boolean => | ||
| typeof error === "object" && | ||
| error !== null && | ||
| (("status" in error && (error as { status: unknown }).status === 404) || | ||
| ("_tag" in error && | ||
| ((error as { _tag: unknown })._tag === "DomainNotFound" || | ||
| (error as { _tag: unknown })._tag === "NoSuchBucket"))); | ||
|
|
Contributor
There was a problem hiding this comment.
Nit: please move these to the bottom of the file (helps with being able to read the file from top to bottom)
agcty
force-pushed
the
codex/cloudflare-r2-custom-domains
branch
from
3d31327 to
a02ef07
Compare
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
2 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.
Adds R2 bucket custom-domain support to the existing Cloudflare R2Bucket resource.
domainsas a single custom domain or an array{ zoneId }, zone ID strings, and hostname strings for zone selectionzoneIdon the update endpointCLOUDFLARE_TEST_R2_DOMAIN_ZONE_IDandCLOUDFLARE_TEST_R2_DOMAINVerification run:
bun vitest run packages/alchemy/test/Cloudflare/R2/CustomDomain.test.tsbun tsc -b --pretty falsegit diff --check