fix: wrangler with zone inside routes (#181)

nftstorage · Aug 30, 2022 · 963edbf · 963edbf
1 parent 2f3012e
commit 963edbf
Show file tree

Hide file tree

Showing 3 changed files with 202 additions and 195 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "prettier": "2.5.1",
     "rimraf": "^3.0.2",
     "simple-git-hooks": "^2.7.0",
-    "wrangler": "^2.0.23"
+    "wrangler": "^2.0.28"
   },
   "resolutions": {
     "prettier": "2.5.1"

diff --git a/packages/edge-gateway/wrangler.toml b/packages/edge-gateway/wrangler.toml
@@ -19,15 +19,14 @@ bindings = [
 [env.production]
 # name = "gateway-nft-storage-production"
 account_id = "fffa4b4363a7e5250af8357087263b3a" # Protocol Labs CF account
-zone_id = "c7795a0adce7609a95d62fec04705aff"
 routes = [
-  "nftstorage.link/ipfs/*",
-  "*.ipfs.nftstorage.link/*",
-  "ipfs.nftstorage.link/*",
-  "*.ipfs.nftstorage.link",
-  "nftstorage.link/ipns/*",
-  "*.ipns.nftstorage.link/*",
-  "*.ipns.nftstorage.link"
+  { pattern = "nftstorage.link/ipfs/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipfs.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "ipfs.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipfs.nftstorage.link", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "nftstorage.link/ipns/", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipns.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipns.nftstorage.link", zone_id = "c7795a0adce7609a95d62fec04705aff" }
 ]
 kv_namespaces = [{ binding = "DENYLIST", id = "785cf627e913468ca5319523ae929def" }]
 
@@ -57,13 +56,12 @@ environment = "production"
 [env.staging]
 # name = "gateway-nft-storage-staging"
 account_id = "fffa4b4363a7e5250af8357087263b3a" # Protocol Labs CF account
-zone_id = "c7795a0adce7609a95d62fec04705aff"
 routes = [
-  "*.ipfs-staging.nftstorage.link/*",
-  "ipfs-staging.nftstorage.link/*",
-  "*.ipfs-staging.nftstorage.link",
-  "*.ipns-staging.nftstorage.link/*",
-  "*.ipns-staging.nftstorage.link"
+  { pattern = "*.ipfs-staging.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "ipfs-staging.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipfs-staging.nftstorage.link", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipns-staging.nftstorage.link/*", zone_id = "c7795a0adce7609a95d62fec04705aff" },
+  { pattern = "*.ipns-staging.nftstorage.link", zone_id = "c7795a0adce7609a95d62fec04705aff" }
 ]
 kv_namespaces = [{ binding = "DENYLIST", id = "f4eb0eca32e14e28b643604a82e00cb3" }]