upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-03-28 05:14:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Revert "fix(cmd/helm): user friendly error message when repos are not configured"

Browse source 
This reverts commit c4b76f27de.
This commit is contained in:
Adam Reese 2019-08-28 09:51:59 -07:00
parent c4b76f27de
commit c19253d7cd
No known key found for this signature in database
GPG key ID: 06F35E60A7A18DD6
5 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/helm/repo.go
View file

@ -18,9 +18,7 @@ package main
import (
"io"
"os"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"helm.sh/helm/cmd/helm/require"
@ -50,7 +48,3 @@ func newRepoCmd(out io.Writer) *cobra.Command {
return cmd
}
func isNotExist(err error) bool {
return os.IsNotExist(errors.Cause(err))
}

5
cmd/helm/repo_list.go
View file

@ -35,7 +35,10 @@ func newRepoListCmd(out io.Writer) *cobra.Command {
Args: require.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
f, err := repo.LoadFile(settings.RepositoryConfig)
if isNotExist(err) || len(f.Repositories) == 0 {
if err != nil {
return err
}
if len(f.Repositories) == 0 {
return errors.New("no repositories to show")
}
table := uitable.New()

4
cmd/helm/repo_remove.go
View file

@ -56,8 +56,8 @@ func newRepoRemoveCmd(out io.Writer) *cobra.Command {
func (o *repoRemoveOptions) run(out io.Writer) error {
r, err := repo.LoadFile(o.repoFile)
if isNotExist(err) || len(r.Repositories) == 0 {
return errors.New("no repositories configured")
if err != nil {
return err
}
if !r.Remove(o.name) {

10
cmd/helm/repo_update.go
View file

@ -59,9 +59,13 @@ func newRepoUpdateCmd(out io.Writer) *cobra.Command {
}
func (o *repoUpdateOptions) run(out io.Writer) error {
f, err := repo.LoadFile(settings.RepositoryConfig)
if isNotExist(err) || len(f.Repositories) == 0 {
return errors.New("no repositories to update")
f, err := repo.LoadFile(o.repoFile)
if err != nil {
return err
}
if len(f.Repositories) == 0 {
return errNoRepositories
}
var repos []*repo.ChartRepository
for _, cfg := range f.Repositories {

4
cmd/helm/search_repo.go
View file

@ -147,8 +147,8 @@ func (o *searchRepoOptions) formatSearchResults(res []*search.Result) string {
func (o *searchRepoOptions) buildIndex(out io.Writer) (*search.Index, error) {
// Load the repositories.yaml
rf, err := repo.LoadFile(o.repoFile)
if isNotExist(err) || len(rf.Repositories) == 0 {
return nil, errors.New("no repositories configured")
if err != nil {
return nil, errors.Wrap(err, "loading repository config")
}
i := search.NewIndex()