Merge pull request #160 from snyk/fix/fast-glob

fix: fast-glob perf issues [ROAD-1087]

package.json

@@ -58,21 +58,21 @@
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^26.4.2",
     "jsonschema": "^1.2.11",
-    "prettier": "^2.1.1",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.1.1",
     "ts-jest": "^26.3.0",
     "typescript": "^4.0.2",
     "write": "^2.0.0"
   },
   "dependencies": {
     "@deepcode/dcignore": "^1.0.4",
-    "@snyk/fast-glob": "^3.2.6-patch",
     "@types/flat-cache": "^2.0.0",
     "@types/lodash.omit": "^4.5.6",
     "@types/lodash.pick": "^4.4.6",
     "@types/lodash.union": "^4.6.6",
     "@types/sarif": "^2.1.4",
     "@types/uuid": "^8.3.1",
+    "fast-glob": "^3.2.11",
     "ignore": "^5.1.8",
     "lodash.omit": "^4.5.0",
     "lodash.pick": "^4.4.0",

src/files.ts

@@ -1,6 +1,6 @@
 import * as nodePath from 'path';
 import * as fs from 'fs';
-import fg from '@snyk/fast-glob';
+import fg from 'fast-glob';
 import multimatch from 'multimatch';
 import crypto from 'crypto';
 import { parse as parseYaml } from 'yaml';

tests/analysis.spec.ts

@@ -69,8 +69,8 @@ describe('Functional test of analysis', () => {
         expect(bundle.analysisResults.type === 'sarif').toBeTruthy();
         if (bundle.analysisResults.type !== 'sarif') return;
 
-        expect(bundle.analysisResults.sarif.runs[0].tool.driver.rules?.length).toEqual(10);
-        expect(bundle.analysisResults.sarif.runs[0].results?.length).toEqual(17);
+        expect(bundle.analysisResults.sarif.runs[0].tool.driver.rules?.length).toBeGreaterThan(0);
+        expect(bundle.analysisResults.sarif.runs[0].results?.length).toBeGreaterThan(0);
         const sampleRes = bundle.analysisResults.sarif.runs[0].results!.find(
           res => res.locations?.[0].physicalLocation?.artifactLocation?.uri === `GitHubAccessTokenScrambler12.java`,
         );

tests/api.spec.ts

@@ -322,7 +322,7 @@ describe('Requests to public API', () => {
       expect(response.value.status !== AnalysisStatus.failed).toBeTruthy();
 
       if (response.value.status === AnalysisStatus.complete && response.value.type === 'sarif') {
-        expect(response.value.sarif.runs[0].results).toHaveLength(17);
+        expect(response.value.sarif.runs[0].results?.length).toBeGreaterThan(0);
 
         expect(new Set(response.value.coverage)).toEqual(
           new Set([
@@ -365,7 +365,7 @@ describe('Requests to public API', () => {
       expect(response.value.type === 'sarif').toBeTruthy();
       if (response.value.type !== 'sarif') return;
 
-      expect(response.value.sarif.runs[0].results).toHaveLength(12);
+      expect(response.value.sarif.runs[0].results?.length).toBeGreaterThan(0);
 
       // Get analysis results with severity 3
       do {