Merge pull request #964 from snyk/feat/add-python-to-auto-detect

Feat: add python to auto detect for `--all-projects`
snyk · Jan 29, 2020 · e08bc8f · e08bc8f
2 parents c52e45a + e1651dd
commit e08bc8f
Show file tree

Hide file tree

Showing 9 changed files with 578 additions and 190 deletions.
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
@@ -48,6 +48,8 @@ export const AUTO_DETECTABLE_FILES: string[] = [
   'Gopkg.lock',
   'go.mod',
   'vendor.json',
+  'Pipfile',
+  'requirements.txt',
 ];
 
 // when file is specified with --file, we look it up here

diff --git a/src/lib/find-files.ts b/src/lib/find-files.ts
@@ -2,6 +2,9 @@ import * as fs from 'fs';
 import * as pathLib from 'path';
 import * as _ from 'lodash';
 import { detectPackageManagerFromFile } from './detect';
+import * as debugModule from 'debug';
+const debug = debugModule('snyk');
+
 // TODO: use util.promisify once we move to node 8
 
 /**
@@ -180,25 +183,44 @@ function chooseBestManifest(
         ['package-lock.json', 'yarn.lock'].includes(path.base),
       )[0];
       if (lockFile) {
+        debug(
+          'Encountered multiple npm manifest files, defaulting to package-lock.json / yarn.lock',
+        );
         return lockFile.path;
       }
       const packageJson = files.filter((path) =>
         ['package.json'].includes(path.base),
       )[0];
+      debug(
+        'Encountered multiple npm manifest files, defaulting to package.json',
+      );
       return packageJson.path;
     }
     case 'rubygems': {
+      debug(
+        'Encountered multiple gem manifest files, defaulting to Gemfile.lock',
+      );
       const defaultManifest = files.filter((path) =>
         ['Gemfile.lock'].includes(path.base),
       )[0];
       return defaultManifest.path;
     }
     case 'cocoapods': {
+      debug(
+        'Encountered multiple cocoapod manifest files, defaulting to Podfile',
+      );
       const defaultManifest = files.filter((path) =>
         ['Podfile'].includes(path.base),
       )[0];
       return defaultManifest.path;
     }
+    case 'pip': {
+      debug('Encountered multiple pip manifest files, defaulting to Pipfile');
+      const defaultManifest = files.filter((path) =>
+        ['Pipfile'].includes(path.base),
+      )[0];
+      return defaultManifest.path;
+    }
     default: {
       return null;
     }