Allow json and yaml for file backend

.github/workflows/integration-tests.yml

@@ -87,7 +87,9 @@ jobs:
 
       - name: Test File
         run: |
-          integration/file/test.sh
+          integration/file/test_yaml.sh
+          integration/expect/check.sh
+          integration/file/test_json.sh
           integration/expect/check.sh
 
       - name: Install Rancher

backends/file/client.go

@@ -1,9 +1,11 @@
 package file
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -31,18 +33,30 @@ func NewFileClient(filepath []string, filter string) (*Client, error) {
 }
 
 func readFile(path string, vars map[string]string) error {
-	yamlMap := make(map[interface{}]interface{})
 	data, err := ioutil.ReadFile(path)
 	if err != nil {
 		return err
 	}
 
-	err = yaml.Unmarshal(data, &yamlMap)
-	if err != nil {
-		return err
+	switch filepath.Ext(path) {
+	case ".json":
+		fileMap := make(map[string]interface{})
+		err = json.Unmarshal(data, &fileMap)
+		if err != nil {
+			return err
+		}
+		err = nodeWalk(fileMap, "/", vars)
+	case ".yml", ".yaml":
+		fileMap := make(map[interface{}]interface{})
+		err = yaml.Unmarshal(data, &fileMap)
+		if err != nil {
+			return err
+		}
+		err = nodeWalk(fileMap, "/", vars)
+	default:
+		err = fmt.Errorf("Invalid file extentsion. YAML or JSON only.")
 	}
 
-	err = nodeWalk(yamlMap, "/", vars)
 	if err != nil {
 		return err
 	}
@@ -93,6 +107,11 @@ func nodeWalk(node interface{}, key string, vars map[string]string) error {
 			key := path.Join(key, k.(string))
 			nodeWalk(v, key, vars)
 		}
+	case map[string]interface{}:
+		for k, v := range node.(map[string]interface{}) {
+			key := path.Join(key, k)
+			nodeWalk(v, key, vars)
+		}
 	case string:
 		vars[key] = node.(string)
 	case int:

integration/file/test_json.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+export HOSTNAME="localhost"
+mkdir backends1 backends2
+cat <<EOT >> backends1/1.json
+{
+  "key": "foobar",
+  "database": {
+    "host": "127.0.0.1",
+    "password": "p@sSw0rd",
+    "port": "3306",
+    "username": "confd"
+  }
+}
+EOT
+
+cat <<EOT >> backends1/2.json
+{
+  "upstream": {
+    "app1": "10.0.1.10:8080",
+    "app2": "10.0.1.11:8080"
+  }
+}
+EOT
+
+cat <<EOT >> backends2/1.json
+{
+  "nested": {
+    "app1": "10.0.1.10:8080",
+    "app2": "10.0.1.11:8080"
+  }
+}
+EOT
+
+cat <<EOT >> backends2/2.json
+{
+  "prefix": {
+    "database": {
+      "host": "127.0.0.1",
+      "password": "p@sSw0rd",
+      "port": "3306",
+      "username": "confd"
+    },
+    "upstream": {
+      "app1": "10.0.1.10:8080",
+      "app2": "10.0.1.11:8080"
+    }
+  }
+}
+EOT
+
+# Run confd
+confd --onetime --log-level debug --confdir ./integration/confdir --backend file --file backends1/ --file backends2/ --watch
+
+# Clean up after
+rm -rf backends1 backends2

integration/file/test.sh → integration/file/test_yaml.sh

@@ -36,4 +36,7 @@ prefix:
 EOT
 
 # Run confd
-confd --onetime --log-level debug --confdir ./integration/confdir --backend file --file backends1/ --file backends2/  --watch
+confd --onetime --log-level debug --confdir ./integration/confdir --backend file --file backends1/ --file backends2/ --watch
+
+# Clean up after
+rm -rf backends1 backends2