Remove service-config library from route-registrar

- Use go-yaml library instead
- More inline with our other components

config/config.go

@@ -2,10 +2,13 @@ package config
 
 import (
 	"fmt"
+	"io/ioutil"
 	"net/url"
 	"strconv"
 	"time"
 
+	"gopkg.in/yaml.v2"
+
 	"github.com/cloudfoundry/multierror"
 )
 
@@ -65,6 +68,22 @@ type Route struct {
 	HealthCheck          *HealthCheck
 }
 
+func NewConfigSchemaFromFile(configFile string) (ConfigSchema, error) {
+	var config ConfigSchema
+
+	c, err := ioutil.ReadFile(configFile)
+	if err != nil {
+		return ConfigSchema{}, err
+	}
+
+	err = yaml.Unmarshal(c, &config)
+	if err != nil {
+		return ConfigSchema{}, err
+	}
+
+	return config, nil
+}
+
 func (c ConfigSchema) ToConfig() (*Config, error) {
 	errors := multierror.MultiError{}
 

config/config_test.go

@@ -2,6 +2,8 @@ package config_test
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
 	"time"
 
 	"github.com/cloudfoundry-incubator/route-registrar/config"
@@ -71,6 +73,49 @@ var _ = Describe("Config", func() {
 		}
 	})
 
+	Describe("NewConfigSchemaFromFile", func() {
+		It("returns a valid config", func() {
+			cfg_file := "../example_config/example.yml"
+			cfg, err := config.NewConfigSchemaFromFile(cfg_file)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cfg).To(Equal(configSchema))
+		})
+
+		Context("when the file does not exists", func() {
+			It("returns an error", func() {
+				cfg_file := "notexist"
+				_, err := config.NewConfigSchemaFromFile(cfg_file)
+
+				Expect(err).To(HaveOccurred())
+			})
+		})
+
+		Context("when the config is invalid", func() {
+			var (
+				configFile *os.File
+			)
+
+			BeforeEach(func() {
+				var err error
+				configFile, err = ioutil.TempFile("", "route-registrar-config")
+				Expect(err).NotTo(HaveOccurred())
+
+				_, err = configFile.Write([]byte("invalid yaml %^&#"))
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			AfterEach(func() {
+				os.Remove(configFile.Name())
+			})
+
+			It("returns an error", func() {
+				_, err := config.NewConfigSchemaFromFile(configFile.Name())
+				Expect(err).To(HaveOccurred())
+			})
+		})
+	})
+
 	Describe("ToConfig", func() {
 		It("returns a Config object and no error", func() {
 			c, err := configSchema.ToConfig()

example_config/example.yml

@@ -0,0 +1,18 @@
+---
+host: "127.0.0.1"
+routes:
+- name: "route-0"
+  port: 3000
+  uris: ["my-app.my-domain.com"]
+  registration_interval: 20s
+- name: "route-1"
+  port: 3001
+  uris: ["my-other-app.my-domain.com"]
+  registration_interval: 10s
+message_bus_servers:
+- host: "some-host"
+  user: "some-user"
+  password: "some-password"
+- host: "another-host"
+  user: "another-user"
+  password: "another-password"

main.go

@@ -10,23 +10,22 @@ import (
 	"syscall"
 
 	"github.com/cloudfoundry-incubator/cf-lager"
-	"github.com/pivotal-cf-experimental/service-config"
-	"github.com/pivotal-golang/lager"
-	"github.com/tedsuo/ifrit"
 	"github.com/cloudfoundry-incubator/route-registrar/config"
 	"github.com/cloudfoundry-incubator/route-registrar/healthchecker"
 	"github.com/cloudfoundry-incubator/route-registrar/messagebus"
 	"github.com/cloudfoundry-incubator/route-registrar/registrar"
+	"github.com/pivotal-golang/lager"
+	"github.com/tedsuo/ifrit"
 )
 
 func main() {
+	var configPath string
 	flags := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
 
 	pidfile := flags.String("pidfile", "", "Path to pid file")
 	cf_lager.AddFlags(flags)
 
-	serviceConfig := service_config.New()
-	serviceConfig.AddFlags(flags)
+	flags.StringVar(&configPath, "configPath", "", "path to configuration file with json encoded content")
 	flags.Set("configPath", "registrar_settings.yml")
 
 	flags.Parse(os.Args[1:])
@@ -35,8 +34,7 @@ func main() {
 
 	logger.Info("Initializing")
 
-	var configSchema config.ConfigSchema
-	err := serviceConfig.Read(&configSchema)
+	configSchema, err := config.NewConfigSchemaFromFile(configPath)
 	if err != nil {
 		logger.Fatal("error parsing file: %s\n", err)
 	}