Merge pull request #8 from snyk/fix/update-analyzer-to-collect-rpm-full-versions

fix: update analyzer to collect full rpm versions

Author: michael-go

lib/index.js

@@ -41,7 +41,6 @@ function getMetaData() {
 }
 
 function getDependencies(analyzerBinaryPath, targetImage) {
-  console.log(`analyzing ${targetImage} Docker image`);
   return subProcess.execute(
     analyzerBinaryPath,
     buildArgs(targetImage)

package.json

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

test/manual.js

@@ -1,9 +1,9 @@
 var plugin = require('../lib');
 
 function main() {
-  var targetFile = process.argv[2];
+  var targetImage = process.argv[2];
 
-  plugin.inspect('.', targetFile).then(function (result) {
+  plugin.inspect(targetImage).then(function (result) {
     console.log(JSON.stringify(result, null, 2));
   }).catch(function (error) {
     console.log('Error:', error.stack);

test/system.test.js

@@ -197,26 +197,26 @@ test('inspect centos', function (t) {
       t.match(deps, {
         'openssl-libs': {
           name: 'openssl-libs',
-          version: '1.0.2k',
+          version: '1:1.0.2k-8.el7',
           from: [
             imgName + '@' + imgTag,
-            '[email protected]',
+            'openssl-libs@1:1.0.2k-8.el7',
           ],
         },
         passwd: {
           name: 'passwd',
-          version: '0.79',
+          version: '0.79-4.el7',
         },
         systemd: {
           name: 'systemd',
-          version: '219',
+          version: '219-42.el7',
         },
         dracut: {
           name: 'dracut',
-          version: '033', // TODO: what is this weird version
+          version: '033-502.el7', // TODO: make sure we handle this well
         },
         iputils: {
-          version: '20160308',
+          version: '20160308-10.el7',
         },
       }, 'deps');
     });