Merge pull request #75 from mailgun/thrawn/develop

Revert to an actual etcd client that works

etcdutil/config.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
+	etcd "github.com/coreos/etcd/clientv3"
 	"github.com/mailgun/holster/v3/setter"
 	"github.com/pkg/errors"
-	etcd "go.etcd.io/etcd/clientv3"
 	"google.golang.org/grpc/grpclog"
 )
 

etcdutil/election.go

@@ -9,11 +9,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	etcd "github.com/coreos/etcd/clientv3"
+	"github.com/coreos/etcd/mvcc/mvccpb"
 	"github.com/mailgun/holster/v3/setter"
 	"github.com/mailgun/holster/v3/syncutil"
 	"github.com/pkg/errors"
-	etcd "go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
 type LeaderElector interface {

etcdutil/election_test.go

@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/Shopify/toxiproxy"
+	etcd "github.com/coreos/etcd/clientv3"
 	"github.com/mailgun/holster/v3/clock"
 	"github.com/mailgun/holster/v3/etcdutil"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	etcd "go.etcd.io/etcd/clientv3"
 )
 
 func TestElection(t *testing.T) {

etcdutil/session.go

@@ -5,10 +5,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	etcd "github.com/coreos/etcd/clientv3"
 	"github.com/mailgun/holster/v3/setter"
 	"github.com/mailgun/holster/v3/syncutil"
 	"github.com/pkg/errors"
-	etcd "go.etcd.io/etcd/clientv3"
 )
 
 const NoLease = etcd.LeaseID(-1)

etcdutil/session_test.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/Shopify/toxiproxy"
+	etcd "github.com/coreos/etcd/clientv3"
 	"github.com/mailgun/holster/v3/etcdutil"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	etcd "go.etcd.io/etcd/clientv3"
 )
 
 var proxy *toxiproxy.Proxy
@@ -24,7 +24,7 @@ func TestMain(m *testing.M) {
 	proxy.Listen = "0.0.0.0:2379"
 
 	if err := proxy.Start(); err != nil {
-		fmt.Printf("failed to start toxiproxy\n")
+		fmt.Printf("failed to start toxiproxy: %s\n", err)
 		os.Exit(1)
 	}
 

go.mod

@@ -6,37 +6,39 @@ require (
 	github.com/Shopify/toxiproxy v2.1.4+incompatible
 	github.com/ahmetb/go-linq v3.0.0+incompatible
 	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/etcd v3.3.25+incompatible // indirect
+	github.com/coreos/etcd v3.3.15+incompatible
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/gogo/protobuf v1.2.1 // indirect
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
 	github.com/google/btree v1.0.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/gorilla/mux v1.7.3 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.10.0 // indirect
 	github.com/hashicorp/consul/api v1.7.0
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/jonboulle/clockwork v0.1.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.1.0 // indirect
 	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/spf13/cobra v1.1.1 // indirect
 	github.com/stretchr/testify v1.4.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	go.etcd.io/bbolt v1.3.3 // indirect
-	go.etcd.io/etcd v3.3.25+incompatible
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
-	google.golang.org/grpc v1.33.2
-	google.golang.org/grpc/examples v0.0.0-20201109233353-aeb04798c556 // indirect
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
+	google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect
+	google.golang.org/grpc v1.23.0
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )