mirror of
https://github.com/helm/helm.git
synced 2026-05-28 04:35:48 -04:00
ref(pkg/chartutil): Simplify processDependencyConditions
Before this commit, `r.Enabled` was modified if and only if a boolean was found in the for loop, and in that case, it was assigned the value of said boolean, just in a more complicated way. Signed-off-by: Simon Alling <alling.simon@gmail.com>
This commit is contained in:
parent
15d277360e
commit
a40debd42b
1 changed files with 2 additions and 16 deletions
|
|
@ -36,7 +36,6 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
|
|||
return
|
||||
}
|
||||
for _, r := range reqs {
|
||||
var hasTrue, hasFalse bool
|
||||
for _, c := range strings.Split(strings.TrimSpace(r.Condition), ",") {
|
||||
if len(c) > 0 {
|
||||
// retrieve value
|
||||
|
|
@ -44,11 +43,8 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
|
|||
if err == nil {
|
||||
// if not bool, warn
|
||||
if bv, ok := vv.(bool); ok {
|
||||
if bv {
|
||||
hasTrue = true
|
||||
} else {
|
||||
hasFalse = true
|
||||
}
|
||||
r.Enabled = bv
|
||||
break
|
||||
} else {
|
||||
log.Printf("Warning: Condition path '%s' for chart %s returned non-bool value", c, r.Name)
|
||||
}
|
||||
|
|
@ -56,18 +52,8 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
|
|||
// this is a real error
|
||||
log.Printf("Warning: PathValue returned error %v", err)
|
||||
}
|
||||
if vv != nil {
|
||||
// got first value, break loop
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if !hasTrue && hasFalse {
|
||||
r.Enabled = false
|
||||
} else if hasTrue {
|
||||
r.Enabled = true
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue