Feat: add python to auto detect for `--all-projects` #964

aviadhahami · 2020-01-22T14:53:53Z

Ready for review
Reviewed by Snyk internal team

What does this PR do?

Adding Pipfile and requirements.txt to auto-detection w/ --all-projects

Where should the reviewer start?

How should this be manually tested?

Any background context you want to provide?

What are the relevant tickets?

BST-1112

src/lib/find-files.ts

Pipfile

test/acceptance/cli-test/cli-test.all-projects.spec.ts

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

orsagie · 2020-01-23T14:09:53Z

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

@@ -145,8 +145,8 @@ export const AllProjectsTests: AcceptanceTests = {
        allProjects: true,


Add skipUnresolved: true here so we don't fail on python plugin

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

test/acceptance/cli-test/cli-test.all-projects.spec.ts

lili2311 · 2020-01-24T12:20:19Z

src/lib/detect.ts

@@ -41,6 +41,8 @@ export const AUTO_DETECTABLE_FILES: string[] = [
  'packages.config',
  'project.json',
  'project.assets.json',
+  'Pipfile',
+  'requirements.txt',


is there a test for requirements.txt? not sure we really need what do you think?

not atm as Pip doesnt pass

test/acceptance/cli-test/cli-test.all-projects.spec.ts

aviadhahami · 2020-01-23T13:00:20Z

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

+      // Python plugin (actually "custom-auto-detect" plugin) doesn't return
+      // "targetFile" prop as expected, so we picked it from another part of
+      // the req;
+      const {


This is a part of the hack we did in order to push the relevant target file
Should be removed once the pipfile issue is resolved

aviadhahami · 2020-01-23T13:14:54Z

test/acceptance/cli-test/cli-test.all-projects.spec.ts

+      // Forcing targetFile into the payload as the new plugin doesn't return
+      // it;
+      t.same(
+        {...pipAllProjectsBody}, // targetFile: pipAllProjectsBody.displayTargetFile},


Hack like in test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts#230

aviadhahami · 2020-01-23T13:17:11Z

test/acceptance/cli-test/cli-test.all-projects.spec.ts

+      // Forcing targetFile into the payload as the new plugin doesn't return
+      // it;
+      t.same(
+        { ...pipAllProjectsBody }, // targetFile: pipAllProjectsBody.displayTargetFile},


Hack like test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts#L230

aviadhahami · 2020-01-27T10:35:22Z

src/lib/detect.ts

@@ -41,6 +41,8 @@ export const AUTO_DETECTABLE_FILES: string[] = [
  'packages.config',
  'project.json',
  'project.assets.json',
+  'Pipfile',
+  'requirements.txt',


not atm as Pip doesnt pass

aviadhahami · 2020-01-27T10:35:57Z

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

      });
      t.ok(spyPlugin.withArgs('rubygems').calledOnce, 'calls rubygems plugin');
      t.ok(spyPlugin.withArgs('npm').calledOnce, 'calls npm plugin');
      t.ok(spyPlugin.withArgs('maven').calledOnce, 'calls maven plugin');
+      t.ok(spyPlugin.withArgs('pip').calledOnce, 'calls maven plugin');


text need to be changed to pip plugin

gitphill · 2020-01-28T10:59:02Z

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts

@@ -9,7 +9,7 @@ interface AcceptanceTests {
 }

 export const AllProjectsTests: AcceptanceTests = {
-  language: 'Mixed (Ruby & Npm & Maven)',
+  language: 'Mixed (Ruby & Npm & Maven & Pip)',


have just made this 'Mixed' on my go PR

dkontorovskyy

LGTM

src/lib/find-files.ts

dkontorovskyy · 2020-01-29T13:07:20Z

Not really sure if paket fixtures refactor should be in here

Adding support for Pipfile and requirements.txt with --all-projects. Refactoring tests as well as adding tests for Pipfile and requirements.txt.

snyksec · 2020-01-29T15:27:38Z

🎉 This PR is included in version 1.287.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

aviadhahami added the ⚠️ DO NOT MERGE ⚠️ label Jan 22, 2020

aviadhahami requested a review from a team as a code owner January 22, 2020 14:53

aviadhahami self-assigned this Jan 22, 2020

ghost requested review from dkontorovskyy and gitphill January 22, 2020 14:53

gitphill reviewed Jan 22, 2020

View reviewed changes

src/lib/find-files.ts Outdated Show resolved Hide resolved

gitphill reviewed Jan 22, 2020

View reviewed changes

Pipfile Outdated Show resolved Hide resolved

gitphill reviewed Jan 22, 2020

View reviewed changes

test/acceptance/cli-test/cli-test.all-projects.spec.ts Outdated Show resolved Hide resolved

lili2311 reviewed Jan 22, 2020

View reviewed changes

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts Outdated Show resolved Hide resolved

lili2311 changed the title ~~Feat/add python to auto detect~~ Feat: add python to auto detect for --all-projects Jan 23, 2020

aviadhahami force-pushed the feat/add-python-to-auto-detect branch 3 times, most recently from f6f0c6c to 4fe746c Compare January 23, 2020 13:16

orsagie reviewed Jan 23, 2020

View reviewed changes

lili2311 reviewed Jan 24, 2020

View reviewed changes

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts Outdated Show resolved Hide resolved

lili2311 reviewed Jan 24, 2020

View reviewed changes

test/acceptance/cli-monitor/cli-monitor.all-projects.spec.ts Outdated Show resolved Hide resolved

lili2311 reviewed Jan 24, 2020

View reviewed changes

test/acceptance/cli-test/cli-test.all-projects.spec.ts Outdated Show resolved Hide resolved

lili2311 reviewed Jan 24, 2020

View reviewed changes

orsagie force-pushed the feat/add-python-to-auto-detect branch 8 times, most recently from a9ab75d to 4fda770 Compare January 27, 2020 12:09

aviadhahami commented Jan 27, 2020

View reviewed changes

orsagie force-pushed the feat/add-python-to-auto-detect branch from 25ca6ea to 66dc964 Compare January 27, 2020 16:28

dkontorovskyy force-pushed the feat/add-python-to-auto-detect branch 2 times, most recently from d885688 to 7d7e02f Compare January 28, 2020 08:56

dkontorovskyy force-pushed the feat/add-python-to-auto-detect branch 8 times, most recently from 33965e1 to aff0972 Compare January 28, 2020 10:07

gitphill reviewed Jan 28, 2020

View reviewed changes

dkontorovskyy force-pushed the feat/add-python-to-auto-detect branch 4 times, most recently from a2d9682 to c004843 Compare January 28, 2020 12:28

gitphill force-pushed the feat/add-python-to-auto-detect branch from c004843 to 8e2702c Compare January 28, 2020 14:05

dkontorovskyy approved these changes Jan 28, 2020

View reviewed changes

aviadhahami removed the ⚠️ DO NOT MERGE ⚠️ label Jan 28, 2020

gitphill force-pushed the feat/add-python-to-auto-detect branch 3 times, most recently from 0291fb5 to c2ffa9b Compare January 29, 2020 13:04

dkontorovskyy reviewed Jan 29, 2020

View reviewed changes

src/lib/find-files.ts Show resolved Hide resolved

gitphill force-pushed the feat/add-python-to-auto-detect branch from c2ffa9b to 36d59cc Compare January 29, 2020 13:07

gitphill force-pushed the feat/add-python-to-auto-detect branch 2 times, most recently from acd0522 to bcb37cd Compare January 29, 2020 13:44

feat: add python to auto manifest discovery

e1651dd

Adding support for Pipfile and requirements.txt with --all-projects. Refactoring tests as well as adding tests for Pipfile and requirements.txt.

gitphill force-pushed the feat/add-python-to-auto-detect branch from bcb37cd to e1651dd Compare January 29, 2020 14:04

gitphill merged commit e08bc8f into master Jan 29, 2020

gitphill deleted the feat/add-python-to-auto-detect branch January 29, 2020 15:10

snyksec added the released label Jan 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: add python to auto detect for `--all-projects` #964

Feat: add python to auto detect for `--all-projects` #964

aviadhahami commented Jan 22, 2020 •

edited

Loading

orsagie Jan 23, 2020

lili2311 Jan 24, 2020 •

edited

Loading

aviadhahami Jan 27, 2020

aviadhahami Jan 23, 2020

aviadhahami Jan 23, 2020

aviadhahami Jan 23, 2020

aviadhahami Jan 27, 2020

aviadhahami Jan 27, 2020

gitphill Jan 28, 2020

dkontorovskyy left a comment •

edited

Loading

dkontorovskyy commented Jan 29, 2020

snyksec commented Jan 29, 2020

		@@ -145,8 +145,8 @@ export const AllProjectsTests: AcceptanceTests = {
		allProjects: true,

Feat: add python to auto detect for --all-projects #964

Feat: add python to auto detect for --all-projects #964

Conversation

aviadhahami commented Jan 22, 2020 • edited Loading

What does this PR do?

Where should the reviewer start?

How should this be manually tested?

Any background context you want to provide?

What are the relevant tickets?

Choose a reason for hiding this comment

lili2311 Jan 24, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dkontorovskyy left a comment • edited Loading

Choose a reason for hiding this comment

dkontorovskyy commented Jan 29, 2020

snyksec commented Jan 29, 2020

Feat: add python to auto detect for `--all-projects` #964

Feat: add python to auto detect for `--all-projects` #964

aviadhahami commented Jan 22, 2020 •

edited

Loading

lili2311 Jan 24, 2020 •

edited

Loading

dkontorovskyy left a comment •

edited

Loading