feat!: add region parameter (#183)

netlify · Jul 3, 2024 · 03187bb · 03187bb
1 parent 075b3a0
commit 03187bb
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 56 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -1,6 +1,7 @@
 import { BlobsConsistencyError, ConsistencyMode } from './consistency.ts'
 import { EnvironmentContext, getEnvironmentContext, MissingBlobsEnvironmentError } from './environment.ts'
 import { encodeMetadata, Metadata, METADATA_HEADER_EXTERNAL, METADATA_HEADER_INTERNAL } from './metadata.ts'
+import { InvalidBlobsRegionError, isValidRegion } from './region.ts'
 import { fetchAndRetry } from './retry.ts'
 import { BlobInput, Fetcher, HTTPMethod } from './types.ts'
 import { BlobsInternalError } from './util.ts'
@@ -231,6 +232,10 @@ export const getClientOptions = (
     throw new MissingBlobsEnvironmentError(['siteID', 'token'])
   }
 
+  if (options.region !== undefined && !isValidRegion(options.region)) {
+    throw new InvalidBlobsRegionError(options.region)
+  }
+
   const clientOptions: InternalClientOptions = {
     apiURL: context.apiURL ?? options.apiURL,
     consistency: options.consistency,

diff --git a/src/consistency.test.ts b/src/consistency.test.ts
@@ -152,6 +152,7 @@ describe('Consistency configuration', () => {
       cool: true,
       functions: ['edge', 'serverless'],
     }
+    const mockRegion = 'us-east-1'
     const headers = {
       etag: '123456789',
       'x-amz-meta-user': `b64;${base64Encode(mockMetadata)}`,
@@ -160,17 +161,17 @@ describe('Consistency configuration', () => {
       .get({
         headers: { authorization: `Bearer ${edgeToken}` },
         response: new Response(value),
-        url: `${uncachedEdgeURL}/${siteID}/deploy:${deployID}/${key}`,
+        url: `${uncachedEdgeURL}/region:${mockRegion}/${siteID}/deploy:${deployID}/${key}`,
       })
       .head({
         headers: { authorization: `Bearer ${edgeToken}` },
         response: new Response(null, { headers }),
-        url: `${uncachedEdgeURL}/${siteID}/deploy:${deployID}/${key}`,
+        url: `${uncachedEdgeURL}/region:${mockRegion}/${siteID}/deploy:${deployID}/${key}`,
       })
       .get({
         headers: { authorization: `Bearer ${edgeToken}` },
         response: new Response(value, { headers }),
-        url: `${uncachedEdgeURL}/${siteID}/deploy:${deployID}/${key}`,
+        url: `${uncachedEdgeURL}/region:${mockRegion}/${siteID}/deploy:${deployID}/${key}`,
       })
 
     globalThis.fetch = mockStore.fetch
@@ -179,6 +180,7 @@ describe('Consistency configuration', () => {
       consistency: 'strong',
       edgeURL,
       deployID,
+      region: mockRegion,
       token: edgeToken,
       siteID,
       uncachedEdgeURL,