feat: accept and forward OS Release name and version

- the return format from the analyzer has changed
- not marking these changes as breaking as we're not stable yet
  and the API/contracts are not formalised

Author: darscan

lib/index.js

@@ -68,7 +68,7 @@ function getDependencies(analyzerBinaryPath, targetImage) {
   )
   .then(function (output) {
     scanResults = JSON.parse(output);
-    return Promise.resolve(convertDependecies(targetImage, scanResults));
+    return convertDependecies(targetImage, scanResults);
   })
   .catch(function (error) {
     if (typeof error === 'string') {
@@ -87,32 +87,32 @@ function getDependencies(analyzerBinaryPath, targetImage) {
 }
 
 function convertDependecies(targetImage, scanResults) {
-  targetSplit = targetImage.split(':');
-  imageName = targetSplit[0];
-  imageVersion = targetSplit[1];
-  imageVersion = (imageVersion ? imageVersion : 'lateset');
+  var targetSplit = targetImage.split(':');
+  var imageName = targetSplit[0];
+  var imageVersion = targetSplit[1] ? targetSplit[1] : 'latest';
 
-  root = {};
-  root.name = imageName;
-  root.version = imageVersion;
-
-  var scanResult = scanResults.filter(function (res) {
+  var analysisResults = scanResults.results.filter(function (res) {
     return res.Analysis && res.Analysis.length > 0;
   })[0];
 
   var pkgType;
-  switch (scanResult.AnalyzeType) {
+  switch (analysisResults.AnalyzeType) {
     case 'Apt': {
       pkgType = 'deb';
       break;
     }
     default: {
-      pkgType = scanResult.AnalyzeType.toLowerCase()
+      pkgType = analysisResults.AnalyzeType.toLowerCase()
     }
   }
-  root.packageFormatVersion = pkgType + ':0.0.1';
-
-  pkgs = scanResult['Analysis']
+  var root = {
+    name: imageName,
+    version: imageVersion,
+    dockerOSRelease: scanResults.osRelease,
+    packageFormatVersion: pkgType + ':0.0.1',
+  };
+
+  var pkgs = analysisResults['Analysis'];
 
   root.dependencies = pkgs.reduce(function (acc, pkg) {
     name = pkg['Name'];

package.json

@@ -13,7 +13,7 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "snyk-docker-analyzer": {
-    "version": "1.0.6"
+    "version": "1.1.0"
   },
   "author": "snyk.io",
   "license": "Apache-2.0",