Bugfix: config.Etcd.Mandatory must not be nil (#49)

Author: cyrilst

pkg/utils/config.go

@@ -33,9 +33,10 @@ var (
 	defaultAlgorithm = "ordered"
 	// defaultMode is the default mode used to find a route if no other mode is
 	// specified in the configuration.
-	defaultMode    = "sticky"
-	defaultService = "default"
-	defaultDest    = []string{}
+	defaultMode          = "sticky"
+	defaultService       = "default"
+	defaultDest          = []string{}
+	defaultEtcdMandatory = false
 )
 
 var cachedConfig Config
@@ -427,6 +428,10 @@ func LoadConfig(filename, currentUsername, sid string, start time.Time, groups m
 		cachedConfig.SSH.Args = defaultSSHArgs
 	}
 
+	if cachedConfig.Etcd.Mandatory == nil {
+		cachedConfig.Etcd.Mandatory = defaultEtcdMandatory
+	}
+
 	if cachedConfig.RouteSelect == "" {
 		cachedConfig.RouteSelect = defaultAlgorithm
 	}

pkg/utils/config_test.go

@@ -75,7 +75,7 @@ var loadConfigTests = []struct {
 		"config.dump = ",
 		"config.dump_limit_size = 0",
 		"config.dump_limit_window = 0s",
-		"config.etcd = {Endpoints:[] TLS:{CAFile: KeyFile: CertFile:} Username: Password: KeyTTL:0 Mandatory:<nil>}",
+		"config.etcd = {Endpoints:[] TLS:{CAFile: KeyFile: CertFile:} Username: Password: KeyTTL:0 Mandatory:false}",
 		"config.etcd_stats_interval = 0s",
 		"config.log_stats_interval = 0s",
 		"config.blocking_command = ",
@@ -116,7 +116,7 @@ var loadConfigTests = []struct {
 		"config.dump = ",
 		"config.dump_limit_size = 0",
 		"config.dump_limit_window = 0s",
-		"config.etcd = {Endpoints:[] TLS:{CAFile: KeyFile: CertFile:} Username: Password: KeyTTL:0 Mandatory:<nil>}",
+		"config.etcd = {Endpoints:[] TLS:{CAFile: KeyFile: CertFile:} Username: Password: KeyTTL:0 Mandatory:false}",
 		"config.etcd_stats_interval = 0s",
 		"config.log_stats_interval = 0s",
 		"config.blocking_command = ",