Merge pull request #4103 from ozkatz/testutil-server-consul

Support custom Consul config for TestServer

testutil/server.go

@@ -34,6 +34,7 @@ type TestServerConfig struct {
 	Region            string        `json:"region,omitempty"`
 	DisableCheckpoint bool          `json:"disable_update_check"`
 	LogLevel          string        `json:"log_level,omitempty"`
+	Consul            *Consul       `json:"consul,omitempty"`
 	AdvertiseAddrs    *Advertise    `json:"advertise,omitempty"`
 	Ports             *PortsConfig  `json:"ports,omitempty"`
 	Server            *ServerConfig `json:"server,omitempty"`
@@ -44,6 +45,13 @@ type TestServerConfig struct {
 	Stdout, Stderr    io.Writer     `json:"-"`
 }
 
+// Consul is used to configure the communication with Consul
+type Consul struct {
+	Address string `json:"address,omitempty"`
+	Auth    string `json:"auth,omitempty"`
+	Token   string `json:"token,omitempty"`
+}
+
 // Advertise is used to configure the addresses to advertise
 type Advertise struct {
 	HTTP string `json:"http,omitempty"`