glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-11 14:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

extend stringToString pflag binding to stringToInt pflag

Browse source
This commit is contained in:
VOrishirne 2022-09-24 12:04:17 +05:30
parent 419fd86e49
commit 0573f404c9
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
viper.go
View file

@ -1271,8 +1271,8 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
s = strings.TrimSuffix(s, "]") s = strings.TrimSuffix(s, "]")
res, _ := readAsCSV(s) res, _ := readAsCSV(s)
return cast.ToIntSlice(res) return cast.ToIntSlice(res)
case "stringToString": case "stringToString", "stringToInt":
return stringToStringConv(flag.ValueString()) return csvKeyValueConv(flag.ValueString())
default: default:
return flag.ValueString() return flag.ValueString()
} }
@ -1350,8 +1350,8 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
s = strings.TrimSuffix(s, "]") s = strings.TrimSuffix(s, "]")
res, _ := readAsCSV(s) res, _ := readAsCSV(s)
return cast.ToIntSlice(res) return cast.ToIntSlice(res)
case "stringToString": case "stringToString", "stringToInt":
return stringToStringConv(flag.ValueString()) return csvKeyValueConv(flag.ValueString())
default: default:
return flag.ValueString() return flag.ValueString()
} }
@ -1373,7 +1373,7 @@ func readAsCSV(val string) ([]string, error) {
// mostly copied from pflag's implementation of this operation here https://github.com/spf13/pflag/blob/master/string_to_string.go#L79 // mostly copied from pflag's implementation of this operation here https://github.com/spf13/pflag/blob/master/string_to_string.go#L79
// alterations are: errors are swallowed, map[string]interface{} is returned in order to enable cast.ToStringMap // alterations are: errors are swallowed, map[string]interface{} is returned in order to enable cast.ToStringMap
func stringToStringConv(val string) interface{} { func csvKeyValueConv(val string) interface{} {
val = strings.Trim(val, "[]") val = strings.Trim(val, "[]")
// An empty string would cause an empty map // An empty string would cause an empty map
if len(val) == 0 { if len(val) == 0 {

8
viper_test.go
View file

@ -1166,16 +1166,22 @@ func TestBindPFlagDetectNilFlag(t *testing.T) {
assert.Error(t, result) assert.Error(t, result)
} }
func TestBindPFlagStringToString(t *testing.T) { func TestBindPFlagCSVKeyValue(t *testing.T) {
tests := []struct { tests := []struct {
Expected map[string]string Expected map[string]string
Value string Value string
}{ }{
// stringToString
{map[string]string{}, ""}, {map[string]string{}, ""},
{map[string]string{"yo": "hi"}, "yo=hi"}, {map[string]string{"yo": "hi"}, "yo=hi"},
{map[string]string{"yo": "hi", "oh": "hi=there"}, "yo=hi,oh=hi=there"}, {map[string]string{"yo": "hi", "oh": "hi=there"}, "yo=hi,oh=hi=there"},
{map[string]string{"yo": ""}, "yo="}, {map[string]string{"yo": ""}, "yo="},
{map[string]string{"yo": "", "oh": "hi=there"}, "yo=,oh=hi=there"}, {map[string]string{"yo": "", "oh": "hi=there"}, "yo=,oh=hi=there"},
//stringToInt
{map[string]string{"yo": "1", "oh": "21"}, "yo=1,oh=21"},
{map[string]string{"yo": "2", "oh": "21.0"}, "yo=2,oh=21.0"},
{map[string]string{"yo": "", "oh": "20.99"}, "yo=,oh=20.99"},
{map[string]string{"yo": "", "oh": ""}, "yo=,oh="},
} }
v := New() // create independent Viper object v := New() // create independent Viper object