Parse booleans and null as string values with --set-string flag

This commit is contained in:
Elmar Ritsch 2018-05-29 21:17:37 +02:00
parent 1c2592975b
commit 272d9bc6ef
2 changed files with 16 additions and 2 deletions

View File

@ -325,6 +325,11 @@ func inMap(k rune, m map[rune]bool) bool {
func typedVal(v []rune, st bool) interface{} {
val := string(v)
if st {
return val
}
if strings.EqualFold(val, "true") {
return true
}
@ -337,8 +342,8 @@ func typedVal(v []rune, st bool) interface{} {
return nil
}
// If this value does not start with zero, and not returnString, try parsing it to an int
if !st && len(val) != 0 && val[0] != '0' {
// If this value does not start with zero, try parsing it to an int
if len(val) != 0 && val[0] != '0' {
if iv, err := strconv.ParseInt(val, 10, 64); err == nil {
return iv
}

View File

@ -75,6 +75,11 @@ func TestParseSet(t *testing.T) {
expect: map[string]interface{}{"long_int_string": "1234567890"},
err: false,
},
{
str: "boolean=true",
expect: map[string]interface{}{"boolean": "true"},
err: false,
},
}
tests := []struct {
str string
@ -117,6 +122,10 @@ func TestParseSet(t *testing.T) {
str: "long_int=1234567890",
expect: map[string]interface{}{"long_int": 1234567890},
},
{
str: "boolean=true",
expect: map[string]interface{}{"boolean": true},
},
{
str: "name1,name2=",
err: true,