@@ -12,9 +12,9 @@ import (
1212 "strings"
1313)
1414
15- func getPackageManager (Package string ) string {
15+ func getPackageManager (pkg string ) string {
1616 // insert future Package Managers later
17- switch Package {
17+ switch pkg {
1818
1919 case "npm" , "yarn" , "pnpm" :
2020 return "node"
@@ -35,9 +35,9 @@ func getVersion(packageManager string, pkg RegistryRequest) (*http.Response, err
3535 return GetNPMRegistry (pkg )
3636 case "crates" :
3737 return GetCratesRegistry (pkg )
38+ default :
39+ return nil , fmt .Errorf ("unsupported package manager: %s" , packageManager )
3840 }
39- // add more in the future
40- return nil , nil
4141}
4242
4343func getRecommendedVersions (npmResponse NPMResponse , currentVersion string ) ([]string , error ) {
@@ -86,7 +86,6 @@ func getRecommendedVersions(npmResponse NPMResponse, currentVersion string) ([]s
8686 return vi [2 ] > vj [2 ]
8787 })
8888
89- fmt .Println (recommended )
9089 return recommended , nil
9190}
9291
@@ -99,11 +98,6 @@ func parseVersion(version string) [3]int {
9998}
10099
101100// single node in the dependency tree
102- type DependencyNode struct {
103- Name string
104- Version string
105- Dependencies map [string ]* DependencyNode
106- }
107101
108102func IsValidSemver (version string ) bool {
109103
@@ -149,23 +143,6 @@ func findDependencyVersionInMeta(depMeta *NPMResponse, pkgName string) string {
149143 return ""
150144}
151145
152- func findDependencyVersion (npmResp NPMResponse , depName string ) string {
153- // Check all dependency types
154- if version , ok := npmResp .Dependencies [depName ]; ok {
155- return version
156- }
157- if version , ok := npmResp .OptionalDependencies [depName ]; ok {
158- return version
159- }
160- if version , ok := npmResp .DevDependencies [depName ]; ok {
161- return version
162- }
163- if version , ok := npmResp .PeerDependencies [depName ]; ok {
164- return version
165- }
166- return ""
167- }
168-
169146func checkVulnerabilityFixChain (purls []string , fixedVersion string ) (bool , error ) {
170147
171148 packages := make ([]struct {
@@ -217,7 +194,7 @@ func checkVulnerabilityFixChain(purls []string, fixedVersion string) (bool, erro
217194
218195 nextPkgName := packages [i + 1 ].name
219196
220- nextVersionInLatest := findDependencyVersion ( * latestMeta , nextPkgName )
197+ nextVersionInLatest := findDependencyVersionInMeta ( latestMeta , nextPkgName )
221198 if nextVersionInLatest == "" {
222199 return false , fmt .Errorf ("package %s not found in %s@%s dependencies" , nextPkgName , pkgName , latestVersion )
223200 }
0 commit comments