Lots more updates for TOML -> Env vars

Author: relistan

README.md

@@ -158,34 +158,39 @@ out the values that were used. The environment variable are as follows.
 Defaults are in bold at the end of the line:
 
  * `SIDECAR_LOGGING_LEVEL`: The logging level to use (debug, info, warn, error)
-   *info**
+   **info**
  * `SIDECAR_LOGGING_FORMAT`: Logging format to use (text, json) **text**
  * `SIDECAR_DISCOVERY`: Which discovery backends to use as a csv array 
-   (static, docker) *`[ docker ]`**
+   (static, docker) **`[ docker ]`**
+ * `SIDECAR_SEEDS`: csv array of IP addresses used to seed the cluster.
+ * `SIDECAR_CLUSTER_NAME`: The name of the Sidecar cluster. Restricts membership
+   to hosts with the same cluster name.
+ * `SIDECAR_ADVERTISE_IP`: Manually override the IP address Sidecar uers for
+   cluster membership.
  * `SIDECAR_EXCLUDE_IPS`: csv array of IPs to exclude from interface selection
-   *`[ 192.168.168.168 ]`**
+   **`[ 192.168.168.168 ]`**
  * `SIDECAR_STATS_ADDR`: An address to send performance stats to. **none**
  * `SIDECAR_PUSH_PULL_INTERVAL`: How long to wait between anti-entropy syncs.
-   *20s**
+   **20s**
  * `SIDECAR_GOSSIP_MESSAGES`: How many times to gather messages per round. **15**
  * `SIDECAR_DEFAULT_CHECK_ENDPOINT`: Default endpoint to health check services
-   on *`/version`**
+   on **`/version`**
 
  * `SERVICES_NAMER`: Which method to use to extract service names. In both
-   cases it will fall back to image name. (docker_label, regex) *`docker_label`**.
+   cases it will fall back to image name. (`docker_label`, `regex`) **`docker_label`**.
  * `SERVICES_NAME_MATCH`: The regexp to use to extract the service name
    from the container name.
  * `SERVICES_NAME_LABEL`: The Docker label to use to identify service names
    `ServiceName`
 
  * `DOCKER_URL`: How to connect to Docker if Docker discovery is enabled.
-   *`unix:///var/run/docker.sock`**
+   **`unix:///var/run/docker.sock`**
 
  * `STATIC_CONFIG_FILE`: The config file to use if static discovery is enabled
-   *`static.json`**
+   **`static.json`**
 
- * `LISTENER_URLS`: If we want to statically configure any even listeners, the
-   URLs should go in a csv array here. See ***Listeners**** section below for more
+ * `LISTENER_URLS`: If we want to statically configure any event listeners, the
+   URLs should go in a csv array here. See **Listeners** section below for more
    on dynamic listeners.
 
  * `HAPROXY_DISABLE`: Disable management of HAproxy entirely. This is useful if
@@ -196,23 +201,25 @@ Defaults are in bold at the end of the line:
  * `HAPROXY_VERIFY_COMMAND`: The verify command to use for HAproxy **sane defaults**
  * `HAPROXY_BIND_IP`: The IP that HAproxy should bind to on the host **192.168.168.168**
  * `HAPROXY_TEMPLATE_FILE`: The source template file to use when writing HAproxy
-   configs. This is a Go text template. *`views/haproxy.cfg`**
+   configs. This is a Go text template. **`views/haproxy.cfg`**
  * `HAPROXY_CONFIG_FILE`: The path where the `haproxy.cfg` file will be written. Note
    that if you change this you will need to update the verify and reload commands.
-   *`/etc/haproxy.cfg`**
+   **`/etc/haproxy.cfg`**
  * `HAPROXY_PID_FILE`: The path where HAproxy's PID file will be written. Note
    that if you change this you will need to update the verify and reload commands.
-   *`/var/run/haproxy.pid`**
+   **`/var/run/haproxy.pid`**
  * `HAPROXY_USER`: The Unix user under which HAproxy should run **haproxy**
