Merge pull request #1349 from hashicorp/f-vault-service

Vault-driven Consul service registration and TTL checks.

command/config.go

@@ -53,9 +53,10 @@ func LoadConfig(path string) (*DefaultConfig, error) {
 		path = v
 	}
 
+	// NOTE: requires HOME env var to be set
 	path, err := homedir.Expand(path)
 	if err != nil {
-		return nil, fmt.Errorf("Error expanding config path: %s", err)
+		return nil, fmt.Errorf("Error expanding config path %s: %s", path, err)
 	}
 
 	contents, err := ioutil.ReadFile(path)

command/server.go

@@ -205,7 +205,7 @@ func (c *ServerCommand) Run(args []string) int {
 		coreConfig.AdvertiseAddr = envAA
 	}
 
-	// Attempt to detect the advertise address possible
+	// Attempt to detect the advertise address, if possible
 	var detect physical.AdvertiseDetect
 	if coreConfig.HAPhysical != nil {
 		detect, ok = coreConfig.HAPhysical.(physical.AdvertiseDetect)
@@ -286,6 +286,17 @@ func (c *ServerCommand) Run(args []string) int {
 		}
 	}
 
+	// If the backend supports service discovery, run service discovery
+	if coreConfig.HAPhysical != nil {
+		sd, ok := coreConfig.HAPhysical.(physical.ServiceDiscovery)
+		if ok {
+			if err := sd.RunServiceDiscovery(c.ShutdownCh, coreConfig.AdvertiseAddr); err != nil {
+				c.Ui.Error(fmt.Sprintf("Error initializing service discovery: %v", err))
+				return 1
+			}
+		}
+	}
+
 	// Initialize the listeners
 	lns := make([]net.Listener, 0, len(config.Listeners))
 	for i, lnConfig := range config.Listeners {

command/server/config.go

@@ -365,7 +365,7 @@ func parseBackends(result *Config, list *ast.ObjectList) error {
 		return multierror.Prefix(err, fmt.Sprintf("backend.%s:", key))
 	}
 
-	// Pull out the advertise address since it's commong to all backends
+	// Pull out the advertise address since it's common to all backends
 	var advertiseAddr string
 	if v, ok := m["advertise_addr"]; ok {
 		advertiseAddr = v
@@ -398,7 +398,7 @@ func parseHABackends(result *Config, list *ast.ObjectList) error {
 		return multierror.Prefix(err, fmt.Sprintf("ha_backend.%s:", key))
 	}
 
-	// Pull out the advertise address since it's commong to all backends
+	// Pull out the advertise address since it's common to all backends
 	var advertiseAddr string
 	if v, ok := m["advertise_addr"]; ok {
 		advertiseAddr = v

command/server_test.go

@@ -32,13 +32,15 @@ listener "tcp" {
 	consulhcl = `
 backend "consul" {
     prefix = "foo/"
-	advertise_addr = "http://127.0.0.1:8200"
+    advertise_addr = "http://127.0.0.1:8200"
+    disable_registration = "true"
 }
 `
 	haconsulhcl = `
 ha_backend "consul" {
     prefix = "bar/"
-	advertise_addr = "http://127.0.0.1:8200"
+    advertise_addr = "http://127.0.0.1:8200"
+    disable_registration = "true"
 }
 `