Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid copying a lock by value, which is invalid. #59

Merged
merged 2 commits into from
Feb 27, 2020
Merged

Avoid copying a lock by value, which is invalid. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e1d21
Avoid copying a lock by value, which is invalid.
flimzy Dec 8, 2019
c4021b9
Merge branch 'master' into noCopyLocks
DarthHater Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func doCheckExistenceAndParse() {
customerrors.Check(errors.New("dep failed to parse lock file and returned nil"), "nancy could not continue due to dep failure")
}

purls, invalidPurls := packages.ExtractPurlsUsingDep(*project)
purls, invalidPurls := packages.ExtractPurlsUsingDep(project)

checkOSSIndex(purls, invalidPurls)
case strings.Contains(config.Path, "go.sum"):
Expand Down
2 changes: 1 addition & 1 deletion packages/dep.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strings"
)

func ExtractPurlsUsingDep(project dep.Project) ([]string, []string) {
func ExtractPurlsUsingDep(project *dep.Project) ([]string, []string) {
lockedProjects := project.Lock.P
var purls []string
var invalidPurls []string
Expand Down
2 changes: 1 addition & 1 deletion packages/dep_int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestExtractPurlsFromManifestUsingDep(t *testing.T) {
if err != nil {
t.Error(err)
} else {
purls, invalidPurls := ExtractPurlsUsingDep(*project)
purls, invalidPurls := ExtractPurlsUsingDep(project)
if len(invalidPurls) != 7 {
t.Errorf("Number of invalid purls not as expected. Expected : %d, Got %d", 7, len(purls))
}
Expand Down