mirror of
https://github.com/ossf/scorecard.git
synced 2024-09-19 04:57:14 +03:00
🌱 Fix lint issues: goerr113 linter (#398)
* Fix lint issues: goerr113 linter This linter encourages wrapped static errors instead of dynamic errors. * Updating capitalization
This commit is contained in:
parent
a2d51ead20
commit
82be54ba75
16
cmd/root.go
16
cmd/root.go
@ -17,6 +17,7 @@ package cmd
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
@ -40,12 +41,13 @@ var (
|
||||
checksToRun []string
|
||||
metaData []string
|
||||
// This one has to use goflag instead of pflag because it's defined by zap.
|
||||
logLevel = zap.LevelFlag("verbosity", zap.InfoLevel, "override the default log level")
|
||||
format string
|
||||
npm string
|
||||
pypi string
|
||||
rubygems string
|
||||
showDetails bool
|
||||
logLevel = zap.LevelFlag("verbosity", zap.InfoLevel, "override the default log level")
|
||||
format string
|
||||
npm string
|
||||
pypi string
|
||||
rubygems string
|
||||
showDetails bool
|
||||
ErrorInvalidFormatFlag = errors.New("invalid format flag")
|
||||
)
|
||||
|
||||
const (
|
||||
@ -144,7 +146,7 @@ or ./scorecard --{npm,pypi,rubgems}=<package_name> [--checks=check1,...] [--show
|
||||
case formatJSON:
|
||||
err = repoResult.AsJSON(showDetails, os.Stdout)
|
||||
default:
|
||||
err = fmt.Errorf("invalid format flag %s. allowed values are: [default, csv, json]", format)
|
||||
err = fmt.Errorf("%w %s. allowed values are: [default, csv, json]", ErrorInvalidFormatFlag, format)
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to output results: %v", err)
|
||||
|
@ -15,12 +15,18 @@
|
||||
package repos
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrorUnsupportedHost = errors.New("unsupported host")
|
||||
ErrorInvalidGithubURL = errors.New("invalid GitHub repo URL")
|
||||
)
|
||||
|
||||
type RepoURL struct {
|
||||
Host, Owner, Repo string
|
||||
}
|
||||
@ -64,12 +70,11 @@ func (r *RepoURL) ValidGitHubURL() error {
|
||||
case "github.com":
|
||||
break
|
||||
default:
|
||||
return fmt.Errorf("unsupported host: %s", r.Host)
|
||||
return fmt.Errorf("%w: %s", ErrorUnsupportedHost, r.Host)
|
||||
}
|
||||
|
||||
if len(strings.TrimSpace(r.Owner)) == 0 || len(strings.TrimSpace(r.Repo)) == 0 {
|
||||
//nolint:goerr113 // This is not passing an error as an argument.
|
||||
return fmt.Errorf("invalid GitHub repo url: [%s], pass the full repository URL", r.URL())
|
||||
return fmt.Errorf("%w: [%s], pass the full repository URL", ErrorInvalidGithubURL, r.URL())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user