clean up error imports for repo pkg

Signed-off-by: James Sheppard <jgsheppa@protonmail.com>
pull/12063/head
James Sheppard 2 years ago
parent 8c749cd6a4
commit fcb63f60fc

@ -63,12 +63,12 @@ type ChartRepository struct {
func NewChartRepository(cfg *Entry, getters getter.Providers) (*ChartRepository, error) { func NewChartRepository(cfg *Entry, getters getter.Providers) (*ChartRepository, error) {
u, err := url.Parse(cfg.URL) u, err := url.Parse(cfg.URL)
if err != nil { if err != nil {
return nil, errors.Errorf("invalid chart URL format: %s", cfg.URL) return nil, fmt.Errorf("invalid chart URL format: %s", cfg.URL)
} }
client, err := getters.ByScheme(u.Scheme) client, err := getters.ByScheme(u.Scheme)
if err != nil { if err != nil {
return nil, errors.Errorf("could not find protocol handler for: %s", u.Scheme) return nil, fmt.Errorf("could not find protocol handler for: %s", u.Scheme)
} }
return &ChartRepository{ return &ChartRepository{
@ -90,7 +90,7 @@ func (r *ChartRepository) Load() error {
return err return err
} }
if !dirInfo.IsDir() { if !dirInfo.IsDir() {
return errors.Errorf("%q is not a directory", r.Config.Name) return fmt.Errorf("%q is not a directory", r.Config.Name)
} }
// FIXME: Why are we recursively walking directories? // FIXME: Why are we recursively walking directories?
@ -265,11 +265,11 @@ func FindChartInAuthAndTLSAndPassRepoURL(repoURL, username, password, chartName,
} }
cv, err := repoIndex.Get(chartName, chartVersion) cv, err := repoIndex.Get(chartName, chartVersion)
if err != nil { if err != nil {
return "", errors.Errorf("%s not found in %s repository", errMsg, repoURL) return "", fmt.Errorf("%s not found in %s repository", errMsg, repoURL)
} }
if len(cv.URLs) == 0 { if len(cv.URLs) == 0 {
return "", errors.Errorf("%s has no downloadable URLs", errMsg) return "", fmt.Errorf("%s has no downloadable URLs", errMsg)
} }
chartURL := cv.URLs[0] chartURL := cv.URLs[0]

@ -18,6 +18,7 @@ package repo
import ( import (
"bytes" "bytes"
"fmt"
"log" "log"
"os" "os"
"path" "path"
@ -218,7 +219,7 @@ func (i IndexFile) Get(name, version string) (*ChartVersion, error) {
return ver, nil return ver, nil
} }
} }
return nil, errors.Errorf("no chart version found for %s-%s", name, version) return nil, fmt.Errorf("no chart version found for %s-%s", name, version)
} }
// WriteFile writes an index file to the given destination path. // WriteFile writes an index file to the given destination path.

Loading…
Cancel
Save