convert null values to empty strings and ON/OFF to true/false

sources/git_source/source.go

@@ -289,6 +289,10 @@ func flattenProperties(prefix string, object interface{}, properties *map[string
 
 	errors := err.Errors()
 
+	if object == nil {
+		object = ""
+	}
+
 	t := reflect.ValueOf(object).Kind()
 	if t == reflect.Pointer {
 		object = reflect.ValueOf(object).Elem().Interface()
@@ -318,6 +322,16 @@ func flattenProperties(prefix string, object interface{}, properties *map[string
 			}
 		}
 	default:
+		if t == reflect.String {
+			// special string-to-boolean cases
+			switch strings.ToUpper(object.(string)) {
+			case "OFF":
+				object = false
+			case "ON":
+				object = true
+			}
+		}
+
 		if len(prefix) == 0 || prefix[0] != '.' {
 			(*properties)[""] = object
 		} else {

sources/git_source/source_test.go

@@ -2,6 +2,7 @@ package git_source
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -19,6 +20,10 @@ func TestReadYamlFile(t *testing.T) {
 		if !areEqual(flattenedProperties, expectedProperties) {
 			t.Error("Flattened properties are not as expected")
 		}
+		// enc := json.NewEncoder(os.Stdout)
+		// enc.SetIndent("", "  ")
+		//
+		// enc.Encode(flattenedProperties)
 	}
 }
 
@@ -29,11 +34,13 @@ func areEqual(flattened map[string]interface{}, expected map[string]interface{})
 	for k, v := range expected {
 		if v2, ok := flattened[k]; !ok {
 			return false
-		} else if reflect.TypeOf(v2).Kind() == reflect.Int {
+		} else if v2 != nil && reflect.TypeOf(v2).Kind() == reflect.Int {
 			if int(v.(float64)) != v2.(int) {
+				fmt.Println(k)
 				return false
 			}
 		} else if v2 != v {
+			fmt.Println(k)
 			return false
 		}
 	}

tests/configuration-1.json

@@ -13,5 +13,8 @@
   "test.object.array[1].sub-object.attribute-3": "cluster-2",
   "test.object.sub-object.attr-1": "value",
   "test.object.sub-object.attr-2": true,
-  "test.object.sub-object.attr-3": 2
+  "test.object.sub-object.attr-3": 2,
+  "test.object.attr-1": "",
+  "test.object.attr-2": false,
+  "test.object.attr-3": true
 }

tests/configuration-1.yml

@@ -19,3 +19,6 @@ test:
       attr-1: value
       attr-2: true
       attr-3: 2
+    attr-1:
+    attr-2: OFF
+    attr-3: ON