feat: send the go runtime version in the metadata

snyk · Sep 12, 2017 · 8a2a2b6 · 8a2a2b6
1 parent 8d4449d
commit 8a2a2b6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -9,12 +9,23 @@ module.exports = {
 };
 
 function inspect(root, targetFile, options) {
-  if (!options) { options = { dev: false }; }
+  return Promise.all([
+    getMetaData(root),
+    getDependencies(root, targetFile),
+  ])
+  .then(function (result) {
+    return {
+      plugin: result[0],
+      package: result[1],
+    };
+  });
+}
 
+function getDependencies(root, targetFile) {
   var depLocks;
   return new Promise(function (resolve, reject) {
     try {
-      depLocks = parseDepLock(root, targetFile, options);
+      depLocks = parseDepLock(root, targetFile);
       resolve(depLocks);
     } catch (e) {
       reject(new Error('failed parsing Gopkg.lock file: ' + e.message));
@@ -34,13 +45,7 @@ function inspect(root, targetFile, options) {
     var pkgsTree = recursivelyBuildPkgTree(tree, depLocks, projectRootPath, []);
     pkgsTree.packageFormatVersion = 'golang:0.0.1';
 
-    return {
-      plugin: {
-        name: 'snyk-go-plugin',
-        // TODO: engine: `go version`
-      },
-      package: pkgsTree,
-    }
+    return pkgsTree;
   }).catch(function (error) {
     if (typeof error === 'string') {
       if (error.indexOf('Unresolved packages:') !== -1) {
@@ -52,6 +57,16 @@ function inspect(root, targetFile, options) {
   });
 }
 
+function getMetaData(root) {
+  return subProcess.execute('go', ['version'], {cwd: root})
+  .then(function (output) {
+    return {
+      name: 'snyk-go-plugin',
+      runtime: /(go\d+\.\d+\.\d+)/.exec(output)[0],
+    };
+  });
+}
+
 function isRootSubpkg(pkgPath, projectRootPath) {
   if (pkgPath == projectRootPath) {
     return true;
@@ -104,7 +119,7 @@ function recursivelyBuildPkgTree(goDepsTree, depLocks, projectRootPath, fromPath
   return pkg;
 }
 
-function parseDepLock(root, targetFile, options) {
+function parseDepLock(root, targetFile) {
   var lock = fs.readFileSync(path.join(root, targetFile));
 
   // TODO: handle parse error

diff --git a/test/inspect.test.js b/test/inspect.test.js
@@ -15,6 +15,7 @@ test('happy inspect', function (t) {
       t.test('plugin', function (t) {
         t.ok(plugin, 'plugin');
         t.equal(plugin.name, 'snyk-go-plugin', 'name');
+        t.match(plugin.runtime, /^go\d+/, 'engine');
         t.end();
       });
 
@@ -81,6 +82,7 @@ test('pkg with local import', function (t) {
       t.test('plugin', function (t) {
         t.ok(plugin, 'plugin');
         t.equal(plugin.name, 'snyk-go-plugin', 'name');
+        t.match(plugin.runtime, /^go\d+/, 'engine');
         t.end();
       });
 
@@ -163,6 +165,7 @@ test('pkg without external deps', function (t) {
       t.test('plugin', function (t) {
         t.ok(plugin, 'plugin');
         t.equal(plugin.name, 'snyk-go-plugin', 'name');
+        t.match(plugin.runtime, /^go\d+/, 'engine');
         t.end();
       });
 
@@ -188,4 +191,4 @@ function chdirToPkg(pkgPathArray) {
       [__dirname, 'fixtures', 'gopath', 'src'].concat(pkgPathArray)
     )
   );
-}
+}