From c899316fe8eca84d7750f69e5394bc17a91f7bbf Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 15 Dec 2020 11:54:03 -0600 Subject: [PATCH 1/3] Adding `clientv3` import alias to match usage in `register_test.go`. --- tests/integration/proxy/grpcproxy/register_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go index 41a6871d3..d197f92c9 100644 --- a/tests/integration/proxy/grpcproxy/register_test.go +++ b/tests/integration/proxy/grpcproxy/register_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/naming" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" From 47dbeeb65a76c06ff0404d889b2ed64059330668 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 15 Dec 2020 12:05:26 -0600 Subject: [PATCH 2/3] Removing errant commented out `replace` line --- etcdctl/go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/etcdctl/go.mod b/etcdctl/go.mod index b0aebdbff..6ddfc993e 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -30,7 +30,6 @@ replace ( go.etcd.io/etcd/pkg/v3 => ../pkg go.etcd.io/etcd/raft/v3 => ../raft go.etcd.io/etcd/server/v3 => ../server -// go.etcd.io/etcd/v3 => ../ ) // Bad imports are sometimes causing attempts to pull that code. From 91bdc7eb49c12a8448a42218b0382591cb07f0db Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 7 Jan 2021 08:45:24 -0600 Subject: [PATCH 3/3] Putting `etcd/v3` as a `FORBIDDEN_DEPENDENCY` for `etcdctl`. --- etcdctl/go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/etcdctl/go.mod b/etcdctl/go.mod index 6ddfc993e..fef50aab2 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -36,5 +36,6 @@ replace ( // This makes the error more explicit. replace ( go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY + go.etcd.io/etcd/v3 => ./FORBIDDEN_DEPENDENCY go.etcd.io/tests/v3 => ./FORBIDDEN_DEPENDENCY )