fix: Optimize branch judgment

1. Judge client.DependencyUpdate in advance
2. switch to if: increase readability

Signed-off-by: Zh1Cheung <945503088@qq.com>
pull/9588/head
Zh1Cheung 5 years ago
parent a499b4b179
commit d136a15c1c

@ -214,7 +214,9 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
// As of Helm 2.4.0, this is treated as a stopping condition: // As of Helm 2.4.0, this is treated as a stopping condition:
// https://github.com/helm/helm/issues/2209 // https://github.com/helm/helm/issues/2209
if err := action.CheckDependencies(chartRequested, req); err != nil { if err := action.CheckDependencies(chartRequested, req); err != nil {
if client.DependencyUpdate { if !client.DependencyUpdate {
return nil, err
}
man := &downloader.Manager{ man := &downloader.Manager{
Out: out, Out: out,
ChartPath: cp, ChartPath: cp,
@ -232,9 +234,6 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
if chartRequested, err = loader.Load(cp); err != nil { if chartRequested, err = loader.Load(cp); err != nil {
return nil, errors.Wrap(err, "failed reloading chart after repo update") return nil, errors.Wrap(err, "failed reloading chart after repo update")
} }
} else {
return nil, err
}
} }
} }
@ -246,8 +245,7 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
// //
// Application chart type is only installable // Application chart type is only installable
func checkIfInstallable(ch *chart.Chart) error { func checkIfInstallable(ch *chart.Chart) error {
switch ch.Metadata.Type { if ch.Metadata.Type == "" || ch.Metadata.Type == "application" {
case "", "application":
return nil return nil
} }
return errors.Errorf("%s charts are not installable", ch.Metadata.Type) return errors.Errorf("%s charts are not installable", ch.Metadata.Type)

@ -5,7 +5,6 @@ go 1.16
require ( require (
github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml v0.3.1
github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Masterminds/goutils v1.1.1
github.com/Masterminds/semver/v3 v3.1.1 github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/sprig/v3 v3.2.2 github.com/Masterminds/sprig/v3 v3.2.2
github.com/Masterminds/squirrel v1.5.0 github.com/Masterminds/squirrel v1.5.0

Loading…
Cancel
Save