Merge pull request #10 from 030/gh9-nested-yaml

[GH-9] extract values from nested hash

main.go

@@ -25,7 +25,7 @@ func scanFile(file string, key string) string {
 
 	for scanner.Scan() {
 		logrus.Debug("Check whether file: ", file, " and line: ", scanner.Text(), " contains key: ", key)
-		if strings.Contains(scanner.Text(), key+":") {
+		if strings.Contains(scanner.Text(), key+": ") {
 			val = value(scanner.Text())
 		}
 	}
@@ -38,7 +38,7 @@ func scanFile(file string, key string) string {
 }
 
 func value(keyValue string) string {
-	re := regexp.MustCompile("^[a-z-_]+: (.*)$")
+	re := regexp.MustCompile("[A-Z-a-z-_]+: (.*)$")
 	match := re.FindStringSubmatch(keyValue)
 
 	if len(match) == 0 {

main_test.go

@@ -4,17 +4,19 @@ import "testing"
 
 func TestScanFile(t *testing.T) {
 	keyValue := map[string]string{
-		"a":            "abc",
-		"b":            "def",
-		"c":            "ghi",
-		"under_scores": "ensure that keys may contain an underscore",
+		"a":                   "abc",
+		"b":                   "def",
+		"c":                   "ghi",
+		"under_scores":        "ensure that keys may contain an underscore",
+		"image":               "someimage",
+		"MYSQL_ROOT_PASSWORD": "somewordpress",
 	}
 
 	for key, value := range keyValue {
 		expected := value
 		actual := scanFile("test.yaml", key)
 		if expected != actual {
-			t.Errorf("Value was incorrect, got: %s, want: %s.", actual, expected)
+			t.Errorf("Value was incorrect 'Check whether het key '%s' resides in the test yaml file', got value: %s, want: %s.", key, actual, expected)
 		}
 	}
 }

test.yaml

@@ -1,4 +1,11 @@
 a: abc
 b: def
 c: ghi
-under_scores: ensure that keys may contain an underscore
+under_scores: ensure that keys may contain an underscore
+hihi: world
+services:
+  db:
+    image: someimage
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: somewordpress