fix: make sure that name is always passed #25
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
odinn1984
force-pushed
the
fix/no_project_name
branch
8 times, most recently
from
f62976d
to
e259652
Compare
michael-go
reviewed
May 9, 2018
test/inspect.test.js
Outdated
| t.test('make sure project name is no-name', function (t) { | ||
| t.deepEqual( | ||
| result.package.name, | ||
| 'snyk-php-plugin' |
There was a problem hiding this comment.
how does this pass? shouldn't it be 'no_project_name' ?
There was a problem hiding this comment.
the cwd is the directory where the process is ran from (we run tap from the main project dir)
lib/composer.js
Outdated
| @@ -100,6 +99,10 @@ function generateJsonReport( | |||
| return data; | |||
| } | |||
|
|
|||
| function getDefaultProjectName() { | |||
| return process.cwd().split(path.sep).pop(); | |||
There was a problem hiding this comment.
this should use also uses the root parameter passed to inspect(), as it's relative to the cwd
odinn1984
force-pushed
the
fix/no_project_name
branch
from
e259652
to
939ef49
Compare
michael-go
reviewed
May 9, 2018
lib/composer.js
Outdated
| @@ -100,6 +101,10 @@ function generateJsonReport( | |||
| return data; | |||
| } | |||
|
|
|||
| function getDefaultProjectName(manifestPath) { | |||
| return path.dirname(manifestPath).split(path.sep).pop(); | |||
There was a problem hiding this comment.
you should use path.resolve (here or above) so that you get the full path, otherwise if user runs snyk test inside the php project, this code will result in the name '.'
lib/composer.js
Outdated
| @@ -75,10 +75,11 @@ function buildDependencies( | |||
| } | |||
|
|
|||
| function generateJsonReport( | |||
| fileName, composerJsonObj, composerLockObj, systemVersions) { | |||
| fileName, composerJsonObj, composerLockObj, systemVersions, basePath) { | |||
There was a problem hiding this comment.
would pass the basePath as first param, just before fileName
odinn1984
force-pushed
the
fix/no_project_name
branch
from
939ef49
to
10ad625
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we can't get a project name from the lock file we pass the directory where the project file is as the project name.