Merge pull request #156 from snyk/feat/pass-gradle-util-to-call-graph…

…-builder feat: pass gradle util to java call graph builder
snyk · Dec 10, 2020 · 546029e · 546029e
2 parents cc4489d + 61805d6
commit 546029e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -113,9 +113,11 @@ export async function inspect(
   let callGraph: CallGraph | undefined;
   const targetPath = path.join(root, targetFile);
   if (options.reachableVulns) {
+    const command = getCommand(root, targetFile);
     debugLog(`getting call graph from path ${targetPath}`);
     callGraph = await javaCallGraphBuilder.getCallGraphGradle(
       path.dirname(targetPath),
+      command,
     );
     debugLog('got call graph successfully');
   }

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   "dependencies": {
     "@snyk/cli-interface": "2.9.1",
     "@snyk/dep-graph": "^1.19.4",
-    "@snyk/java-call-graph-builder": "1.16.2",
+    "@snyk/java-call-graph-builder": "1.18.0",
     "@types/debug": "^4.1.4",
     "chalk": "^3.0.0",
     "debug": "^4.1.1",

diff --git a/test/system/plugin.test.ts b/test/system/plugin.test.ts
@@ -49,7 +49,10 @@ test('run inspect() with reachableVulns', async (t) => {
   );
   t.ok(javaCallGraphBuilderStub.calledOnce, 'called to the call graph builder');
   t.ok(
-    javaCallGraphBuilderStub.calledWith(path.join('.', rootNoWrapper)),
+    javaCallGraphBuilderStub.calledWith(
+      path.join('.', rootNoWrapper),
+      'gradle',
+    ),
     'call graph builder was called with the correct path',
   );
   t.same(gradleCallGraph, result.callGraph, 'returns expected callgraph');