Skip to content

Commit 8da14dd

Browse files
committed
apply copilot review
1 parent b7e39e2 commit 8da14dd

2 files changed

Lines changed: 5 additions & 46 deletions

File tree

cmd/devguard-cli/test/package_manager_functions.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,6 @@ type RegistryRequest struct {
1313
Version string // empty string means "all versions"
1414
}
1515

16-
func timeoutDetection(err error) {
17-
// check if error is a timeout error
18-
}
19-
20-
// VersionExists checks if a package version exists on npm registry
21-
func VersionExists(dependency string, version string) bool {
22-
normalizedVersion := strings.Trim(version, "/^\"")
23-
url := "https://registry.npmjs.org/" + dependency + "/" + normalizedVersion
24-
25-
resp, err := http.Head(url)
26-
if err != nil {
27-
return false
28-
}
29-
defer resp.Body.Close()
30-
31-
return resp.StatusCode == 200
32-
}
33-
3416
// get all versions if no version is specified
3517
func GetNPMRegistry(pkg RegistryRequest) (*http.Response, error) {
3618
var req *http.Response

cmd/devguard-cli/test/quickfix.go

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -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

4343
func 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

108102
func 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-
169146
func 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

Comments
 (0)