Merge a6f3a5b into af517d5

kv.go

@@ -3,6 +3,7 @@ package staert
 import (
 	"encoding"
 	"encoding/base64"
+	"encoding/csv"
 	"errors"
 	"fmt"
 	"reflect"
@@ -106,8 +107,6 @@ func processKV(key string, v []byte, raw map[string]interface{}) (map[string]int
 }
 
 func decodeHook(fromType reflect.Type, toType reflect.Type, data interface{}) (interface{}, error) {
-	// TODO : Array support
-
 	// custom unmarshaler
 	textUnmarshalerType := reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
 	if toType.Implements(textUnmarshalerType) {
@@ -155,11 +154,15 @@ func decodeHook(fromType reflect.Type, toType reflect.Type, data interface{}) (i
 
 			return dataOutput, nil
 		} else if fromType.Kind() == reflect.String {
-			b, err := base64.StdEncoding.DecodeString(data.(string))
-			if err != nil {
-				return nil, err
+			str := data.(string)
+			b, err := base64.StdEncoding.DecodeString(str)
+			if err == nil {
+				return b, nil
 			}
-			return b, nil
+
+			reader := csv.NewReader(strings.NewReader(str))
+			reader.TrimLeadingSpace = true
+			return reader.Read()
 		}
 	}
 	return data, nil

kv_test.go

@@ -1,6 +1,7 @@
 package staert
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"reflect"
 	"strings"
@@ -1094,6 +1095,63 @@ func TestConvertPairs5Levels(t *testing.T) {
 	}
 }
 
+type StrSlices struct {
+	Bytes                        []byte
+	Ints                         []int
+	Bools                        []bool
+	Strings                      []string
+	StringsWithCommaAndQuotation []string
+}
+
+func TestSliceTypes(t *testing.T) {
+	config := StrSlices{}
+
+	kv := &KvSource{
+		&Mock{
+			KVPairs: []*store.KVPair{
+				{Key: "test/bytes", Value: []byte(base64.StdEncoding.EncodeToString([]byte("hello")))},
+				{Key: "test/ints", Value: []byte("1,2,3")},
+				{Key: "test/bools", Value: []byte("true,false,true")},
+				{Key: "test/strings", Value: []byte("hi,1,world")},
+				{Key: "test/stringswithcommaandquotation", Value: []byte("first, \"second\", \"with, comma\"")},
+			},
+		},
+		"test",
+	}
+
+	cmd := &flaeg.Command{
+		Name:                  "test",
+		Description:           "description test",
+		Config:                &config,
+		DefaultPointersConfig: &config,
+		Run: func() error { return nil },
+	}
+
+	if _, err := kv.Parse(cmd); err != nil {
+		t.Fatalf("Error %s", err)
+	}
+
+	expected := &StrSlices{
+		Bytes:   []byte("hello"),
+		Ints:    []int{1, 2, 3},
+		Bools:   []bool{true, false, true},
+		Strings: []string{"hi", "1", "world"},
+		StringsWithCommaAndQuotation: []string{"first", "second", "with, comma"},
+	}
+
+	if !reflect.DeepEqual(expected, cmd.Config) {
+		actualJSON, err := json.Marshal(cmd.Config)
+		if err != nil {
+			t.Fatalf("Error: %v", err)
+		}
+		expectedJSON, err := json.Marshal(expected)
+		if err != nil {
+			t.Fatalf("Error: %v", err)
+		}
+		t.Fatalf("\nexpected\t: %s\ngot\t\t\t: %s\n", expectedJSON, actualJSON)
+	}
+}
+
 func TestCollateKvPairsBase64(t *testing.T) {
 	config := &struct {
 		Base64Bytes []byte