Merge pull request #2387 from cisagov/dependabot/npm_and_yarn/backend…

…/axios-1.6.2 Bump axios from 0.27.2 to 1.6.2 in /backend
cisagov · Jan 2, 2024 · 7029749 · 7029749
2 parents a32ee59 + a8f090c
commit 7029749
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 48 deletions.
diff --git a/backend/jest.config.js b/backend/jest.config.js
@@ -23,6 +23,9 @@ module.exports = {
     '/node_modules/',
     '.*report.*' // Remove this when we enable report / vulnerability functionality
   ],
+  moduleNameMapper: {
+    '^axios$': require.resolve('axios')
+  },
   coverageThreshold: {
     global: {
       branches: 50

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -12,7 +12,7 @@
     "@elastic/elasticsearch": "~7.10.0",
     "@thefaultvault/tfv-cpe-parser": "^1.3.0",
     "aws-sdk": "^2.1352.0",
-    "axios": "^0.27",
+    "axios": "^1.6",
     "body-parser": "^1.19.0",
     "bufferutil": "^4.0.7",
     "class-transformer": "^0.3.1",

diff --git a/backend/src/tasks/cve.ts b/backend/src/tasks/cve.ts
@@ -10,14 +10,7 @@ import { plainToClass } from 'class-transformer';
 import { CommandOptions } from './ecs-client';
 import * as buffer from 'buffer';
 import saveVulnerabilitiesToDb from './helpers/saveVulnerabilitiesToDb';
-import {
-  LessThan,
-  MoreThan,
-  FindOperator,
-  In,
-  MoreThanOrEqual,
-  Not
-} from 'typeorm';
+import { LessThan, MoreThan, In, MoreThanOrEqual, Not } from 'typeorm';
 import * as fs from 'fs';
 import * as zlib from 'zlib';
 import axios, { AxiosResponse } from 'axios';

diff --git a/backend/src/tasks/test/cve.test.ts b/backend/src/tasks/test/cve.test.ts
@@ -7,6 +7,9 @@ import {
   Vulnerability
 } from '../../models';
 import * as nock from 'nock';
+import * as zlib from 'zlib';
+
+const unzipSyncSpy = jest.spyOn(zlib, 'unzipSync');
 
 jest.mock('child_process', () => ({
   spawnSync: () => null,
@@ -26,39 +29,6 @@ jest.mock('fs', () => ({
   }
 }));
 
-jest.mock('zlib', () => ({
-  unzipSync: (contents) =>
-    Buffer.from(
-      JSON.stringify({
-        CVE_Items: [
-          {
-            cve: {
-              CVE_data_meta: { ID: 'CVE-2019-10866' },
-              description: {
-                description_data: [
-                  {
-                    lang: 'en',
-                    value: 'Test description'
-                  }
-                ]
-              },
-              references: {
-                reference_data: [
-                  {
-                    url: 'https://example.com',
-                    name: 'https://example.com',
-                    refsource: 'CONFIRM',
-                    tags: ['Patch', 'Vendor Advisory']
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      })
-    )
-}));
-
 jest.setTimeout(30000);
 
 const RealDate = Date;
@@ -67,6 +37,37 @@ describe('cve', () => {
   let connection;
   beforeAll(async () => {
     connection = await connectToDatabase();
+    unzipSyncSpy.mockImplementation((contents) =>
+      Buffer.from(
+        JSON.stringify({
+          CVE_Items: [
+            {
+              cve: {
+                CVE_data_meta: { ID: 'CVE-2019-10866' },
+                description: {
+                  description_data: [
+                    {
+                      lang: 'en',
+                      value: 'Test description'
+                    }
+                  ]
+                },
+                references: {
+                  reference_data: [
+                    {
+                      url: 'https://example.com',
+                      name: 'https://example.com',
+                      refsource: 'CONFIRM',
+                      tags: ['Patch', 'Vendor Advisory']
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        })
+      )
+    );
   });
   beforeEach(() => {
     global.Date.now = jest.fn(() => new Date('2019-04-22T10:20:30Z').getTime());
@@ -76,6 +77,7 @@ describe('cve', () => {
     global.Date = RealDate;
   });
   afterAll(async () => {
+    unzipSyncSpy.mockRestore();
     await connection.close();
     nock.cleanAll();
   });