- * `HAPROXY_GROUP`: The Unix group under which HAproxy shoudl run **haproxy**
+ * `HAPROXY_GROUP`: The Unix group under which HAproxy should run **haproxy**
  * `HAPROXY_USE_HOSTNAMES`: Should we write hostnames in the HAproxy config instead
-   of IP addresses? *false**
+   of IP addresses? **`false`**
 
 ## Discovery
 
 Sidecar supports both Docker-based discovery and a discovery mechanism where
-you publish services into a JSON file locally, called "static". These can then be advertised as running services just like they would be from a Docker host. These are configured with the `SIDECAR_DISCOVERY` environment variable. Using both would 
-look like:
+you publish services into a JSON file locally, called "static". These can then
+be advertised as running services just like they would be from a Docker host.
+These are configured with the `SIDECAR_DISCOVERY` environment variable. Using
+both would look like:
 
 ```bash
 export SIDECAR_DISCOVERY=static,docker
@@ -227,7 +234,7 @@ Sidecar currently accepts a single option for Docker-based discovery, the URL
 to use to connect to Docker. Ideally this will be the same machine that Sidecar
 runs on because it makes assumptions about addresses. By default it will use
 the standard Docker Unix domain socket. You can change this with the
-`DOCKER_URL` env var. This needs to be a url that works with teh Docker client.
+`DOCKER_URL` env var. This needs to be a url that works with the Docker client.
 
 Note that Sidecar only supports a *single* URL, unlike the Docker CLI tool.
 

addresses.go

@@ -78,9 +78,9 @@ func findPrivateAddresses() ([]*net.IP, error) {
 	return result, err
 }
 
-func getPublishedIP(excluded []string, advertise *string) (string, error) {
-	if advertise != nil && *advertise != "" {
-		return *advertise, nil
+func getPublishedIP(excluded []string, advertise string) (string, error) {
+	if advertise != "" {
+		return advertise, nil
 	}
 
 	addresses, _ := findPrivateAddresses()

addresses_test.go

@@ -36,15 +36,15 @@ func Test_Addresses(t *testing.T) {
 		ip := "10.10.10.10"
 
 		Convey("Returns the advertised IP if supplied", func() {
-			result, err := getPublishedIP([]string{}, &ip)
+			result, err := getPublishedIP([]string{}, ip)
 			So(err, ShouldBeNil)
 			So(result, ShouldEqual, ip)
 		})
 
 		// See caveat for findPrivateAddresses() above
 		Convey("Returns an address", func() {
 			addresses, _ := findPrivateAddresses()
-			result, err := getPublishedIP([]string{}, nil)
+			result, err := getPublishedIP([]string{}, "")
 
 			So(err, ShouldBeNil)
 			So(result, ShouldResemble, addresses[0].String())

cli.go

@@ -30,7 +30,7 @@ func parseCommandLine() *CliOpts {
 
 	opts.AdvertiseIP = app.Flag("advertise-ip", "The address to advertise to the cluster").Short('a').String()
 	opts.ClusterIPs = app.Flag("cluster-ip", "The cluster seed addresses").Required().Short('c').NoEnvar().Strings()
-	opts.ClusterName = app.Flag("cluster-name", "The cluster we're part of").Short('n').Default("default").String()
+	opts.ClusterName = app.Flag("cluster-name", "The cluster we're part of").Short('n').String()
 	opts.CpuProfile = app.Flag("cpuprofile", "Enable CPU profiling").Short('p').Bool()
 	opts.Discover = app.Flag("discover", "Method of discovery").Short('d').NoEnvar().Strings()
 	opts.HAproxyDisable = app.Flag("haproxy-disable", "Disable managing HAproxy").Short('x').Bool()

config.go

@@ -39,6 +39,9 @@ type SidecarConfig struct {
 	LoggingFormat        string        `envconfig:"LOGGING_FORMAT"`
 	LoggingLevel         string        `envconfig:"LOGGING_LEVEL" default:"info"`
 	DefaultCheckEndpoint string        `envconfig:"DEFAULT_CHECK_ENDPOINT" default:"/version"`
+	Seeds                []string      `envconfig:"SEEDS"`
+	ClusterName          string        `envconfig:"CLUSTER_NAME" default:"default"`
+	AdvertiseIP          string        `envconfig:"ADVERTISE_IP"`
 }
 
 type DockerConfig struct {
@@ -58,7 +61,7 @@ type Config struct {
 	Listeners       ListenerUrlsConfig // LISTENERS_
 }
 
-func parseConfig(path string) Config {
+func parseConfig() Config {
 	var config Config
 
 	errs := []error{

docker/README.md

@@ -38,16 +38,6 @@ binding.
 the seed. You'll want to set this to one or more IP addresses or hostnames
 of the cluster seed hosts.
 
-```
-SIDECAR_SEEDS="seed1 host2 seed3" # Required
-ADVERTISE_IP="192.168.168.5"      # Optional
-SIDECAR_LOGGING_LEVEL="debug"     # Optional
-SIDECAR_CLUSTER_NAME="some-name"  # Optional
-```
-
-The seed hosts passed via `SIDECAR_SEEDS` are formatted as
-`--cluster-ip` arguments to Sidecar.
-
 As mentioned above, the default configuration is all set up with the
 expectation that you will map `/var/run/docker.sock` into the container.  This
 is where Docker usually writes its Unix socket. If you want to use TCP to

docker/run

@@ -4,4 +4,4 @@
 
 IMAGE=$1
 echo "Starting from $IMAGE"
-docker run -i -t -v /var/run/docker.sock:/var/run/docker.sock --label SidecarDiscover=false -e SIDECAR_LOGGING_LEVEL=debug -e SIDECAR_SEEDS="127.0.0.1" -e SIDECAR_HAPROXY_DISABLE=true --net=host --cap-add NET_ADMIN $IMAGE
+docker run -i -t -v /var/run/docker.sock:/var/run/docker.sock --label SidecarDiscover=false -e SIDECAR_LOGGING_LEVEL=debug -e SIDECAR_SEEDS="127.0.0.1" -e HAPROXY_DISABLE=true --net=host --cap-add NET_ADMIN $IMAGE

docker/s6/services/sidecar.svc/run

@@ -5,33 +5,6 @@ for entry in $SIDECAR_SEEDS; do
 	CLI="$CLI --cluster-ip $entry"
 done
 
-if [[ -n "$SIDECAR_DISCOVERY" ]]; then
-	for entry in $SIDECAR_DISCOVERY; do
-		CLI="$CLI --discover $entry"
-	done
-fi
-
-# Only do some substitutions on the first run (sed creates .bak file)
-if [[ ! -f /sidecar/sidecar.toml.bak ]]; then
-	# Allow adding a subscriber URL to the listeners
-	if [[ -n "$SIDECAR_LISTENER" ]]; then
-		# Use ~ rather than / since this is usually an URL
-		sed -i.bak 's~^urls *= *\[~urls = \[ "'"$SIDECAR_LISTENER"'", ~' sidecar.toml
-	fi
-
-	# Update the bind_ip if set as an env var to override the original
-	if [[ -n "$BIND_IP" ]]; then
-		sed -i.bak 's~^bind_ip *=.*$~bind_ip = "'"$BIND_IP"'"~' sidecar.toml
-	fi
-
-	# If we're disabling IP addresses in the HAproxy configs
-	if [[ -n "$USE_HOSTNAMES" ]]; then
-		sed -i.bak 's~^use_hostnames *=.*$~use_hostnames = '$USE_HOSTNAMES'~' sidecar.toml
-	fi
-fi
-
-BIND_IP=`grep bind_ip sidecar.toml | grep -o "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*"`
-
 # If there's a BIND_IP and we don't already have it, add the
 # address to the loopback interface.
 if [[ -n "$BIND_IP" ]] && [[ $BIND_IP != "0.0.0.0" ]]; then