feat: optionally send zone_id with a route #778

threepointone · 2022-04-10T15:32:55Z

This enables optionally passing a route as {pattern: string, zone_id: string}. There are scenarios where we need to explicitly pass a zone_id to the api, so this is enables that.

Some nuance: The errors from the api aren't super useful when invalid values are passed, but that's something to further work on.

This also fixes some types in our cli parsing.

Fixes #774

changeset-bot · 2022-04-10T15:32:57Z

🦋 Changeset detected

Latest commit: 8015ff3

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

This PR includes changesets to release 1 package

Name	Type
wrangler	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

github-actions · 2022-04-10T15:33:42Z

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

npm install --save-dev https://prerelease-registry.developers.workers.dev/runs/2154535104/npm-package-wrangler-778

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

npm install --save-dev https://prerelease-registry.developers.workers.dev/prs/778/npm-package-wrangler-778

Or you can use npx with this latest build directly:

npx https://prerelease-registry.developers.workers.dev/runs/2154535104/npm-package-wrangler-778 dev path/to/script.js

packages/wrangler/src/index.tsx

packages/wrangler/src/config/validation.ts

This updates some dependencies. Some highlights - - updates to `@iarna/toml` means we can have mixed types for inline arrays, which is great for #774 / #778 - I also moved timeago.js to `devDependencies` since it already gets compiled into the bundle - updates to `esbuild` brings along a number of smaller fixes for modern js

packages/wrangler/src/__tests__/configuration.test.ts

packages/wrangler/src/config/validation.ts

threepointone · 2022-04-11T17:24:52Z

aight, I think this is ready for a review/land. I'll work on adding zone_name afterwards.

JacobMGEvans · 2022-04-11T17:36:31Z

packages/wrangler/src/publish.ts

@@ -327,15 +337,13 @@ export default async function publish(props: Props): Promise<void> {
    if (triggers && triggers.length) {
      deployments.push(
        fetchResult(`${workerUrl}/schedules`, {
-          // TODO: Unlike routes, this endpoint does not support PATCH.
-          // So technically, this will override any previous schedules.
-          // We should change the endpoint to support PATCH.


Is this in the works, or no longer doable?

Using patch is weird because it means the source of truth is now coming from two places. But of course it means you can edit it in the dashboard. Each option has tradeoffs, but this is the one we're picking for now and can revisit later based on feedback.

WalshyDev · 2022-04-11T21:32:13Z

Can confirm it works 🎉

Thanks so much for the quick work!

$ npx https://prerelease-registry.developers.workers.dev/runs/2150140028/npm-package-wrangler-778 publish
 ⛅️ wrangler 0.0.0-72b5599 (update available 0.0.25)
--------------------------------------------------------------
Uploaded build-cache-poc (2.58 sec)
Published build-cache-poc (3.38 sec)
  pages-cache-poc.walshy.dev/* (zone: 8d0c8239f88f98a8cb82ec7bb29b8556)

(now I can start to get working on this demo I'm giving in a few days...)

threepointone · 2022-04-11T21:33:32Z

Wonderful, good to hear

.changeset/dull-jobs-return.md

packages/wrangler/src/config/validation.ts

packages/wrangler/src/index.tsx

This enables optionally passing a route as `{pattern: string, zone_id: string}`. There are scenarios where we need to explicitly pass a zone_id to the api, so this enables that. Some nuance: our toml parser unfortunately doesn't let you have mixed types in arrays, so if you have a single route with this special shape, then you'll have to do it for all of them. We can replace it with something more recent, but I'll do that in a subsequent PR. Further nuance: The errors from the api aren't super useful when invalid values are passed, but that's something to further work on. This also fixes some types in our cli parsing. Fixes #774

A followup to #778, this lets you send an optional `zone_name` with routes. This is particularly useful when using ssl for saas (https://developers.cloudflare.com/ssl/ssl-for-saas/).

A followup to #778, this lets you send an optional `zone_name` with routes. This is particularly useful when using ssl for saas (https://developers.cloudflare.com/ssl/ssl-for-saas/). Fixes #793

threepointone requested a review from petebacondarwin as a code owner April 10, 2022 15:32

threepointone force-pushed the route-zone-id branch from b2b80ff to c46671b Compare April 10, 2022 15:33

threepointone commented Apr 10, 2022

View reviewed changes

packages/wrangler/src/index.tsx Show resolved Hide resolved

packages/wrangler/src/config/validation.ts Outdated Show resolved Hide resolved

threepointone force-pushed the route-zone-id branch from c46671b to 2a188cf Compare April 10, 2022 15:41

threepointone mentioned this pull request Apr 10, 2022

chore: update packages #779

Merged

github-actions bot mentioned this pull request Apr 11, 2022

Version Packages #780

Merged

threepointone commented Apr 11, 2022

View reviewed changes

packages/wrangler/src/__tests__/configuration.test.ts Outdated Show resolved Hide resolved

threepointone force-pushed the route-zone-id branch from 2a188cf to 632a853 Compare April 11, 2022 13:24

JacobMGEvans reviewed Apr 11, 2022

View reviewed changes

packages/wrangler/src/config/validation.ts Outdated Show resolved Hide resolved

threepointone force-pushed the route-zone-id branch from 632a853 to 184b547 Compare April 11, 2022 17:23

threepointone force-pushed the route-zone-id branch from 184b547 to 33aa42d Compare April 11, 2022 17:28

JacobMGEvans reviewed Apr 11, 2022

View reviewed changes

JacobMGEvans approved these changes Apr 11, 2022

View reviewed changes

petebacondarwin approved these changes Apr 12, 2022

View reviewed changes

.changeset/dull-jobs-return.md Outdated Show resolved Hide resolved

packages/wrangler/src/config/validation.ts Show resolved Hide resolved

packages/wrangler/src/index.tsx Show resolved Hide resolved

threepointone force-pushed the route-zone-id branch from 33aa42d to 8015ff3 Compare April 12, 2022 11:13

threepointone merged commit 85b0c31 into main Apr 12, 2022

threepointone deleted the route-zone-id branch April 12, 2022 11:18

threepointone mentioned this pull request Apr 14, 2022

feat: optionally send zone_name with routes #797

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: optionally send zone_id with a route #778

feat: optionally send zone_id with a route #778

threepointone commented Apr 10, 2022 •

edited

changeset-bot bot commented Apr 10, 2022 •

edited

github-actions bot commented Apr 10, 2022 •

edited

threepointone commented Apr 11, 2022

JacobMGEvans Apr 11, 2022

threepointone Apr 11, 2022

WalshyDev commented Apr 11, 2022 •

edited

threepointone commented Apr 11, 2022

feat: optionally send zone_id with a route #778

feat: optionally send zone_id with a route #778

Conversation

threepointone commented Apr 10, 2022 • edited

changeset-bot bot commented Apr 10, 2022 • edited

🦋 Changeset detected

github-actions bot commented Apr 10, 2022 • edited

threepointone commented Apr 11, 2022

JacobMGEvans Apr 11, 2022

Choose a reason for hiding this comment

threepointone Apr 11, 2022

Choose a reason for hiding this comment

WalshyDev commented Apr 11, 2022 • edited

threepointone commented Apr 11, 2022

threepointone commented Apr 10, 2022 •

edited

changeset-bot bot commented Apr 10, 2022 •

edited

github-actions bot commented Apr 10, 2022 •

edited

WalshyDev commented Apr 11, 2022 •

edited