feat(server): ExpressJS to Fastify migration (#938)

americanexpress · Mar 6, 2023 · 9b0c4b3 · 9b0c4b3
1 parent 636f24c
commit 9b0c4b3
Show file tree

Hide file tree

Showing 117 changed files with 11,715 additions and 27,587 deletions.
diff --git a/__mocks__/node-fetch.js b/__mocks__/node-fetch.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 American Express Travel Related Services Company, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,either express
+ * or implied. See the License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+const fetch = jest.createMockFromModule('node-fetch');
+fetch.mockReturnJsonOnce = (obj) => {
+  if (obj instanceof Error) {
+    return fetch.mockImplementationOnce(() => Promise.reject(obj));
+  }
+
+  return fetch.mockImplementationOnce(() => Promise.resolve({ body: JSON.stringify(obj) }));
+};
+
+fetch.mockReturnFileOnce = (body) => {
+  if (body instanceof Error) {
+    return fetch.mockImplementationOnce(() => Promise.reject(body));
+  }
+
+  return fetch.mockImplementationOnce(() => Promise.resolve({ body, statusCode: 200 }));
+};
+module.exports = fetch;
diff --git a/__tests__/client/initClient.spec.js b/__tests__/client/initClient.spec.js
@@ -17,11 +17,10 @@
 
 import { fromJS } from 'immutable';
 
-jest.mock('@americanexpress/one-app-router', () => {
-  const reactRouter = jest.requireActual('@americanexpress/one-app-router');
-  jest.spyOn(reactRouter, 'matchPromise');
-  return reactRouter;
-});
+jest.mock('@americanexpress/one-app-router', () => ({
+  ...jest.requireActual('@americanexpress/one-app-router'),
+  matchPromise: jest.fn(),
+}));
 
 jest.mock('../../src/client/prerender', () => {
   const prerender = jest.requireActual('../../src/client/prerender');

diff --git a/__tests__/integration/__snapshots__/one-app.spec.js.snap b/__tests__/integration/__snapshots__/one-app.spec.js.snap
@@ -50,6 +50,8 @@ exports[`Tests that require Docker setup one-app successfully started metrics ha
   "nodejs_active_handles_total",
   "nodejs_active_requests",
   "nodejs_active_requests_total",
+  "nodejs_active_resources",
+  "nodejs_active_resources_total",
   "nodejs_eventloop_lag_max_seconds",
   "nodejs_eventloop_lag_mean_seconds",
   "nodejs_eventloop_lag_min_seconds",

diff --git a/__tests__/integration/one-app.spec.js b/__tests__/integration/one-app.spec.js
@@ -128,10 +128,10 @@ describe('Tests that require Docker setup', () => {
         headers: {
           origin: 'test.example.com',
         },
+        body: JSON.stringify({}),
       });
       const rawHeaders = response.headers.raw();
       expect(response.status).toBe(200);
-      expect(rawHeaders).not.toHaveProperty('access-control-allow-origin');
       expect(rawHeaders).not.toHaveProperty('access-control-expose-headers');
       expect(rawHeaders).not.toHaveProperty('access-control-allow-credentials');
     });
@@ -210,9 +210,9 @@ describe('Tests that require Docker setup', () => {
             headers: {
               origin: 'test.example.com',
             },
-            body: {
+            body: JSON.stringify({
               message: 'Hello!',
-            },
+            }),
           }
         );
         const rawHeaders = response.headers.raw();
@@ -1335,9 +1335,6 @@ describe('Tests that require Docker setup', () => {
         date: [
           expect.any(String),
         ],
-        etag: [
-          expect.any(String),
-        ],
         'one-app-version': [
           expect.any(String),
         ],
@@ -1348,14 +1345,23 @@ describe('Tests that require Docker setup', () => {
           'max-age=15552000; includeSubDomains',
         ],
         vary: [
-          'Accept-Encoding',
+          'Accept-Encoding, accept-encoding',
         ],
         'x-content-type-options': [
           'nosniff',
         ],
+        'x-dns-prefetch-control': [
+          'off',
+        ],
+        'x-download-options': [
+          'noopen',
+        ],
         'x-frame-options': [
           'DENY',
         ],
+        'x-permitted-cross-domain-policies': [
+          'none',
+        ],
         'x-xss-protection': [
           '1; mode=block',
         ],
@@ -1369,9 +1375,11 @@ describe('Tests that require Docker setup', () => {
         headers: {
           origin: 'test.example.com',
         },
+        body: {},
       });
 
       expect(response.headers.raw()).toEqual({
+        vary: ['Accept-Encoding'],
         connection: [
           'close',
         ],
@@ -1385,7 +1393,7 @@ describe('Tests that require Docker setup', () => {
           expect.any(String),
         ],
         'referrer-policy': [
-          'no-referrer',
+          'same-origin',
         ],
         'strict-transport-security': [
           'max-age=15552000; includeSubDomains',
@@ -1400,13 +1408,13 @@ describe('Tests that require Docker setup', () => {
           'noopen',
         ],
         'x-frame-options': [
-          'SAMEORIGIN',
+          'DENY',
         ],
         'x-permitted-cross-domain-policies': [
           'none',
         ],
         'x-xss-protection': [
-          '0',
+          '1; mode=block',
         ],
       });
       expect(response.status).toBe(204);
@@ -1421,6 +1429,7 @@ describe('Tests that require Docker setup', () => {
         headers: {
           origin: 'test.example.com',
         },
+        body: {},
       });
 
       expect(response.headers.raw()).toEqual({
@@ -1439,20 +1448,17 @@ describe('Tests that require Docker setup', () => {
         date: [
           expect.any(String),
         ],
-        etag: [
-          expect.any(String),
-        ],
         'one-app-version': [
           expect.any(String),
         ],
         'referrer-policy': [
-          'no-referrer',
+          'same-origin',
         ],
         'strict-transport-security': [
           'max-age=15552000; includeSubDomains',
         ],
         vary: [
-          'Accept-Encoding',
+          'Accept-Encoding, accept-encoding',
         ],
         'x-content-type-options': [
           'nosniff',
@@ -1464,13 +1470,13 @@ describe('Tests that require Docker setup', () => {
           'noopen',
         ],
         'x-frame-options': [
-          'SAMEORIGIN',
+          'DENY',
         ],
         'x-permitted-cross-domain-policies': [
           'none',
         ],
         'x-xss-protection': [
-          '0',
+          '1; mode=block',
         ],
       });
       expect(response.status).toBe(415);
@@ -1485,8 +1491,11 @@ describe('Tests that require Docker setup', () => {
           origin: 'test.example.com',
           'content-type': 'application/json',
         },
+        body: JSON.stringify({}),
       });
 
+      // expect(response.status).toBe(204);
+      expect(await response.text()).toBe('');
       expect(response.headers.raw()).toEqual({
         connection: [
           'close',
@@ -1497,18 +1506,16 @@ describe('Tests that require Docker setup', () => {
         date: [
           expect.any(String),
         ],
-        etag: [
-          expect.any(String),
-        ],
         'one-app-version': [
           expect.any(String),
         ],
         'referrer-policy': [
-          'no-referrer',
+          'same-origin',
         ],
         'strict-transport-security': [
           'max-age=15552000; includeSubDomains',
         ],
+        vary: ['Accept-Encoding'],
         'x-content-type-options': [
           'nosniff',
         ],
@@ -1519,17 +1526,15 @@ describe('Tests that require Docker setup', () => {
           'noopen',
         ],
         'x-frame-options': [
-          'SAMEORIGIN',
+          'DENY',
         ],
         'x-permitted-cross-domain-policies': [
           'none',
         ],
         'x-xss-protection': [
-          '0',
+          '1; mode=block',
         ],
       });
-      expect(response.status).toBe(204);
-      expect(await response.text()).toBe('');
     });
 
     test('Request: /foo/invalid.json', async () => {
@@ -1542,6 +1547,7 @@ describe('Tests that require Docker setup', () => {
       });
 
       expect(response.status).toBe(404);
+      expect(await response.text()).toBe('Not found');
       expect(response.headers.raw()).toEqual({
         'cache-control': [
           'no-store',
@@ -1561,8 +1567,8 @@ describe('Tests that require Docker setup', () => {
         date: [
           expect.any(String),
         ],
-        etag: [
-          expect.any(String),
+        'expect-ct': [
+          'max-age=0',
         ],
         'one-app-version': [
           expect.any(String),
@@ -1577,7 +1583,7 @@ describe('Tests that require Docker setup', () => {
           'max-age=15552000; includeSubDomains',
         ],
         vary: [
-          'Accept-Encoding',
+          'Accept-Encoding, accept-encoding',
         ],
         'x-content-type-options': [
           'nosniff',
@@ -1655,9 +1661,9 @@ describe('Tests that can run against either local Docker setup or remote One App
             headers: {
               origin: 'test.example.com',
             },
-            body: {
+            body: JSON.stringify({
               message: 'Hello!',
-            },
+            }),
           }
         );
         expect(response.status).toBe(200);
@@ -1669,11 +1675,10 @@ describe('Tests that can run against either local Docker setup or remote One App
         const response = await fetch(`${appInstanceUrls.fetchUrl}/success`, {
           ...defaultFetchOpts,
           method: 'POST',
+          body: {},
         });
         const pageHtml = await response.text();
-        expect(pageHtml.includes('Hello! One App is successfully rendering its Modules!')).toBe(
-          true
-        );
+        expect(pageHtml).toContain('Hello! One App is successfully rendering its Modules!');
       });
 
       test('app passes vitruvius data to modules', async () => {
@@ -1702,7 +1707,7 @@ describe('Tests that can run against either local Docker setup or remote One App
             method: 'GET',
             originalUrl: '/vitruvius',
             params: {
-              0: '/vitruvius',
+              '*': 'vitruvius',
             },
             protocol: expect.stringMatching(/^https?$/),
             query: {},
@@ -1732,6 +1737,7 @@ describe('Tests that can run against either local Docker setup or remote One App
           sendingData: 'in POSTs',
         });
       });
+
       test('app passes urlencoded POST data to modules via vitruvius', async () => {
         const response = await fetch(`${appInstanceUrls.fetchUrl}/vitruvius`, {
           ...defaultFetchOpts,

diff --git a/__tests__/server/config/env/runTime.spec.js b/__tests__/server/config/env/runTime.spec.js
@@ -426,7 +426,7 @@ describe('runTime', () => {
     const referrerPolicyOverride = getEnvVarConfig('ONE_REFERRER_POLICY_OVERRIDE');
 
     it('default value', () => {
-      expect(referrerPolicyOverride.defaultValue()).toEqual('same-origin');
+      expect(referrerPolicyOverride.defaultValue()).toEqual('');
     });
 
     it('validates approved policy', () => {