Merge pull request #8 from Nitro/relistan/modernize-some-more

Clean up, stop vendoring, import haproxy module

Author: relistan

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.12.x
+  - 1.16.x
 
 sudo: required
 

config.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
-	"github.com/Nitro/sidecar/haproxy"
+	"github.com/Nitro/haproxy-api/haproxy"
 	"github.com/kelseyhightower/envconfig"
 	log "github.com/sirupsen/logrus"
 )

go.mod

@@ -4,40 +4,42 @@ go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/Microsoft/go-winio v0.4.12 // indirect
+	github.com/Microsoft/hcsshim v0.8.16 // indirect
 	github.com/Nitro/memberlist v0.0.0-20170522194404-cfac2b5cf519 // indirect
-	github.com/Nitro/sidecar v1.3.1
-	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
-	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
-	github.com/armon/go-metrics v0.0.0-20171002182731-9a4b6e10bed6 // indirect
+	github.com/Nitro/sidecar v2.1.0+incompatible
+	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
+	github.com/armon/go-metrics v0.3.6 // indirect
+	github.com/containerd/continuity v0.0.0-20210315143101-93e15499afd5 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/fsouza/go-dockerclient v1.3.6 // indirect
-	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/golang/protobuf v1.3.1 // indirect
+	github.com/docker/docker v20.10.6+incompatible // indirect
+	github.com/fsouza/go-dockerclient v1.7.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
 	github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
 	github.com/gorilla/handlers v1.2.1
-	github.com/gorilla/mux v1.7.0
-	github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
-	github.com/hashicorp/go-immutable-radix v0.0.0-20170725221215-8aac27015308 // indirect
-	github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c // indirect
-	github.com/hashicorp/go-multierror v0.0.0-20170622060955-83588e72410a // indirect
-	github.com/hashicorp/go-sockaddr v0.0.0-20170627023441-41949a141473 // indirect
-	github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad // indirect
+	github.com/gorilla/mux v1.8.0
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
+	github.com/hashicorp/go-msgpack v1.1.5 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
-	github.com/kelseyhightower/envconfig v1.3.0
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/miekg/dns v0.0.0-20171019064225-822ae18e7187 // indirect
+	github.com/kelseyhightower/envconfig v1.4.0
+	github.com/miekg/dns v1.1.41 // indirect
 	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
-	github.com/pquerna/ffjson v0.0.0-20171002144729-d49c2bc1aa13 // indirect
-	github.com/relistan/go-director v0.0.0-20161014141051-9273dae8c839
+	github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect
+	github.com/relistan/go-director v0.0.0-20200406104025-dbbf5d95248d
 	github.com/relistan/rubberneck v1.0.1
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/sirupsen/logrus v1.4.1
+	github.com/sirupsen/logrus v1.8.1
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20170602164621-9e8dc3f972df
-	google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect
-	google.golang.org/grpc v1.19.1 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.5
+	github.com/smartystreets/goconvey v1.6.4
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 // indirect
+	golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750 // indirect
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+	gopkg.in/relistan/rubberneck.v1 v1.1.0 // indirect
 )

go.sum

@@ -43,7 +43,7 @@ type HAproxy struct {
 
 // Constructs a properly configured HAProxy and returns a pointer to it
 func New(configFile string, pidFile string) *HAproxy {
-	reloadCmd := "haproxy -f " + configFile + " -p " + pidFile + " `[[ -f " + pidFile + " ]] && echo \"-sf $(cat " + pidFile + ")\"]]`"
+	reloadCmd := "haproxy -f " + configFile + " -p " + pidFile + " `[[ -f " + pidFile + " ]] && echo \"-sf $(cat " + pidFile + ")\"`"
 	verifyCmd := "haproxy -c -f " + configFile
 
 	proxy := HAproxy{
@@ -184,7 +184,10 @@ func (h *HAproxy) WriteConfig(state *catalog.ServicesState, output io.Writer) er
 	}
 
 	// This is the potentially slowest bit, do it outside the critical section
-	io.Copy(output, buf)
+	_, err = io.Copy(output, buf)
+	if err != nil {
+		return fmt.Errorf("Error writing template '%s': %s", h.Template, err.Error())
+	}
 
 	return nil
 }
@@ -210,15 +213,15 @@ func (h *HAproxy) swallowSignals() {
 		}
 	}()
 
-	signal.Notify(sigChan, syscall.SIGSTOP, syscall.SIGTSTP, syscall.SIGTTIN, syscall.SIGTTOU)
+	signal.Notify(sigChan, syscall.SIGTSTP, syscall.SIGTTIN, syscall.SIGTTOU)
 }
 
 // ResetSignals unhooks our signal handler from the signals the sub-commands
 // initiate. This is potentially destructive if other places in the program have
-// hooked to the same signals! Affected signals are SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU.
+// hooked to the same signals! Affected signals are SIGTSTP, SIGTTIN, SIGTTOU.
 func (h *HAproxy) ResetSignals() {
 	h.sigLock.Lock()
-	signal.Reset(syscall.SIGSTOP, syscall.SIGTSTP, syscall.SIGTTIN, syscall.SIGTTOU)
+	signal.Reset(syscall.SIGTSTP, syscall.SIGTTIN, syscall.SIGTTOU)
 	select {
 	case h.sigStopChan <- struct{}{}: // nothing
 	default:
@@ -286,7 +289,10 @@ func (h *HAproxy) Watch(state *catalog.ServicesState) {
 		}
 	}
 
-	state.RemoveListener(h.Name())
+	err := state.RemoveListener(h.Name())
+	if err != nil {
+		log.Warnf("Failed to remove HAProxy listener: %s", err)
+	}
 }
 
 // Write out the the HAproxy config and reload the service.
@@ -331,7 +337,12 @@ func getModes(state *catalog.ServicesState) map[string]string {
 	modeMap := make(map[string]string)
 	state.EachService(
 		func(hostname *string, serviceId *string, svc *service.Service) {
-			modeMap[svc.Name] = svc.ProxyMode
+			mode := svc.ProxyMode
+			// Treat websockets like HTTP
+			if mode == "ws" {
+				mode = "http"
+			}
+			modeMap[svc.Name] = mode
 		},
 	)
 	return modeMap