Skip to content

Fix AllSettings when some map keys contain the key delimiter #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olivielpeau merged 1 commit into from
Feb 14, 2019
Merged

Fix AllSettings when some map keys contain the key delimiter #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion viper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,22 @@ func (v *Viper) AllSettings() map[string]interface{} {
// check just in case anything changes
continue
}
path := strings.Split(k, v.keyDelim)

// Build key path by splitting the key by keyDelim and checking that the parent keys
// are actually set.
// Example use case:
// Ensures sure that, for the yaml conf "foo.bar: baz", and keyDelim ".":
// the generated path is []string{"foo.bar", "baz"}, instead of []string{"foo", "bar", "baz"}
path := []string{}
splitPath := strings.Split(k, v.keyDelim)
i := 0
for j := range splitPath {
if v.IsSet(strings.Join(splitPath[:j+1], v.keyDelim)) {
path = append(path, strings.Join(splitPath[i:j+1], v.keyDelim))
i = j + 1
}
}

lastKey := strings.ToLower(path[len(path)-1])
deepestMap := deepSearch(m, path[0:len(path)-1])
// set innermost value
Expand Down
33 changes: 33 additions & 0 deletions viper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,39 @@ func TestAllKeysWithEnv(t *testing.T) {
assert.Equal(t, expectedKeys, keys)
}

func TestAllSettingsWithDelimiterInKeys(t *testing.T) {
exampleYaml := `Hacker: true
name: steve
hobbies:
- skate.boarding
- snowboarding
clothing.summer:
jacket: leather
pants:
size: large
clothing.winter:
jacket: wool
pants:
size: medium
`
v := New()
v.SetConfigType("yaml")
r := strings.NewReader(exampleYaml)

if err := v.unmarshalReader(r, v.config); err != nil {
panic(err)
}

expectedAll := map[string]interface{}{"hacker": true, "name": "steve", "hobbies": []interface{}{"skate.boarding", "snowboarding"}, "clothing.summer": map[string]interface{}{"jacket": "leather", "pants": map[string]interface{}{"size": "large"}}, "clothing.winter": map[string]interface{}{"jacket": "wool", "pants": map[string]interface{}{"size": "medium"}}}
expectedKeys := sort.StringSlice{"hacker", "name", "hobbies", "clothing.summer.jacket", "clothing.summer.pants.size", "clothing.winter.jacket", "clothing.winter.pants.size"}
expectedKeys.Sort()
keys := sort.StringSlice(v.AllKeys())
keys.Sort()

assert.Equal(t, expectedKeys, keys)
assert.Equal(t, expectedAll, v.AllSettings())
}

func TestAliasesOfAliases(t *testing.T) {
Set("Title", "Checking Case")
RegisterAlias("Foo", "Bar")
Expand Down