update test

reapit · Oct 25, 2023 · 14ba543 · 14ba543
1 parent edbbc1d
commit 14ba543
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/packages/constructs/edge-api/src/lambdas/origin-selector.ts b/packages/constructs/edge-api/src/lambdas/origin-selector.ts
@@ -34,16 +34,17 @@ export const handler = async (event: CloudFrontRequestEvent): Promise<CloudFront
   if (!mapping) {
     throw new Error(`no domain mapping found for host ${host}`)
   }
+  const domainName = typeof mapping === 'string' ? mapping : mapping.destination
   req.origin = {
     custom: {
       ...req.origin.custom,
-      domainName: mapping.destination,
+      domainName,
     },
   }
   req.headers['host'] = [
     {
       key: 'host',
-      value: mapping.destination,
+      value: domainName,
     },
   ]
 

diff --git a/packages/constructs/edge-api/tests/lambdas/origin-selector.test.ts b/packages/constructs/edge-api/tests/lambdas/origin-selector.test.ts
@@ -106,14 +106,14 @@ const genEvent = (reqHost: string, env: any) => ({
 })
 
 describe('origin selector', () => {
-  it('should select the origin based on the req-host and env headers', async () => {
+  it('should select a domain-mapped origin based on the req-host and env headers', async () => {
     const env = {
       domainMapping: {
         'example.org': {
-          domain: 'somewhere.org',
+          destination: 'somewhere.org',
         },
         'example.com': {
-          domain: 'somewhere.com',
+          destination: 'somewhere.com',
         },
       },
     }
@@ -131,4 +131,26 @@ describe('origin selector', () => {
     expect(result2.origin.custom?.domainName).toBe('somewhere.com')
     expect(result2.headers['host'][0].value).toBe('somewhere.com')
   })
+
+  it('should select a domain-mapped origin based on the req-host and env headers', async () => {
+    const env = {
+      domainMapping: {
+        'example.org': 'somewhere.org',
+        'example.com': 'somewhere.com',
+      },
+    }
+    const result = await handler(genEvent('example.org', env) as any)
+    if (!result.origin) {
+      throw new Error('no origin on result')
+    }
+    expect(result.origin.custom?.domainName).toBe('somewhere.org')
+    expect(result.headers['host'][0].value).toBe('somewhere.org')
+
+    const result2 = await handler(genEvent('example.com', env) as any)
+    if (!result2.origin) {
+      throw new Error('no origin on result')
+    }
+    expect(result2.origin.custom?.domainName).toBe('somewhere.com')
+    expect(result2.headers['host'][0].value).toBe('somewhere.com')
+  })
 })