Merge pull request #34 from snyk-tech-services/develop

release
snyk-labs · May 6, 2021 · cc47289 · cc47289
2 parents 013440c + 12df192
commit cc47289
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,6 @@
   ],
   "homepage": "https://github.com/snyk-tech-services/snyk-api-ts-client#readme",
   "dependencies": {
-    "@manifoldco/swagger-to-ts": "^2.0.0",
     "@snyk/configstore": "^3.2.0-rc1",
     "@snyk/dep-graph": "^1.23.0",
     "@types/lodash": "^4.14.155",
@@ -64,6 +63,7 @@
     "utility-types": "^3.10.0"
   },
   "devDependencies": {
+    "@manifoldco/swagger-to-ts": "^2.0.0",
     "@types/jest": "^25.1.1",
     "@types/lodash": "^4.14.149",
     "@types/node": "^12.12.26",
@@ -80,6 +80,7 @@
     "ts-jest": "^25.1.0",
     "ts-node": "8.6.2",
     "tsc-watch": "^4.1.0",
+    "typedoc": "^0.20.29",
     "typescript": "^3.7.5"
   },
   "pkg": {

diff --git a/src/lib/client/abstraction/org/aggregatedissues.ts b/src/lib/client/abstraction/org/aggregatedissues.ts
@@ -3,7 +3,7 @@ import { createFromJSON, DepGraph, DepGraphData } from '@snyk/dep-graph';
 
 interface IssuesWithVulnsPaths {
   issues: {
-    pkgVersions: { [key: string]: Array<Array<string>> };
+    pkgVersionsWithPaths: { [key: string]: Array<Array<string>> }[];
   }[];
 }
 
@@ -31,28 +31,26 @@ export const getAggregatedIssuesWithVulnPaths = async (
     issues: [],
   };
 
-  // @ts-ignore
-  projectAggregatedIssues.issues.map((issue) => {
-    // @ts-ignore
-    const versionsWithVulnPaths = issue.pkgVersions.map((version) => {
+  projectAggregatedIssues?.issues?.map((issue) => {
+    const returnVulnPathsData = issue.pkgVersions.map((version) => {
       const pkg = {
         name: issue.pkgName,
         version: version as string,
       };
-      const returnData = {
+      return {
         [`${pkg.version}`]: getVulnPathsForPkgVersionFromGraph(
           pkg.name,
           pkg.version,
           depGraph,
         ),
       };
-      return returnData;
     });
 
-    const newIssue = {
+    let newIssue = {
+      pkgVersionsWithPaths: returnVulnPathsData,
       ...issue,
     };
-    newIssue.pkgVersions = versionsWithVulnPaths;
+
     returnData.issues.push(newIssue);
   });
 

diff --git a/src/lib/generators/generate.ts b/src/lib/generators/generate.ts
@@ -179,8 +179,16 @@ const generateResponseInterfaces = (
     const methodsArray = classToGenerateResponseInterfacesFor.methods;
 
     methodsArray.forEach((method) => {
-      if (!_.isEmpty(method.response) && !codeToReturn.includes(`${
-        utils.formatClassName(classToGenerateResponseInterfacesFor.name) +_.capitalize(method.verb) + 'ResponseType'}`)) {
+      if (
+        !_.isEmpty(method.response) &&
+        !codeToReturn.includes(
+          `${
+            utils.formatClassName(classToGenerateResponseInterfacesFor.name) +
+            _.capitalize(method.verb) +
+            'ResponseType'
+          }`,
+        )
+      ) {
         switch (method.response?.type) {
           case 'custom':
             // codeToReturn += `export interface ${

diff --git a/test/abstraction/org/aggregatedissues.test.ts b/test/abstraction/org/aggregatedissues.test.ts
@@ -38,6 +38,8 @@ describe('Testing org abstraction ', () => {
     const result = await new Org({ orgId: '123' })
       .project({ projectId: '123' })
       .aggregatedissues.getAggregatedIssuesWithVulnPaths(body);
+
+    console.log(result);
     expect(
       _.isEqual(
         result,

diff --git a/test/fixtures/abstraction/org/aggregatedIssuesWithVulnPaths-goof.json b/test/fixtures/abstraction/org/aggregatedIssuesWithVulnPaths-goof.json
@@ -4,7 +4,8 @@
         "id": "SNYK-JS-EXPRESSFILEUPLOAD-473997",
         "issueType": "vuln",
         "pkgName": "express-fileupload",
-        "pkgVersions": [{ "0.0.5": [["[email protected]"]] }],
+        "pkgVersions": ["0.0.5"],
+        "pkgVersionsWithPaths": [{ "0.0.5": [["[email protected]"]] }],
         "priorityScore": 704,
         "priority": {
           "score": 704,
@@ -49,7 +50,8 @@
         "id": "SNYK-JS-EXPRESSFILEUPLOAD-595969",
         "issueType": "vuln",
         "pkgName": "express-fileupload",
-        "pkgVersions": [{ "0.0.5": [["[email protected]"]] }],
+        "pkgVersions": ["0.0.5"],
+        "pkgVersionsWithPaths": [{ "0.0.5": [["[email protected]"]] }],
         "priorityScore": 696,
         "priority": {
           "score": 696,
@@ -97,7 +99,8 @@
         "id": "SNYK-JS-TREEKILL-536781",
         "issueType": "vuln",
         "pkgName": "tree-kill",
-        "pkgVersions": [
+        "pkgVersions": ["1.2.1"],
+        "pkgVersionsWithPaths": [
           {
             "1.2.1": [
               ["[email protected]", "[email protected]", "[email protected]"]
@@ -161,7 +164,8 @@
         "id": "SNYK-JS-LODASH-567746",
         "issueType": "vuln",
         "pkgName": "lodash",
-        "pkgVersions": [
+        "pkgVersions": ["4.17.15"],
+        "pkgVersionsWithPaths": [
           {
             "4.17.15": [
               ["[email protected]", "[email protected]"],
@@ -266,7 +270,8 @@
         "id": "SNYK-JS-HTTPSPROXYAGENT-469131",
         "issueType": "vuln",
         "pkgName": "https-proxy-agent",
-        "pkgVersions": [
+        "pkgVersions": ["2.2.2"],
+        "pkgVersionsWithPaths": [
           {
             "2.2.2": [
               ["[email protected]", "[email protected]", "[email protected]"],
@@ -341,7 +346,8 @@
         "id": "snyk:lic:npm:goof:GPL-2.0",
         "issueType": "license",
         "pkgName": "goof",
-        "pkgVersions": [{ "0.0.3": [[]] }],
+        "pkgVersions": ["0.0.3"],
+        "pkgVersionsWithPaths": [{ "0.0.3": [[]] }],
         "priorityScore": 625,
         "priority": {
           "score": 625,
@@ -376,7 +382,8 @@
         "id": "SNYK-JS-LODASH-590103",
         "issueType": "vuln",
         "pkgName": "lodash",
-        "pkgVersions": [
+        "pkgVersions": ["4.17.15"],
+        "pkgVersionsWithPaths": [
           {
             "4.17.15": [
               ["[email protected]", "[email protected]"],
@@ -459,7 +466,8 @@
         "id": "SNYK-JS-Y18N-1021887",
         "issueType": "vuln",
         "pkgName": "y18n",
-        "pkgVersions": [
+        "pkgVersions": ["3.2.1"],
+        "pkgVersionsWithPaths": [
           {
             "3.2.1": [
               [
@@ -516,7 +524,8 @@
         "id": "SNYK-JS-LODASH-608086",
         "issueType": "vuln",
         "pkgName": "lodash",
-        "pkgVersions": [
+        "pkgVersions": ["4.17.15"],
+        "pkgVersionsWithPaths": [
           {
             "4.17.15": [
               ["[email protected]", "[email protected]"],
@@ -605,7 +614,8 @@
         "id": "SNYK-JS-INI-1048974",
         "issueType": "vuln",
         "pkgName": "ini",
-        "pkgVersions": [
+        "pkgVersions": ["1.3.5"],
+        "pkgVersionsWithPaths": [
           {
             "1.3.5": [
               ["[email protected]", "[email protected]"],
@@ -688,7 +698,8 @@
         "id": "SNYK-JS-DOTPROP-543489",
         "issueType": "vuln",
         "pkgName": "dot-prop",
-        "pkgVersions": [
+        "pkgVersions": ["4.2.0"],
+        "pkgVersionsWithPaths": [
           {
             "4.2.0": [
               ["[email protected]", "[email protected]", "[email protected]"],
@@ -743,7 +754,8 @@
         "id": "npm:ejs:20161128",
         "issueType": "vuln",
         "pkgName": "ejs",
-        "pkgVersions": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
+        "pkgVersions": ["0.8.8"],
+        "pkgVersionsWithPaths": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
         "priorityScore": 405,
         "priority": {
           "score": 405,
@@ -794,7 +806,8 @@
         "id": "SNYK-JS-MINIMIST-559764",
         "issueType": "vuln",
         "pkgName": "minimist",
-        "pkgVersions": [
+        "pkgVersions": ["1.2.0", "0.0.8", "0.0.10"],
+        "pkgVersionsWithPaths": [
           {
             "1.2.0": [
               [
@@ -867,7 +880,8 @@
         "id": "SNYK-JS-BL-608877",
         "issueType": "vuln",
         "pkgName": "bl",
-        "pkgVersions": [{ "1.2.2": [["[email protected]", "[email protected]"]] }],
+        "pkgVersions": ["1.2.2"],
+        "pkgVersionsWithPaths": [{ "1.2.2": [["[email protected]", "[email protected]"]] }],
         "priorityScore": 385,
         "priority": {
           "score": 385,
@@ -916,7 +930,8 @@
         "id": "SNYK-JS-EJS-1049328",
         "issueType": "vuln",
         "pkgName": "ejs",
-        "pkgVersions": [
+        "pkgVersions": ["0.8.8", "2.5.5"],
+        "pkgVersionsWithPaths": [
           { "0.8.8": [["[email protected]", "[email protected]"]] },
           { "2.5.5": [["[email protected]"]] }
         ],
@@ -963,7 +978,8 @@
         "id": "SNYK-JS-ACORN-559469",
         "issueType": "vuln",
         "pkgName": "acorn",
-        "pkgVersions": [
+        "pkgVersions": ["5.7.3"],
+        "pkgVersionsWithPaths": [
           { "5.7.3": [["@snyk/[email protected]", "[email protected]"]] }
         ],
         "priorityScore": 375,
@@ -1009,7 +1025,8 @@
         "id": "npm:ejs:20161130-1",
         "issueType": "vuln",
         "pkgName": "ejs",
-        "pkgVersions": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
+        "pkgVersions": ["0.8.8"],
+        "pkgVersionsWithPaths": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
         "priorityScore": 295,
         "priority": {
           "score": 295,
@@ -1050,7 +1067,8 @@
         "id": "npm:ejs:20161130",
         "issueType": "vuln",
         "pkgName": "ejs",
-        "pkgVersions": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
+        "pkgVersions": ["0.8.8"],
+        "pkgVersionsWithPaths": [{ "0.8.8": [["[email protected]", "[email protected]"]] }],
         "priorityScore": 295,
         "priority": {
           "score": 295,