Merge pull request #2622 from hashicorp/f-2594-support-consul-unix

Update consul/api to support unix socket addrs

CHANGELOG.md

@@ -11,6 +11,7 @@ IMPROVEMENTS:
    addresses [GH-2536]
  * client: Hash host ID so its stable and well distributed [GH-2541]
  * client: Environment variables for client DC and Region [GH-2507]
+ * config: Support Unix socket addresses for Consul [GH-2622]
  * driver/docker: Allow specifying extra hosts [GH-2547]
  * driver/docker: Allow setting container IP with user defined networks
    [GH-2535]

client/consul_template_test.go

@@ -121,7 +121,10 @@ func newTestHarness(t *testing.T, templates []*structs.Template, consul, vault b
 	harness.taskDir = d
 
 	if consul {
-		harness.consul = ctestutil.NewTestServer(t)
+		harness.consul, err = ctestutil.NewTestServer()
+		if err != nil {
+			t.Fatalf("error starting test Consul server: %v", err)
+		}
 		harness.config.ConsulConfig = &sconfig.ConsulConfig{
 			Addr: harness.consul.HTTPAddr,
 		}
@@ -445,7 +448,7 @@ func TestTaskTemplateManager_Unblock_Consul(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(key, []byte(content))
+	harness.consul.SetKV(t, key, []byte(content))
 
 	// Wait for the unblock
 	select {
@@ -563,7 +566,7 @@ func TestTaskTemplateManager_Unblock_Multi_Template(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(consulKey, []byte(consulContent))
+	harness.consul.SetKV(t, consulKey, []byte(consulContent))
 
 	// Wait for the unblock
 	select {
@@ -612,7 +615,7 @@ func TestTaskTemplateManager_Rerender_Noop(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(key, []byte(content1))
+	harness.consul.SetKV(t, key, []byte(content1))
 
 	// Wait for the unblock
 	select {
@@ -633,7 +636,7 @@ func TestTaskTemplateManager_Rerender_Noop(t *testing.T) {
 	}
 
 	// Update the key in Consul
-	harness.consul.SetKV(key, []byte(content2))
+	harness.consul.SetKV(t, key, []byte(content2))
 
 	select {
 	case <-harness.mockHooks.RestartCh:
@@ -697,8 +700,8 @@ func TestTaskTemplateManager_Rerender_Signal(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(key1, []byte(content1_1))
-	harness.consul.SetKV(key2, []byte(content2_1))
+	harness.consul.SetKV(t, key1, []byte(content1_1))
+	harness.consul.SetKV(t, key2, []byte(content2_1))
 
 	// Wait for the unblock
 	select {
@@ -712,8 +715,8 @@ func TestTaskTemplateManager_Rerender_Signal(t *testing.T) {
 	}
 
 	// Update the keys in Consul
-	harness.consul.SetKV(key1, []byte(content1_2))
-	harness.consul.SetKV(key2, []byte(content2_2))
+	harness.consul.SetKV(t, key1, []byte(content1_2))
+	harness.consul.SetKV(t, key2, []byte(content2_2))
 
 	// Wait for signals
 	timeout := time.After(time.Duration(1*testutil.TestMultiplier()) * time.Second)
@@ -782,7 +785,7 @@ func TestTaskTemplateManager_Rerender_Restart(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(key1, []byte(content1_1))
+	harness.consul.SetKV(t, key1, []byte(content1_1))
 
 	// Wait for the unblock
 	select {
@@ -792,7 +795,7 @@ func TestTaskTemplateManager_Rerender_Restart(t *testing.T) {
 	}
 
 	// Update the keys in Consul
-	harness.consul.SetKV(key1, []byte(content1_2))
+	harness.consul.SetKV(t, key1, []byte(content1_2))
 
 	// Wait for restart
 	timeout := time.After(time.Duration(1*testutil.TestMultiplier()) * time.Second)
@@ -878,7 +881,7 @@ func TestTaskTemplateManager_Signal_Error(t *testing.T) {
 	harness.mockHooks.SignalError = fmt.Errorf("test error")
 
 	// Write the key to Consul
-	harness.consul.SetKV(key1, []byte(content1))
+	harness.consul.SetKV(t, key1, []byte(content1))
 
 	// Wait a little
 	select {
@@ -888,7 +891,7 @@ func TestTaskTemplateManager_Signal_Error(t *testing.T) {
 	}
 
 	// Write the key to Consul
-	harness.consul.SetKV(key1, []byte(content2))
+	harness.consul.SetKV(t, key1, []byte(content2))
 
 	// Wait for kill channel
 	select {

command/agent/consul/int_test.go

@@ -44,13 +44,16 @@ func TestConsul_Integration(t *testing.T) {
 		}
 	}
 	// Create an embedded Consul server
-	testconsul := testutil.NewTestServerConfig(t, func(c *testutil.TestServerConfig) {
+	testconsul, err := testutil.NewTestServerConfig(func(c *testutil.TestServerConfig) {
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
 			c.Stdout = ioutil.Discard
 			c.Stderr = ioutil.Discard
 		}
 	})
+	if err != nil {
+		t.Fatalf("error starting test consul server: %v", err)
+	}
 	defer testconsul.Stop()
 
 	conf := config.DefaultConfig()

nomad/structs/config/consul.go

@@ -143,7 +143,7 @@ func (a *ConsulConfig) Merge(b *ConsulConfig) *ConsulConfig {
 	return result
 }
 
-// ApiConfig() returns a usable Consul config that can be passed directly to
+// ApiConfig returns a usable Consul config that can be passed directly to
 // hashicorp/consul/api.  NOTE: datacenter is not set
 func (c *ConsulConfig) ApiConfig() (*consul.Config, error) {
 	config := consul.DefaultConfig()