Merge pull request #6 from soyking/dep/adjust-etcd

dep: adjust etcd dependencies

README.md

@@ -19,7 +19,7 @@ When listing/deleting a directory, e3ch will get key-value with the prefix. For
 package main
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"github.com/soyking/e3ch"
 )
 

auth.go

@@ -3,8 +3,8 @@ package client
 import (
 	"strings"
 
-	"go.etcd.io/etcd/auth/authpb"
-	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/api/v3/authpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 func (clt *EtcdHRCHYClient) permPath(key string) (string, error) {

auth_test.go

@@ -2,7 +2,8 @@ package client
 
 import (
 	"encoding/json"
-	"go.etcd.io/etcd/clientv3"
+
+	clientv3 "go.etcd.io/etcd/client/v3"
 	. "gopkg.in/check.v1"
 )
 

client.go

@@ -1,11 +1,12 @@
 package client
 
 import (
+	"context"
 	"errors"
-	"go.etcd.io/etcd/clientv3"
-	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
-	"golang.org/x/net/context"
 	"strings"
+
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 const (

client_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	. "gopkg.in/check.v1"
 )
 

create_test.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	. "gopkg.in/check.v1"
 )
 

delete.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // list a directory

delete_test.go

@@ -1,9 +1,10 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
-	. "gopkg.in/check.v1"
 	"strconv"
+
+	clientv3 "go.etcd.io/etcd/client/v3"
+	. "gopkg.in/check.v1"
 )
 
 const (

get_test.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	. "gopkg.in/check.v1"
 )
 

go.mod

@@ -3,7 +3,7 @@ module github.com/soyking/e3ch
 go 1.14
 
 require (
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
-	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
+	go.etcd.io/etcd/api/v3 v3.5.2
+	go.etcd.io/etcd/client/v3 v3.5.2
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 )

list.go

@@ -1,9 +1,10 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
-	mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
 	"strings"
+
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // list a directory

list_test.go

@@ -2,9 +2,10 @@ package client
 
 import (
 	"encoding/json"
-	"go.etcd.io/etcd/clientv3"
-	. "gopkg.in/check.v1"
 	"strconv"
+
+	clientv3 "go.etcd.io/etcd/client/v3"
+	. "gopkg.in/check.v1"
 )
 
 const (

put.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // set kv or directory

put_test.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	. "gopkg.in/check.v1"
 )