feat: add HELMFILE_DISABLE_VALS env var to skip vals processing (#2471)

Signed-off-by: Jim Robinson <1643772+jimmyR@users.noreply.github.com>
Signed-off-by: yxxhero <aiopsclub@163.com>
Co-authored-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
jimmyR
2026-09-13 15:40:12 +08:00
committed by GitHub
co-authored by yxxhero
parent 0d6f3ab160
commit bc0c103d79
6 changed files with 516 additions and 22 deletions
+114 -2
View File
@@ -1,9 +1,11 @@
package plugins
import (
"errors"
"fmt"
"io"
"os"
"regexp"
"strconv"
"strings"
"sync"
@@ -18,9 +20,105 @@ const (
valsCacheSize = 512
)
var instance *vals.Runtime
var instance vals.Evaluator
var mu sync.Mutex
// ErrValsDisabled is returned by the evaluator when HELMFILE_DISABLE_VALS_STRICT is set
// and a `ref+` expression is encountered.
var ErrValsDisabled = errors.New("vals is disabled via HELMFILE_DISABLE_VALS_STRICT environment variable")
// refPlusRegexp mirrors the reference syntax understood by the vals library
// (`ref+<provider>://...` and `secretref+<provider>://...`), so that disabled-vals
// modes only report values that vals itself would have tried to resolve.
var refPlusRegexp = regexp.MustCompile(`(secret)?ref\+[^\s+:]*://`)
// passthroughEvaluator passes values through unchanged (for external vals)
type passthroughEvaluator struct{}
func (p *passthroughEvaluator) Eval(m map[string]any) (map[string]any, error) {
return normalizeMap(m), nil
}
// strictEvaluator passes through values but errors if ref+ is detected
type strictEvaluator struct{}
func (s *strictEvaluator) Eval(m map[string]any) (map[string]any, error) {
if containsRefPlus(m) {
return nil, ErrValsDisabled
}
return normalizeMap(m), nil
}
// normalizeMap converts []string values to []any to match vals.Eval behavior.
func normalizeMap(m map[string]any) map[string]any {
out := make(map[string]any, len(m))
for k, v := range m {
out[k] = normalizeValue(v)
}
return out
}
// normalizeValue recursively converts []string to []any and map[any]any to
// map[string]any, matching the type normalization performed by vals.Eval.
func normalizeValue(v any) any {
switch typed := v.(type) {
case map[string]any:
return normalizeMap(typed)
case map[any]any:
strmap := make(map[string]any, len(typed))
for k, v := range typed {
strmap[fmt.Sprintf("%v", k)] = normalizeValue(v)
}
return strmap
case []any:
a := make([]any, len(typed))
for i, e := range typed {
a[i] = normalizeValue(e)
}
return a
case []string:
a := make([]any, len(typed))
for i, s := range typed {
a[i] = s
}
return a
default:
return v
}
}
func containsRefPlus(v any) bool {
switch val := v.(type) {
case string:
return refPlusRegexp.MatchString(val)
case map[string]any:
for _, v := range val {
if containsRefPlus(v) {
return true
}
}
case map[any]any:
for _, v := range val {
if containsRefPlus(v) {
return true
}
}
case []any:
for _, v := range val {
if containsRefPlus(v) {
return true
}
}
case []string:
for _, s := range val {
if refPlusRegexp.MatchString(s) {
return true
}
}
}
return false
}
func buildValsOptions() (vals.Options, error) {
// Configure AWS SDK logging via HELMFILE_AWS_SDK_LOG_LEVEL environment variable
// Default: "off" to prevent sensitive information (tokens, auth headers) from being exposed
@@ -78,7 +176,7 @@ func buildValsOptions() (vals.Options, error) {
return opts, nil
}
func ValsInstance() (*vals.Runtime, error) {
func ValsInstance() (vals.Evaluator, error) {
mu.Lock()
defer mu.Unlock()
@@ -86,6 +184,20 @@ func ValsInstance() (*vals.Runtime, error) {
return instance, nil
}
// HELMFILE_DISABLE_VALS_STRICT: error on ref+ usage
strict, _ := strconv.ParseBool(os.Getenv(envvar.DisableValsStrict))
if strict {
instance = &strictEvaluator{}
return instance, nil
}
// HELMFILE_DISABLE_VALS: pass-through for external vals
disabled, _ := strconv.ParseBool(os.Getenv(envvar.DisableVals))
if disabled {
instance = &passthroughEvaluator{}
return instance, nil
}
opts, err := buildValsOptions()
if err != nil {
return nil, err