Skip to content

Commit

Permalink
Merge pull request #15 from snyk/fix/empty-string-for-project-version
Browse files Browse the repository at this point in the history 
fix: instead of 0.0.0 set root version to ''
  • Loading branch information
@michael-go
michael-go authored Dec 11, 2017
2 parents fd57bb8 + a1af9a0 commit c05984c
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion lib/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function recursivelyBuildPkgTree(
}

if (isRoot || isProjSubpkg) {
pkg.version = '0.0.0';
pkg.version = '';
} else if (!lockedVersions[pkg.name]) {
pkg.version = '';
// TODO: warn or set to "?" ?
Expand Down
58 changes: 29 additions & 29 deletions test/inspect.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ test('happy inspect', function (t) {
t.test('root pkg', function (t) {
t.match(pkg, {
name: 'path/to/pkg',
version: '0.0.0',
from: ['path/to/pkg@0.0.0'],
version: '',
from: ['path/to/pkg@'],
packageFormatVersion: 'golang:0.0.1',
}, 'root pkg')
t.end();
Expand All @@ -44,7 +44,7 @@ test('happy inspect', function (t) {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
},
},
from: ['path/to/pkg@0.0.0', 'gitpub.com/food/salad@v1.3.7'],
from: ['path/to/pkg@', 'gitpub.com/food/salad@v1.3.7'],
}, 'salad depends on tomato and cucamba');

t.match(deps['gitpub.com/meal/dinner'], {
Expand All @@ -56,7 +56,7 @@ test('happy inspect', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/pkg@0.0.0',
'path/to/pkg@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down Expand Up @@ -89,7 +89,7 @@ test('pkg with local import', function (t) {

t.test('dependencies', function (t) {
t.match(pkg, {
version: '0.0.0',
version: '',
dependencies: {
'gitpub.com/meal/dinner': {
version: 'v0.0.7',
Expand All @@ -100,7 +100,7 @@ test('pkg with local import', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/pkg-with-local-import@0.0.0',
'path/to/pkg-with-local-import@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down Expand Up @@ -135,7 +135,7 @@ test('pkg with internal subpkg', function (t) {

t.test('dependencies', function (t) {
t.match(pkg, {
version: '0.0.0',
version: '',
dependencies: {
'gitpub.com/meal/dinner': {
version: 'v0.0.7',
Expand All @@ -146,7 +146,7 @@ test('pkg with internal subpkg', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/pkg-with-internal-subpkg@0.0.0',
'path/to/pkg-with-internal-subpkg@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down Expand Up @@ -183,8 +183,8 @@ test('multi-root project', function (t) {
t.test('root pkg', function (t) {
t.match(pkg, {
name: 'path/to/multiroot-pkg',
version: '0.0.0',
from: ['path/to/multiroot-pkg@0.0.0'],
version: '',
from: ['path/to/multiroot-pkg@'],
packageFormatVersion: 'golang:0.0.1',
}, 'root pkg')
t.end();
Expand All @@ -204,7 +204,7 @@ test('multi-root project', function (t) {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
},
},
from: ['path/to/multiroot-pkg@0.0.0', 'gitpub.com/food/salad@v1.3.7'],
from: ['path/to/multiroot-pkg@', 'gitpub.com/food/salad@v1.3.7'],
}, 'salad depends on tomato and cucamba');

t.match(deps['gitpub.com/meal/dinner'], {
Expand All @@ -216,7 +216,7 @@ test('multi-root project', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/multiroot-pkg@0.0.0',
'path/to/multiroot-pkg@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down Expand Up @@ -276,8 +276,8 @@ test('multi-root project without code at root', function (t) {
t.test('root pkg', function (t) {
t.match(pkg, {
name: 'path/to/multiroot-pkg-without-root',
version: '0.0.0',
from: ['path/to/multiroot-pkg-without-root@0.0.0'],
version: '',
from: ['path/to/multiroot-pkg-without-root@'],
packageFormatVersion: 'golang:0.0.1',
}, 'root pkg')
t.end();
Expand All @@ -298,7 +298,7 @@ test('multi-root project without code at root', function (t) {
},
},
from: [
'path/to/multiroot-pkg-without-root@0.0.0',
'path/to/multiroot-pkg-without-root@',
'gitpub.com/food/salad@v1.3.7',
],
}, 'salad depends on tomato and cucamba');
Expand All @@ -312,7 +312,7 @@ test('multi-root project without code at root', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/multiroot-pkg-without-root@0.0.0',
'path/to/multiroot-pkg-without-root@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand All @@ -327,7 +327,7 @@ test('multi-root project without code at root', function (t) {
version: 'v0.0.7',
dependencies: {},
from: [
'path/to/multiroot-pkg-without-root@0.0.0',
'path/to/multiroot-pkg-without-root@',
'gitpub.com/meal/dinner/desert@v0.0.7',
],
}, 'dinner/desert is a direct dependency');
Expand Down Expand Up @@ -381,8 +381,8 @@ test('no Go code', function (t) {
t.same(pkg, {
name: 'path/to/empty',
dependencies: {},
version: '0.0.0',
from: ['path/to/empty@0.0.0'],
version: '',
from: ['path/to/empty@'],
packageFormatVersion: 'golang:0.0.1',
}, 'root pkg')
t.end();
Expand Down Expand Up @@ -515,8 +515,8 @@ test('pkg without external deps', function (t) {
t.test('pkg', function (t) {
t.same(pkg, {
name: 'path/to/pkg-without-deps',
version: '0.0.0',
from: ['path/to/pkg-without-deps@0.0.0'],
version: '',
from: ['path/to/pkg-without-deps@'],
packageFormatVersion: 'golang:0.0.1',
dependencies: {},
});
Expand Down Expand Up @@ -544,8 +544,8 @@ test('happy inspect govendor', function (t) {
t.test('root pkg', function (t) {
t.match(pkg, {
name: 'path/to/pkg',
version: '0.0.0',
from: ['path/to/pkg@0.0.0'],
version: '',
from: ['path/to/pkg@'],
packageFormatVersion: 'golang:0.0.1',
}, 'root pkg');
t.end();
Expand All @@ -565,7 +565,7 @@ test('happy inspect govendor', function (t) {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
},
},
from: ['path/to/pkg@0.0.0', 'gitpub.com/food/salad@v1.3.7'],
from: ['path/to/pkg@', 'gitpub.com/food/salad@v1.3.7'],
}, 'salad depends on tomato and cucamba');

t.match(deps['gitpub.com/meal/dinner'], {
Expand All @@ -577,7 +577,7 @@ test('happy inspect govendor', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/pkg@0.0.0',
'path/to/pkg@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down Expand Up @@ -612,8 +612,8 @@ test('inspect govendor with alternate case', function (t) {
t.test('root pkg', function (t) {
t.match(pkg, {
name: 'path/to/pkg-with-alternate-govendor',
version: '0.0.0',
from: ['path/to/pkg-with-alternate-govendor@0.0.0'],
version: '',
from: ['path/to/pkg-with-alternate-govendor@'],
packageFormatVersion: 'golang:0.0.1',
dependencies: {
'gitpub.com/drink/juice': {
Expand All @@ -639,7 +639,7 @@ test('inspect govendor with alternate case', function (t) {
},
},
from: [
'path/to/pkg-with-alternate-govendor@0.0.0',
'path/to/pkg-with-alternate-govendor@',
'gitpub.com/food/salad@v1.3.7',],
}, 'salad depends on tomato and cucamba');

Expand All @@ -652,7 +652,7 @@ test('inspect govendor with alternate case', function (t) {
'gitpub.com/nature/vegetables/tomato': {
version: '#b6ffb7d62206806b573348160795ea16a00940a6',
from: [
'path/to/pkg-with-alternate-govendor@0.0.0',
'path/to/pkg-with-alternate-govendor@',
'gitpub.com/meal/dinner@v0.0.7',
'gitpub.com/food/salad@v1.3.7',
'gitpub.com/nature/vegetables/tomato@#b6ffb7d62206806b573348160795ea16a00940a6', // jscs:ignore maximumLineLength
Expand Down
2 changes: 1 addition & 1 deletion ...em/fixtures/gopath/src/github.com/prometheus/prometheus-cmd-prometheus-expected-list.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"github.com/prometheus/common/route@#9e0844febd9e2856f839c9cb974fbd676d1755a8",
"github.com/prometheus/common/version@#9e0844febd9e2856f839c9cb974fbd676d1755a8",
"github.com/prometheus/procfs@#abf152e5f3e97f2fafac028d2cc06c1feb87ffa5",
"github.com/prometheus/prometheus/cmd/prometheus@0.0.0",
"github.com/prometheus/prometheus/cmd/prometheus@",
"github.com/samuel/go-zookeeper/zk@#1d7be4effb13d2d908342d349d71a284a7542693",
"github.com/spf13/pflag@#c589d0c9f0d81640c518354c7bcae77d99820aa3",
"github.com/syndtr/goleveldb/leveldb/cache@#6b4daa5362b502898ddf367c5c11deb9e7a5c727",
Expand Down
2 changes: 1 addition & 1 deletion test/system/fixtures/gopath/src/with-k8s-client/expected-list.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,5 @@
"k8s.io/client-go/util/flowcontrol@v4.0.0",
"k8s.io/client-go/util/integer@v4.0.0",
"k8s.io/kube-openapi/pkg/common@#abfc5fbe1cf87ee697db107fdfd24c32fe4397a8",
"with-k8s-client@0.0.0"
"with-k8s-client@"
]

0 comments on commit c05984c

Please sign in to comment.