deps(etcd) Update to new etcd client version v3.5.0, go mod friendly

Author: Soulou

Diff for: etcd/client.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	etcdutils "github.com/Scalingo/go-utils/etcd"
-	"go.etcd.io/etcd/v3/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/pkg/errors"
 )

Diff for: etcd/watcher.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"go.etcd.io/etcd/v3/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type Watcher struct {

Diff for: go.mod

@@ -4,19 +4,22 @@ go 1.15
 
 require (
 	github.com/Microsoft/go-winio v0.4.16 // indirect
-	github.com/Scalingo/go-etcd-lock/v5 v5.0.4
+	github.com/Scalingo/go-etcd-lock/v5 v5.0.5
 	github.com/Scalingo/go-handlers v1.4.0
 	github.com/Scalingo/go-plugins-helpers v1.3.0
-	github.com/Scalingo/go-utils/etcd v1.0.1
+	github.com/Scalingo/go-utils/etcd v1.1.0
 	github.com/Scalingo/go-utils/graceful v1.0.0
 	github.com/Scalingo/go-utils/logger v1.0.0
+	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/docker/docker v1.13.1
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-plugins-helpers v0.0.0-20200102110956-c9a8a2d92ccc // indirect
 	github.com/docker/libnetwork v0.8.0-dev.2.0.20171213192018-26531e56a76d
 	github.com/gofrs/uuid v3.4.0+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/kelseyhightower/envconfig v1.4.0
+	github.com/kr/text v0.2.0 // indirect
 	github.com/magefile/mage v1.11.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
@@ -25,9 +28,17 @@ require (
 	github.com/vishvananda/netlink v1.0.0
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
 	github.com/willf/bitset v1.1.11
-	go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200826232710-c20cc05fc548
+	go.etcd.io/etcd/api/v3 v3.5.0
+	go.etcd.io/etcd/client/v3 v3.5.0
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.7.0 // indirect
+	go.uber.org/zap v1.18.1 // indirect
+	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	google.golang.org/genproto v0.0.0-20210729151513-df9385d47c1b // indirect
 	// This shouldn't be upgraded as long as go.etcd.io/etcd/v3 has not been updated.
 	// Waiting for etcd 3.5 release: https://github.com/etcd-io/etcd/issues/12124
-	google.golang.org/grpc v1.29.1
+	google.golang.org/grpc v1.39.0
 	gopkg.in/errgo.v1 v1.0.1
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

Diff for: go.sum

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/client/v3"
 
 	"github.com/Scalingo/go-utils/logger"
 	"github.com/Scalingo/sand/api/types"

Diff for: network/overlay/listener.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/Scalingo/sand/api/types"
 	"github.com/Scalingo/sand/config"

Diff for: network/overlay/listener_test.go

@@ -3,7 +3,7 @@ package store
 import (
 	"io"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/Scalingo/sand/etcd"
 	"github.com/pkg/errors"

Diff for: store/etcd.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"go.etcd.io/etcd/v3/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/Scalingo/go-utils/logger"
 	"github.com/Scalingo/sand/config"

Diff for: store/etcd_watcher_mock.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"sync"
 
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
+	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"google.golang.org/grpc/codes"
 
 	"github.com/Scalingo/go-utils/logger"

Diff for: store/store.go

@@ -9,20 +9,20 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.etcd.io/etcd/v3/clientv3"
-	"go.etcd.io/etcd/v3/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	"go.etcd.io/etcd/client/v3"
 )
 
 func TestWatcher_Register(t *testing.T) {
 	cases := map[string]struct {
 		registrationKey string
-		expect          func(t *testing.T, w Watcher, in chan clientv3.WatchResponse, r Registration)
+		expect          func(t *testing.T, w Watcher, in chan client.WatchResponse, r Registration)
 	}{
 		"it should get an event impacting a subkey": {
 			registrationKey: "/prefix/subkey1",
-			expect: func(t *testing.T, w Watcher, in chan clientv3.WatchResponse, r Registration) {
-				in <- clientv3.WatchResponse{
-					Events: []*clientv3.Event{{
+			expect: func(t *testing.T, w Watcher, in chan client.WatchResponse, r Registration) {
+				in <- client.WatchResponse{
+					Events: []*client.Event{{
 						Kv:   &mvccpb.KeyValue{Key: []byte("/sc-net/prefix/subkey1/key1")},
 						Type: mvccpb.PUT,
 					}},
@@ -34,11 +34,11 @@ func TestWatcher_Register(t *testing.T) {
 		},
 		"it should not get an event after unregistration": {
 			registrationKey: "/prefix/subkey2",
-			expect: func(t *testing.T, w Watcher, in chan clientv3.WatchResponse, r Registration) {
+			expect: func(t *testing.T, w Watcher, in chan client.WatchResponse, r Registration) {
 				r.Unregister()
 				// buffered chan, non blocking operation
-				in <- clientv3.WatchResponse{
-					Events: []*clientv3.Event{{Kv: &mvccpb.KeyValue{}}},
+				in <- client.WatchResponse{
+					Events: []*client.Event{{Kv: &mvccpb.KeyValue{}}},
 				}
 				select {
 				case _, ok := <-r.EventChan():
@@ -50,8 +50,8 @@ func TestWatcher_Register(t *testing.T) {
 		},
 		"it should log an error and keep on listening until the chan is closed": {
 			registrationKey: "/prefix/subkey3",
-			expect: func(t *testing.T, w Watcher, in chan clientv3.WatchResponse, r Registration) {
-				in <- clientv3.WatchResponse{
+			expect: func(t *testing.T, w Watcher, in chan client.WatchResponse, r Registration) {
+				in <- client.WatchResponse{
 					Canceled: true,
 				}
 				select {
@@ -69,9 +69,9 @@ func TestWatcher_Register(t *testing.T) {
 			defer ctrl.Finish()
 
 			etcdWatcher := NewMockEtcdWatcher(ctrl)
-			incomingEvents := make(chan clientv3.WatchResponse, 1)
+			incomingEvents := make(chan client.WatchResponse, 1)
 
-			etcdWatcher.EXPECT().WatchChan().Return(clientv3.WatchChan(incomingEvents))
+			etcdWatcher.EXPECT().WatchChan().Return(client.WatchChan(incomingEvents))
 			etcdWatcher.EXPECT().Close().Return(nil)
 
 			config, err := config.Build()