Skip to content

Commit

Permalink
remove parents to use env prefix instead to avoid mixing both concepts
Browse files Browse the repository at this point in the history
  • Loading branch information
JLugagne committed Sep 7, 2023
1 parent b77f4c1 commit c7097bb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
8 changes: 2 additions & 6 deletions viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ type Viper struct {
envKeyReplacer StringReplacer
allowEmptyEnv bool

parents []string
config map[string]interface{}
override map[string]interface{}
defaults map[string]interface{}
Expand All @@ -232,7 +231,6 @@ func New() *Viper {
v.configPermissions = os.FileMode(0o644)
v.fs = afero.NewOsFs()
v.config = make(map[string]interface{})
v.parents = []string{}
v.override = make(map[string]interface{})
v.defaults = make(map[string]interface{})
v.kvstore = make(map[string]interface{})
Expand Down Expand Up @@ -956,9 +954,8 @@ func (v *Viper) Sub(key string) *Viper {
}

if reflect.TypeOf(data).Kind() == reflect.Map {
subv.parents = append(v.parents, strings.ToLower(key))
subv.automaticEnvApplied = v.automaticEnvApplied
subv.envPrefix = v.envPrefix
subv.envPrefix = v.mergeWithEnvPrefix(key)
subv.envKeyReplacer = v.envKeyReplacer
subv.config = cast.ToStringMap(data)
return subv
Expand Down Expand Up @@ -1307,10 +1304,9 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {

// Env override next
if v.automaticEnvApplied {
envKey := strings.Join(append(v.parents, lcaseKey), ".")
// even if it hasn't been registered, if automaticEnv is used,
// check any Get request
if val, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok {
if val, ok := v.getEnv(v.mergeWithEnvPrefix(lcaseKey)); ok {
return val
}
if nested && v.isPathShadowedInAutoEnv(path) != "" {
Expand Down
6 changes: 2 additions & 4 deletions viper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1604,12 +1604,10 @@ func TestSub(t *testing.T) {
assert.Equal(t, (*Viper)(nil), subv)

subv = v.Sub("clothing")
assert.Equal(t, subv.parents[0], "clothing")
assert.Equal(t, subv.envPrefix, "CLOTHING")

subv = v.Sub("clothing").Sub("pants")
assert.Equal(t, len(subv.parents), 2)
assert.Equal(t, subv.parents[0], "clothing")
assert.Equal(t, subv.parents[1], "pants")
assert.Equal(t, subv.envPrefix, "CLOTHING_PANTS")
}

var hclWriteExpected = []byte(`"foos" = {
Expand Down

0 comments on commit c7097bb

Please sign in to comment.