From be7be348002002ba7e7b9b98dba926b4d3eb050e Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 30 Mar 2023 17:15:36 +0200 Subject: [PATCH] client: Hide v2 client package Signed-off-by: Marek Siarkowicz --- Documentation/contributor-guide/modules.md | 3 --- client/{ => internal}/v2/LICENSE | 0 client/{ => internal}/v2/README.md | 0 client/{ => internal}/v2/auth_role.go | 0 client/{ => internal}/v2/auth_user.go | 0 client/{ => internal}/v2/cancelreq.go | 0 client/{ => internal}/v2/client.go | 0 client/{ => internal}/v2/client_test.go | 0 client/{ => internal}/v2/cluster_error.go | 0 client/{ => internal}/v2/curl.go | 0 client/{ => internal}/v2/discover.go | 0 client/{ => internal}/v2/doc.go | 0 client/{ => internal}/v2/fake_transport_test.go | 0 client/{ => internal}/v2/go.mod | 4 ++-- client/{ => internal}/v2/go.sum | 0 client/{ => internal}/v2/keys.go | 0 client/{ => internal}/v2/keys_bench_test.go | 0 client/{ => internal}/v2/keys_test.go | 0 client/{ => internal}/v2/main_test.go | 0 client/{ => internal}/v2/members.go | 0 client/{ => internal}/v2/members_test.go | 0 client/{ => internal}/v2/util.go | 0 etcdutl/go.mod | 2 +- go.mod | 2 +- scripts/test.sh | 1 - scripts/test_lib.sh | 2 +- server/go.mod | 2 +- tests/go.mod | 2 +- 28 files changed, 7 insertions(+), 11 deletions(-) rename client/{ => internal}/v2/LICENSE (100%) rename client/{ => internal}/v2/README.md (100%) rename client/{ => internal}/v2/auth_role.go (100%) rename client/{ => internal}/v2/auth_user.go (100%) rename client/{ => internal}/v2/cancelreq.go (100%) rename client/{ => internal}/v2/client.go (100%) rename client/{ => internal}/v2/client_test.go (100%) rename client/{ => internal}/v2/cluster_error.go (100%) rename client/{ => internal}/v2/curl.go (100%) rename client/{ => internal}/v2/discover.go (100%) rename client/{ => internal}/v2/doc.go (100%) rename client/{ => internal}/v2/fake_transport_test.go (100%) rename client/{ => internal}/v2/go.mod (90%) rename client/{ => internal}/v2/go.sum (100%) rename client/{ => internal}/v2/keys.go (100%) rename client/{ => internal}/v2/keys_bench_test.go (100%) rename client/{ => internal}/v2/keys_test.go (100%) rename client/{ => internal}/v2/main_test.go (100%) rename client/{ => internal}/v2/members.go (100%) rename client/{ => internal}/v2/members_test.go (100%) rename client/{ => internal}/v2/util.go (100%) diff --git a/Documentation/contributor-guide/modules.md b/Documentation/contributor-guide/modules.md index a8551aa39..730e7bd44 100644 --- a/Documentation/contributor-guide/modules.md +++ b/Documentation/contributor-guide/modules.md @@ -21,9 +21,6 @@ There are following modules: - **go.etcd.io/etcd/client/v3** - client library used to contact etcd over the network (grpc). Recommended for all new usage of etcd. - - **go.etcd.io/etcd/client/v2** - legacy client library used to contact etcd - over HTTP protocol. Deprecated. All new usage should depend on /v3 library. - - **go.etcd.io/raft/v3** - implementation of distributed consensus protocol. Should have no etcd specific code. Hosted in a separate repository: https://github.com/etcd-io/raft. diff --git a/client/v2/LICENSE b/client/internal/v2/LICENSE similarity index 100% rename from client/v2/LICENSE rename to client/internal/v2/LICENSE diff --git a/client/v2/README.md b/client/internal/v2/README.md similarity index 100% rename from client/v2/README.md rename to client/internal/v2/README.md diff --git a/client/v2/auth_role.go b/client/internal/v2/auth_role.go similarity index 100% rename from client/v2/auth_role.go rename to client/internal/v2/auth_role.go diff --git a/client/v2/auth_user.go b/client/internal/v2/auth_user.go similarity index 100% rename from client/v2/auth_user.go rename to client/internal/v2/auth_user.go diff --git a/client/v2/cancelreq.go b/client/internal/v2/cancelreq.go similarity index 100% rename from client/v2/cancelreq.go rename to client/internal/v2/cancelreq.go diff --git a/client/v2/client.go b/client/internal/v2/client.go similarity index 100% rename from client/v2/client.go rename to client/internal/v2/client.go diff --git a/client/v2/client_test.go b/client/internal/v2/client_test.go similarity index 100% rename from client/v2/client_test.go rename to client/internal/v2/client_test.go diff --git a/client/v2/cluster_error.go b/client/internal/v2/cluster_error.go similarity index 100% rename from client/v2/cluster_error.go rename to client/internal/v2/cluster_error.go diff --git a/client/v2/curl.go b/client/internal/v2/curl.go similarity index 100% rename from client/v2/curl.go rename to client/internal/v2/curl.go diff --git a/client/v2/discover.go b/client/internal/v2/discover.go similarity index 100% rename from client/v2/discover.go rename to client/internal/v2/discover.go diff --git a/client/v2/doc.go b/client/internal/v2/doc.go similarity index 100% rename from client/v2/doc.go rename to client/internal/v2/doc.go diff --git a/client/v2/fake_transport_test.go b/client/internal/v2/fake_transport_test.go similarity index 100% rename from client/v2/fake_transport_test.go rename to client/internal/v2/fake_transport_test.go diff --git a/client/v2/go.mod b/client/internal/v2/go.mod similarity index 90% rename from client/v2/go.mod rename to client/internal/v2/go.mod index 5eca4e1ee..05caa732e 100644 --- a/client/v2/go.mod +++ b/client/internal/v2/go.mod @@ -18,8 +18,8 @@ require ( ) replace ( - go.etcd.io/etcd/api/v3 => ../../api - go.etcd.io/etcd/client/pkg/v3 => ../pkg + go.etcd.io/etcd/api/v3 => ./../../../api + go.etcd.io/etcd/client/pkg/v3 => ./../../pkg ) // Bad imports are sometimes causing attempts to pull that code. diff --git a/client/v2/go.sum b/client/internal/v2/go.sum similarity index 100% rename from client/v2/go.sum rename to client/internal/v2/go.sum diff --git a/client/v2/keys.go b/client/internal/v2/keys.go similarity index 100% rename from client/v2/keys.go rename to client/internal/v2/keys.go diff --git a/client/v2/keys_bench_test.go b/client/internal/v2/keys_bench_test.go similarity index 100% rename from client/v2/keys_bench_test.go rename to client/internal/v2/keys_bench_test.go diff --git a/client/v2/keys_test.go b/client/internal/v2/keys_test.go similarity index 100% rename from client/v2/keys_test.go rename to client/internal/v2/keys_test.go diff --git a/client/v2/main_test.go b/client/internal/v2/main_test.go similarity index 100% rename from client/v2/main_test.go rename to client/internal/v2/main_test.go diff --git a/client/v2/members.go b/client/internal/v2/members.go similarity index 100% rename from client/v2/members.go rename to client/internal/v2/members.go diff --git a/client/v2/members_test.go b/client/internal/v2/members_test.go similarity index 100% rename from client/v2/members_test.go rename to client/internal/v2/members_test.go diff --git a/client/v2/util.go b/client/internal/v2/util.go similarity index 100% rename from client/v2/util.go rename to client/internal/v2/util.go diff --git a/etcdutl/go.mod b/etcdutl/go.mod index c34d0c683..a361b258a 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -5,7 +5,7 @@ go 1.19 replace ( go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/client/pkg/v3 => ../client/pkg - go.etcd.io/etcd/client/v2 => ../client/v2 + go.etcd.io/etcd/client/v2 => ./../client/internal/v2 go.etcd.io/etcd/client/v3 => ../client/v3 go.etcd.io/etcd/pkg/v3 => ../pkg go.etcd.io/etcd/server/v3 => ../server diff --git a/go.mod b/go.mod index 0ff1576f3..14090d990 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 replace ( go.etcd.io/etcd/api/v3 => ./api go.etcd.io/etcd/client/pkg/v3 => ./client/pkg - go.etcd.io/etcd/client/v2 => ./client/v2 + go.etcd.io/etcd/client/v2 => ./client/internal/v2 go.etcd.io/etcd/client/v3 => ./client/v3 go.etcd.io/etcd/etcdctl/v3 => ./etcdctl go.etcd.io/etcd/etcdutl/v3 => ./etcdutl diff --git a/scripts/test.sh b/scripts/test.sh index 9e74b9931..185745c5b 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -294,7 +294,6 @@ function cov_pass { sed --in-place -E "s|go.etcd.io/etcd/api/v3/|api/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/client/v3/|client/v3/|g" "${cover_out_file}" || true - sed --in-place -E "s|go.etcd.io/etcd/client/v2/|client/v2/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/client/pkg/v3|client/pkg/v3/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/etcdctl/v3/|etcdctl/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/etcdutl/v3/|etcdutl/|g" "${cover_out_file}" || true diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index 5bdb19cad..a15f46c17 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -164,7 +164,7 @@ function run_for_module { } function module_dirs() { - echo "api pkg client/pkg client/v2 client/v3 server etcdutl etcdctl tests ." + echo "api pkg client/pkg client/internal/v2 client/v3 server etcdutl etcdctl tests ." } # maybe_run [cmd...] runs given command depending on the DRY_RUN flag. diff --git a/server/go.mod b/server/go.mod index e63f5c987..16595ea24 100644 --- a/server/go.mod +++ b/server/go.mod @@ -79,7 +79,7 @@ require ( replace ( go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/client/pkg/v3 => ../client/pkg - go.etcd.io/etcd/client/v2 => ../client/v2 + go.etcd.io/etcd/client/v2 => ./../client/internal/v2 go.etcd.io/etcd/client/v3 => ../client/v3 go.etcd.io/etcd/pkg/v3 => ../pkg ) diff --git a/tests/go.mod b/tests/go.mod index 99464dc4f..53bd31fce 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,7 +5,7 @@ go 1.19 replace ( go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/client/pkg/v3 => ../client/pkg - go.etcd.io/etcd/client/v2 => ../client/v2 + go.etcd.io/etcd/client/v2 => ./../client/internal/v2 go.etcd.io/etcd/client/v3 => ../client/v3 go.etcd.io/etcd/etcdctl/v3 => ../etcdctl go.etcd.io/etcd/etcdutl/v3 => ../etcdutl