Merge pull request #15591 from serathius/remove-v2-client

client: Hide v2 client package

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.

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.

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

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

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

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.

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
 )

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