Add support for loading configuration from directories

.gitignore

@@ -16,6 +16,10 @@ build
 .idea/
 coverage.out
 *.swp
+
 keys/
 *.rsa
 *.rsa.pub
+
+cover.out
+coverage.html

fixtures/conf.d/config_base.json

@@ -0,0 +1,27 @@
+{
+  "sensu": [
+    {
+      "name": "us-east-2",
+      "host": "10.0.0.2"
+    },
+    {
+      "name": "us-west-2",
+      "host": "192.168.0.2",
+      "port": 4569,
+      "timeout": 5
+    }
+  ],
+  "uchiwa": {
+    "host": "127.0.0.1",
+    "port": 3000,
+    "users": [
+      {
+        "username" : "admin",
+        "password": "secret",
+        "role": {
+          "readonly": false
+        }
+      }
+    ]
+  }
+}

fixtures/conf.d/config_overwrite.json

@@ -0,0 +1,21 @@
+{
+  "sensu": [
+    {
+      "name": "us-east-3",
+      "host": "10.0.0.3"
+    }
+  ],
+  "uchiwa": {
+    "host": "192.168.0.1",
+    "port": 8000,
+    "users": [
+      {
+        "username" : "readonly",
+        "password": "secret",
+        "role": {
+          "readonly": true
+        }
+      }
+    ]
+  }
+}

fixtures/config_test.json

@@ -1,14 +1,19 @@
 {
   "sensu": [
     {
-      "name": "qux",
-      "host": "hidden-ravine-4272.herokuapp.com",
-      "port": 80
+      "name": "us-east-1",
+      "host": "10.0.0.1"
+    },
+    {
+      "name": "us-west-1",
+      "host": "192.168.0.1",
+      "port": 4570,
+      "timeout": 5
     }
   ],
   "uchiwa": {
     "host": "0.0.0.0",
-    "port": 3000,
+    "port": 8080,
     "user": "foo",
     "pass": "bar"
   }

uchiwa.go

@@ -13,13 +13,11 @@ import (
 
 func main() {
 	configFile := flag.String("c", "./config.json", "Full or relative path to the configuration file")
+	configDir := flag.String("d", "", "Full or relative path to the configuration directory, or comma delimited directories")
 	publicPath := flag.String("p", "public", "Full or relative path to the public directory")
 	flag.Parse()
 
-	config, err := config.Load(*configFile)
-	if err != nil {
-		logger.Fatal(err)
-	}
+	config := config.Load(*configFile, *configDir)
 
 	logger.Debug("Debug mode enabled")