Merge pull request #37 from SunSince90/fix-etcd-packages

Fix etcd packages
CloudNativeSDWAN · Nov 5, 2021 · 30dbb8b · 30dbb8b
2 parents f3e2e84 + 69a97d9
commit 30dbb8b
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 131 deletions.
diff --git a/go.mod b/go.mod
@@ -3,25 +3,19 @@ module github.com/CloudNativeSDWAN/cnwan-reader
 go 1.14
 
 require (
-	cloud.google.com/go v0.72.0
-	github.com/CloudNativeSDWAN/cnwan-operator v0.3.0
-	github.com/aws/aws-sdk-go v1.37.2
-	github.com/google/go-cmp v0.5.4
+	cloud.google.com/go/servicedirectory v0.1.0
+	github.com/CloudNativeSDWAN/cnwan-operator v0.6.0
+	github.com/aws/aws-sdk-go v1.38.60
+	github.com/google/go-cmp v0.5.6
 	github.com/rs/zerolog v1.19.0
 	github.com/spf13/cobra v1.0.0
-	github.com/stretchr/testify v1.6.1
-	go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
-	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
-	google.golang.org/api v0.36.0
-	google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc
+	github.com/stretchr/testify v1.7.0
+	go.etcd.io/etcd/api/v3 v3.5.1
+	go.etcd.io/etcd/client/v3 v3.5.1
+	golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a
+	google.golang.org/api v0.54.0
+	google.golang.org/genproto v0.0.0-20210813162853-db860fec028c
 	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	k8s.io/api v0.18.6
 )
-
-replace (
-	github.com/coreos/etcd => github.com/coreos/etcd v3.3.25+incompatible
-	go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.5
-	go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 // ae9734ed278b is the SHA for git tag v3.4.13
-	google.golang.org/grpc => google.golang.org/grpc v1.27.1
-)
diff --git a/go.sum b/go.sum
diff --git a/pkg/cmd/watch/etcd/command.go b/pkg/cmd/watch/etcd/command.go
@@ -29,8 +29,8 @@ import (
 	"github.com/CloudNativeSDWAN/cnwan-reader/pkg/services"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/clientv3/namespace"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	namespace "go.etcd.io/etcd/client/v3/namespace"
 )
 
 var (
@@ -70,7 +70,7 @@ func GetEtcdCommand() *cobra.Command {
 				return
 			}
 
-			sr, _ := opetcd.NewServiceRegistryWithEtcd(context.Background(), cli, &options.Prefix)
+			sr := opetcd.NewServiceRegistryWithEtcd(context.Background(), cli, &options.Prefix)
 
 			watcher = &etcdWatcher{
 				options: options,

diff --git a/pkg/cmd/watch/etcd/fake_kv.go b/pkg/cmd/watch/etcd/fake_kv.go
@@ -19,7 +19,7 @@ package etcd
 import (
 	"context"
 
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type fakeKV struct {

diff --git a/pkg/cmd/watch/etcd/utils.go b/pkg/cmd/watch/etcd/utils.go
@@ -26,7 +26,7 @@ import (
 	opetcd "github.com/CloudNativeSDWAN/cnwan-operator/pkg/servregistry/etcd"
 	"github.com/CloudNativeSDWAN/cnwan-reader/pkg/openapi"
 	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/pkg/cmd/watch/etcd/watcher.go b/pkg/cmd/watch/etcd/watcher.go
@@ -25,8 +25,8 @@ import (
 	"github.com/CloudNativeSDWAN/cnwan-reader/pkg/openapi"
 	"github.com/CloudNativeSDWAN/cnwan-reader/pkg/queue"
 	"github.com/google/go-cmp/cmp"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/pkg/cmd/watch/etcd/watcher_test.go b/pkg/cmd/watch/etcd/watcher_test.go
@@ -25,8 +25,8 @@ import (
 	opetcd "github.com/CloudNativeSDWAN/cnwan-operator/pkg/servregistry/etcd"
 	"github.com/CloudNativeSDWAN/cnwan-reader/pkg/openapi"
 	"github.com/stretchr/testify/assert"
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"gopkg.in/yaml.v2"
 )