Revert "Convert env management to a resolver."

This reverts commit fbe8d48e4b.
This commit is contained in:
Alec Thomas
2020-04-30 17:03:21 +10:00
parent b6ff115b3e
commit ed7caf6841
4 changed files with 11 additions and 35 deletions
+11
View File
@@ -3,6 +3,7 @@ package kong
import (
"fmt"
"math"
"os"
"reflect"
"strconv"
"strings"
@@ -325,6 +326,16 @@ func (v *Value) ApplyDefault() error {
// Does not include resolvers.
func (v *Value) Reset() error {
v.Target.Set(reflect.Zero(v.Target.Type()))
if v.Tag.Env != "" {
envar := os.Getenv(v.Tag.Env)
if envar != "" {
err := v.Parse(ScanFromTokens(Token{Type: FlagValueToken, Value: envar}), v.Target)
if err != nil {
return fmt.Errorf("%s (from envar %s=%q)", err, v.Tag.Env, envar)
}
return nil
}
}
if v.Default != "" {
return v.Parse(ScanFromTokens(Token{Type: FlagValueToken, Value: v.Default}), v.Target)
}