Add repo update strict flag

pull/4348/head
l.aminov 7 years ago
parent fe9064c8f7
commit fd808dbef3

@ -40,9 +40,10 @@ future releases.
var errNoRepositories = errors.New("no repositories found. You must add one before updating") var errNoRepositories = errors.New("no repositories found. You must add one before updating")
type repoUpdateCmd struct { type repoUpdateCmd struct {
update func([]*repo.ChartRepository, io.Writer, helmpath.Home) error update func([]*repo.ChartRepository, io.Writer, helmpath.Home, bool) error
home helmpath.Home home helmpath.Home
out io.Writer out io.Writer
strict bool
} }
func newRepoUpdateCmd(out io.Writer) *cobra.Command { func newRepoUpdateCmd(out io.Writer) *cobra.Command {
@ -60,6 +61,10 @@ func newRepoUpdateCmd(out io.Writer) *cobra.Command {
return u.run() return u.run()
}, },
} }
f := cmd.Flags()
f.BoolVar(&u.strict, "strict", false, "fail on update warnings")
return cmd return cmd
} }
@ -80,10 +85,10 @@ func (u *repoUpdateCmd) run() error {
} }
repos = append(repos, r) repos = append(repos, r)
} }
return u.update(repos, u.out, u.home) return u.update(repos, u.out, u.home, u.strict)
} }
func updateCharts(repos []*repo.ChartRepository, out io.Writer, home helmpath.Home) error { func updateCharts(repos []*repo.ChartRepository, out io.Writer, home helmpath.Home, strict bool) error {
fmt.Fprintln(out, "Hang tight while we grab the latest from your chart repositories...") fmt.Fprintln(out, "Hang tight while we grab the latest from your chart repositories...")
var ( var (
errorCounter int errorCounter int
@ -107,9 +112,11 @@ func updateCharts(repos []*repo.ChartRepository, out io.Writer, home helmpath.Ho
}(re) }(re)
} }
wg.Wait() wg.Wait()
if errorCounter != 0 {
if errorCounter != 0 && strict {
return errors.New("Update Failed. Check log for details") return errors.New("Update Failed. Check log for details")
} }
fmt.Fprintln(out, "Update Complete. ⎈ Happy Helming!⎈ ") fmt.Fprintln(out, "Update Complete. ⎈ Happy Helming!⎈ ")
return nil return nil
} }

@ -46,7 +46,7 @@ func TestUpdateCmd(t *testing.T) {
out := bytes.NewBuffer(nil) out := bytes.NewBuffer(nil)
// Instead of using the HTTP updater, we provide our own for this test. // Instead of using the HTTP updater, we provide our own for this test.
// The TestUpdateCharts test verifies the HTTP behavior independently. // The TestUpdateCharts test verifies the HTTP behavior independently.
updater := func(repos []*repo.ChartRepository, out io.Writer, hh helmpath.Home) error { updater := func(repos []*repo.ChartRepository, out io.Writer, hh helmpath.Home, strict bool) error {
for _, re := range repos { for _, re := range repos {
fmt.Fprintln(out, re.Config.Name) fmt.Fprintln(out, re.Config.Name)
} }
@ -95,7 +95,7 @@ func TestUpdateCharts(t *testing.T) {
} }
b := bytes.NewBuffer(nil) b := bytes.NewBuffer(nil)
updateCharts([]*repo.ChartRepository{r}, b, hh) updateCharts([]*repo.ChartRepository{r}, b, hh, false)
got := b.String() got := b.String()
if strings.Contains(got, "Unable to get an update") { if strings.Contains(got, "Unable to get an update") {

@ -445,10 +445,7 @@ func (m *Manager) UpdateRepositories() error {
func (m *Manager) parallelRepoUpdate(repos []*repo.Entry) error { func (m *Manager) parallelRepoUpdate(repos []*repo.Entry) error {
out := m.Out out := m.Out
fmt.Fprintln(out, "Hang tight while we grab the latest from your chart repositories...") fmt.Fprintln(out, "Hang tight while we grab the latest from your chart repositories...")
var ( var wg sync.WaitGroup
errorCounter int
wg sync.WaitGroup
)
for _, c := range repos { for _, c := range repos {
r, err := repo.NewChartRepository(c, m.Getters) r, err := repo.NewChartRepository(c, m.Getters)
if err != nil { if err != nil {
@ -457,7 +454,6 @@ func (m *Manager) parallelRepoUpdate(repos []*repo.Entry) error {
wg.Add(1) wg.Add(1)
go func(r *repo.ChartRepository) { go func(r *repo.ChartRepository) {
if err := r.DownloadIndexFile(m.HelmHome.Cache()); err != nil { if err := r.DownloadIndexFile(m.HelmHome.Cache()); err != nil {
errorCounter++
fmt.Fprintf(out, "...Unable to get an update from the %q chart repository (%s):\n\t%s\n", r.Config.Name, r.Config.URL, err) fmt.Fprintf(out, "...Unable to get an update from the %q chart repository (%s):\n\t%s\n", r.Config.Name, r.Config.URL, err)
} else { } else {
fmt.Fprintf(out, "...Successfully got an update from the %q chart repository\n", r.Config.Name) fmt.Fprintf(out, "...Successfully got an update from the %q chart repository\n", r.Config.Name)
@ -466,9 +462,6 @@ func (m *Manager) parallelRepoUpdate(repos []*repo.Entry) error {
}(r) }(r)
} }
wg.Wait() wg.Wait()
if errorCounter != 0 {
return errors.New("Update Failed. Check log for details")
}
fmt.Fprintln(out, "Update Complete. ⎈Happy Helming!⎈") fmt.Fprintln(out, "Update Complete. ⎈Happy Helming!⎈")
return nil return nil
} }

Loading…
Cancel
Save