Fix interpolated bools (#19)

Fix interpolated bools

Author: Alex

config_test.go

@@ -349,12 +349,12 @@ func TestInvalidConfigFailures(t *testing.T) {
 	t.Parallel()
 	valueType := []byte(`
 id: xyz
-boolean:
+boolean: hooli
 `)
 	provider := NewYAMLProviderFromBytes(valueType)
-	assert.Panics(t, func() { NewYAMLProviderFromBytes([]byte("bytes: \n\x010")) }, "Can't parse empty boolean")
+	assert.Panics(t, func() { NewYAMLProviderFromBytes([]byte("bytes: \n\x010")) }, "Can't parse invalid YAML")
 	assert.Panics(t, func() { provider.Get("id").AsInt() }, "Can't parse as int")
-	assert.Panics(t, func() { provider.Get("boolean").AsBool() }, "Can't parse empty boolean")
+	assert.Panics(t, func() { provider.Get("boolean").AsBool() }, "Can't parse invalid boolean")
 	assert.Panics(t, func() { provider.Get("id").AsFloat() }, "Can't parse as float")
 }
 

decoder.go

@@ -187,10 +187,13 @@ func convertValueFromStruct(src interface{}, dst *reflect.Value) error {
 		return convertFloats(src, dst)
 
 	case reflect.Bool:
-		if v, err := strconv.ParseBool(fmt.Sprint(src)); err == nil {
-			dst.SetBool(v)
+		v, err := strconv.ParseBool(fmt.Sprint(src))
+		if err != nil {
+			return err
 		}
 
+		dst.SetBool(v)
+
 	case reflect.String:
 		dst.SetString(fmt.Sprint(src))
 

static_provider_test.go

@@ -27,6 +27,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"io/ioutil"
+	"strings"
 )
 
 func TestStaticProvider_Name(t *testing.T) {
@@ -296,6 +298,20 @@ func TestValue_ChildKeys(t *testing.T) {
 	t.Run("MapOfInts", func(t *testing.T) { op(t, Root, []string{"3", "5"}) })
 }
 
+func TestInterpolatedBool(t *testing.T) {
+	t.Parallel()
+
+	f := func(key string) (string, bool) {
+		if key == "interpolate" {
+			return "true", true
+		}
+		return "", false
+	}
+
+	p := NewYAMLProviderFromReaderWithExpand(f, ioutil.NopCloser(strings.NewReader("val: ${interpolate:false}")))
+	assert.True(t, p.Get("val").AsBool())
+}
+
 func TestConfigDefaults(t *testing.T) {
 	t.Parallel()
 

value.go

@@ -191,11 +191,9 @@ func (cv Value) TryAsInt() (int, bool) {
 
 // TryAsBool attempts to return the configuration value as a bool
 func (cv Value) TryAsBool() (bool, bool) {
-	v := cv.Value()
-	if val, err := convertValue(v, reflect.TypeOf(true)); v != nil && err == nil {
-		return val.(bool), true
-	}
-	return false, false
+	var res bool
+	err := newValueProvider(cv.Value()).Get(Root).Populate(&res)
+	return res, err == nil
 }
 
 // TryAsFloat attempts to return the configuration value as a float