oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add download location when cataloging directory npm package lock (#2238)

Browse Source 
* added download locatoin (resolved) when cataloging a directory - javascript ecosystem- npm - packag-lock
	Signed-off by Auston(Aoxiang) Zhang <auston.zhang@dal.ca>

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>

* chore: get DCO to fire

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>

---------

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Co-authored-by: Auston-Zhang <ax706429@dal.ca>
This commit is contained in:
Christopher Angelo Phillips 2023-10-20 11:40:38 -04:00 committed by GitHub
parent e1ad340c2d
commit ef43294d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syft/formats/common/spdxhelpers/download_location.go
View File

@ -20,6 +20,8 @@ func DownloadLocation(p pkg.Package) string {
return NoneIfEmpty(metadata.URL) return NoneIfEmpty(metadata.URL)
case pkg.NpmPackageJSONMetadata: case pkg.NpmPackageJSONMetadata:
return NoneIfEmpty(metadata.URL) return NoneIfEmpty(metadata.URL)
case pkg.NpmPackageLockJSONMetadata:
return NoneIfEmpty(metadata.Resolved)
} }
} }
return NOASSERTION return NOASSERTION

18
syft/formats/common/spdxhelpers/download_location_test.go
View File

@ -46,6 +46,24 @@ func Test_DownloadLocation(t *testing.T) {
}, },
expected: NONE, expected: NONE,
}, },
{
name: "from npm package-lock should include resolved",
input: pkg.Package{
Metadata: pkg.NpmPackageLockJSONMetadata{
Resolved: "http://package-lock.test",
},
},
expected: "http://package-lock.test",
},
{
name: "from npm package-lock empty should be NONE",
input: pkg.Package{
Metadata: pkg.NpmPackageLockJSONMetadata{
Resolved: "",
},
},
expected: NONE,
},
} }
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {