Merge pull request #31809 from mmorel-35/errorlint-pkg-8-6adf4e8

fix(pkg): errorlint linter
pull/31678/merge
Terry Howe 3 days ago committed by GitHub
commit e7b0cadf77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -157,7 +157,7 @@ func makeDefaultCapabilities() (*Capabilities, error) {
v, err := semver.NewVersion(vstr)
if err != nil {
return nil, fmt.Errorf("unable to parse k8s.io/client-go version %q: %v", vstr, err)
return nil, fmt.Errorf("unable to parse k8s.io/client-go version %q: %w", vstr, err)
}
kubeVersionMajor := v.Major() + 1

@ -80,7 +80,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
if kubeVersion != "" {
parsedKubeVersion, err := common.ParseKubeVersion(kubeVersion)
if err != nil {
return fmt.Errorf("invalid kube version '%s': %s", kubeVersion, err)
return fmt.Errorf("invalid kube version '%s': %w", kubeVersion, err)
}
client.KubeVersion = parsedKubeVersion
}

@ -380,7 +380,7 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (string, *url
if err != nil {
// If there is no special config, return the default HTTP client and
// swallow the error.
if err == ErrNoOwnerRepo {
if errors.Is(err, ErrNoOwnerRepo) {
// Make sure to add the ref URL as the URL for the getter
c.Options = append(c.Options, getter.WithURL(ref))
return "", u, nil

@ -106,7 +106,7 @@ func (t *literalParser) key(data map[string]interface{}, nestedNameLevel int) (r
case lastRune == '=':
// found end of key: swallow the '=' and get the value
value, err := t.val()
if err == nil && err != io.EOF {
if err == nil && !errors.Is(err, io.EOF) {
return err
}
set(data, string(key), string(value))

Loading…
Cancel
Save