Skip to content

Commit

Permalink
Fix linter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
aklevans committed May 20, 2024
1 parent 8305033 commit 3b35e88
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions cmd/package_managers.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ func fetchGitRepositoryFromPackageManagers(npm, pypi, rubygems, nuget string,

type npmResult struct{
Repository struct {
Url string `json:"url"`
}
URL string `json:"url"`
} `json:"repository"`

}

Expand All @@ -127,7 +127,6 @@ type rubyGemsSearchResults struct {

// Gets the GitHub repository URL for the npm package.
func fetchGitRepositoryFromNPM(packageName string, packageManager pmc.Client) (string, error) {
//npmSearchURL := "https://registry.npmjs.org/-/v1/search?text=%s&size=1"
npmSearchURL := "https://registry.npmjs.org/%s/latest"

resp, err := packageManager.Get(npmSearchURL, packageName)
Expand All @@ -136,18 +135,16 @@ func fetchGitRepositoryFromNPM(packageName string, packageManager pmc.Client) (s
}

defer resp.Body.Close()
//v := &npmSearchResults{}
v := &npmResult{}
err = json.NewDecoder(resp.Body).Decode(v)
if err != nil {
return "", sce.WithMessage(sce.ErrScorecardInternal, fmt.Sprintf("failed to parse npm package json: %v", err))
}
if resp.StatusCode == 404 || v.Repository.Url == "" { //len(v.Objects) == 0 || {
if resp.StatusCode == 404 || v.Repository.URL == "" {
return "", sce.WithMessage(sce.ErrScorecardInternal,
fmt.Sprintf("could not find source repo for npm package: %s", packageName))
}
url := strings.TrimPrefix(strings.TrimSuffix(v.Repository.Url, ".git" ), "git+")
return url, nil
return strings.TrimPrefix(strings.TrimSuffix(v.Repository.URL, ".git" ), "git+"), nil
}

func findGitRepositoryInPYPIResponse(packageName string, response io.Reader) (string, error) {
Expand Down

0 comments on commit 3b35e88

Please sign in to comment.