Parcourir la source

refactor(manager): let manager export LoadConfig

bigeagle il y a 9 ans
Parent
commit
3874d41afc
2 fichiers modifiés avec 9 ajouts et 5 suppressions
  1. 5 1
      manager/config.go
  2. 4 4
      manager/config_test.go

+ 5 - 1
manager/config.go

@@ -29,7 +29,7 @@ type FileConfig struct {
 	CACert string `toml:"ca_cert"`
 }
 
-func loadConfig(cfgFile string, c *cli.Context) (*Config, error) {
+func LoadConfig(cfgFile string, c *cli.Context) (*Config, error) {
 
 	cfg := new(Config)
 	cfg.Server.Addr = "127.0.0.1"
@@ -46,6 +46,10 @@ func loadConfig(cfgFile string, c *cli.Context) (*Config, error) {
 		}
 	}
 
+	if c == nil {
+		return cfg, nil
+	}
+
 	if c.String("addr") != "" {
 		cfg.Server.Addr = c.String("addr")
 	}

+ 4 - 4
manager/config_test.go

@@ -72,7 +72,7 @@ func TestConfig(t *testing.T) {
 			Convey("when giving no config options", func() {
 				app.Action = func(c *cli.Context) {
 					cfgFile := c.String("config")
-					cfg, err := loadConfig(cfgFile, c)
+					cfg, err := LoadConfig(cfgFile, c)
 					So(err, ShouldEqual, nil)
 					So(cfg.Server.Addr, ShouldEqual, "127.0.0.1")
 				}
@@ -83,7 +83,7 @@ func TestConfig(t *testing.T) {
 				app.Action = func(c *cli.Context) {
 					cfgFile := c.String("config")
 					So(cfgFile, ShouldEqual, tmpfile.Name())
-					conf, err := loadConfig(cfgFile, c)
+					conf, err := LoadConfig(cfgFile, c)
 					So(err, ShouldEqual, nil)
 					So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
 					So(conf.Server.Port, ShouldEqual, 5000)
@@ -99,7 +99,7 @@ func TestConfig(t *testing.T) {
 				app.Action = func(c *cli.Context) {
 					cfgFile := c.String("config")
 					So(cfgFile, ShouldEqual, "")
-					conf, err := loadConfig(cfgFile, c)
+					conf, err := LoadConfig(cfgFile, c)
 					So(err, ShouldEqual, nil)
 					So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
 					So(conf.Server.Port, ShouldEqual, 5001)
@@ -119,7 +119,7 @@ func TestConfig(t *testing.T) {
 				app.Action = func(c *cli.Context) {
 					cfgFile := c.String("config")
 					So(cfgFile, ShouldEqual, tmpfile.Name())
-					conf, err := loadConfig(cfgFile, c)
+					conf, err := LoadConfig(cfgFile, c)
 					So(err, ShouldEqual, nil)
 					So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
 					So(conf.Server.Port, ShouldEqual, 5000)