Merge pull request #49 from Scalingo/deps/etcd/3.5.0

Bump etcd client to 3.5.0 (v2.305.0) and also bump to Go 1.16

.gitignore

@@ -1,4 +1,7 @@
 *.test
 .*swp
 *~
-Godeps/_workspace
+
+# IDE
+.idea/
+.vscode/

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## To Be Released
 
+* Bump etcd client to 3.5.0 (v2.305.0) and also bump to Go 1.16
+  [#49](https://github.com/Scalingo/etcd-discovery/pull/49)
 * Bump github.com/golang/mock from 1.4.4 to 1.6.0
+  [#46](https://github.com/Scalingo/etcd-discovery/pull/46)
+  and [#47](https://github.com/Scalingo/etcd-discovery/pull/47)
 
 ## v7.0.3
 

README.md

@@ -1,8 +1,8 @@
 # Etcd Discovery v7.0.3
 
-This is a golang package for managing services over the decentralized key-value store etcd
+This is a golang package for managing services over the decentralized key-value store etcd.
 
-> http://github.com/coreos/etcd
+> https://github.com/etcd-io/etcd
 
 To install it:
 
@@ -110,7 +110,7 @@ Generate the mocks with:
 ```shell
 for interface in $(grep --extended-regexp --no-message --no-filename "type .* interface" ./service/* | cut -d " " -f 2)
 do
-  mockgen -destination service/servicemock/gomock_$(echo $interface | tr '[:upper:]' '[:lower:]').go -package servicemock github.com/Scalingo/etcd-discovery/service $interface
+  mockgen -destination service/servicemock/gomock_$(echo $interface | tr '[:upper:]' '[:lower:]').go -package servicemock github.com/Scalingo/etcd-discovery/v7/service $interface
 done
 ```
 

go.mod

@@ -1,15 +1,19 @@
 module github.com/Scalingo/etcd-discovery/v7
 
-go 1.15
+go 1.16
 
 require (
-	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/gofrs/uuid v3.4.0+incompatible
 	github.com/golang/mock v1.6.0
-	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/smartystreets/goconvey v1.6.4
-	go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200826232710-c20cc05fc548
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0
+	// The latest versions of etcd have been migrated to go modules.
+	// Since this change the version of the etcd client we are currently
+	// using in this package has been named v2.
+	// This does not mean that it does not work with the etcd server version 3.
+	//
+	// The package "go.etcd.io/etcd/client/v3" is a complete refactoring
+	// of the client and uses grpc instead of http, that we currently use.
+	go.etcd.io/etcd/client/v2 v2.305.0
 	gopkg.in/errgo.v1 v1.0.1
 )

service/get.go

@@ -1,9 +1,10 @@
 package service
 
 import (
-	etcd "go.etcd.io/etcd/v3/client"
-	"golang.org/x/net/context"
-	errgo "gopkg.in/errgo.v1"
+	"context"
+
+	etcd "go.etcd.io/etcd/client/v2"
+	"gopkg.in/errgo.v1"
 )
 
 // ServiceResponse is the interface used to provide a response to the service.Get() Method.

service/host.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	errgo "gopkg.in/errgo.v1"
+	"gopkg.in/errgo.v1"
 )
 
 // Ports is a representation of the ports exposed by a host or a service.

service/init.go

@@ -15,8 +15,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "go.etcd.io/etcd/v3/client"
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 var (

service/parser.go

@@ -3,9 +3,8 @@ package service
 import (
 	"encoding/json"
 
-	errgo "gopkg.in/errgo.v1"
-
-	etcd "go.etcd.io/etcd/v3/client"
+	etcd "go.etcd.io/etcd/client/v2"
+	"gopkg.in/errgo.v1"
 )
 
 func buildHostsFromNodes(nodes etcd.Nodes) (Hosts, error) {

service/parser_test.go

@@ -3,8 +3,8 @@ package service
 import (
 	"testing"
 
-	etcd "go.etcd.io/etcd/v3/client"
 	. "github.com/smartystreets/goconvey/convey"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 var (

service/register.go

@@ -1,15 +1,14 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"time"
 
-	errgo "gopkg.in/errgo.v1"
-
-	etcd "go.etcd.io/etcd/v3/client"
 	"github.com/gofrs/uuid"
-	"golang.org/x/net/context"
+	etcd "go.etcd.io/etcd/client/v2"
+	"gopkg.in/errgo.v1"
 )
 
 const (
@@ -39,9 +38,8 @@ func Register(ctx context.Context, service string, host Host) *Registration {
 		host.PrivatePorts = host.Ports
 	}
 
-	uuid, _ := uuid.NewV4()
-
-	hostUuid := fmt.Sprintf("%s-%s", uuid.String(), host.PrivateHostname)
+	uuidV4, _ := uuid.NewV4()
+	hostUuid := fmt.Sprintf("%s-%s", uuidV4.String(), host.PrivateHostname)
 	host.UUID = hostUuid
 
 	serviceInfos := &Service{

service/register_test.go

@@ -1,15 +1,15 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"path"
 	"testing"
 	"time"
 
-	etcd "go.etcd.io/etcd/v3/client"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 func TestRegister(t *testing.T) {

service/service.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"math/rand"
 
-	etcd "go.etcd.io/etcd/v3/client"
-	errgo "gopkg.in/errgo.v1"
+	etcd "go.etcd.io/etcd/client/v2"
+	"gopkg.in/errgo.v1"
 )
 
 // Service store all the informatiosn about a service. This is also used to marshal services present in the /services_infos/ directory.

service/subscribe.go

@@ -1,11 +1,10 @@
 package service
 
 import (
+	"context"
 	"path"
 
-	"golang.org/x/net/context"
-
-	etcd "go.etcd.io/etcd/v3/client"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 // Subscribe to every event that happen to a service