Merge pull request #19673 from ahrtr/clientv2_2_20250326

[release-3.6] Move client/internal/v2 into server/internal/clientv2

Author: fuweid

bill-of-materials.json

@@ -485,15 +485,6 @@
 			}
 		]
 	},
-	{
-		"project": "go.etcd.io/etcd/client/v2",
-		"licenses": [
-			{
-				"type": "Apache License 2.0",
-				"confidence": 1
-			}
-		]
-	},
 	{
 		"project": "go.etcd.io/etcd/client/v3",
 		"licenses": [

client/internal/v2/LICENSE

@@ -9,7 +9,6 @@ codecov:
 fixes:
   - go.etcd.io/etcd/api/v3/::api/
   - go.etcd.io/etcd/client/v3/::client/v3/
-  - go.etcd.io/etcd/client/v2/::client/v2/
   - go.etcd.io/etcd/etcdctl/v3/::etcdctl/
   - go.etcd.io/etcd/etcdutl/v3/::etcdutl/
   - go.etcd.io/etcd/pkg/v3/::pkg/

client/internal/v2/go.mod

@@ -18,7 +18,6 @@ package main_test
 // module (e.g. for sake of 'bom' generation).
 // Thanks to this 'go mod tidy' is not removing that dependencies from go.mod.
 import (
-	_ "go.etcd.io/etcd/client/v2"                // keep
 	_ "go.etcd.io/etcd/etcdctl/v3/ctlv3/command" // keep
 	_ "go.etcd.io/etcd/etcdutl/v3/etcdutl"       // keep
 	_ "go.etcd.io/etcd/tests/v3/integration"     // keep

client/internal/v2/go.sum

@@ -7,7 +7,6 @@ toolchain go1.23.7
 replace (
 	go.etcd.io/etcd/api/v3 => ../api
 	go.etcd.io/etcd/client/pkg/v3 => ../client/pkg
-	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
@@ -71,7 +70,6 @@ require (
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/etcd/client/v2 v2.306.0-rc.2 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
 	go.opentelemetry.io/otel v1.34.0 // indirect

codecov.yml

@@ -7,7 +7,6 @@ toolchain go1.23.7
 replace (
 	go.etcd.io/etcd/api/v3 => ./api
 	go.etcd.io/etcd/client/pkg/v3 => ./client/pkg
-	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
@@ -26,7 +25,6 @@ require (
 	go.etcd.io/bbolt v1.4.0
 	go.etcd.io/etcd/api/v3 v3.6.0-rc.2
 	go.etcd.io/etcd/client/pkg/v3 v3.6.0-rc.2
-	go.etcd.io/etcd/client/v2 v2.306.0-rc.2
 	go.etcd.io/etcd/client/v3 v3.6.0-rc.2
 	go.etcd.io/etcd/etcdctl/v3 v3.6.0-rc.2
 	go.etcd.io/etcd/etcdutl/v3 v3.6.0-rc.2

dummy.go

@@ -24,11 +24,10 @@ function _cmd() {
   log_info "  - push_mod_tags    - Tags HEAD with all modules versions tags and pushes it to \${REMOTE_REPO}."
 }
 
-# update_module_version [v2version] [v3version]
+# update_module_version [v3version]
 #   Updates versions of cross-references in all internal references in current module.
 function update_module_version() {
   local v3version="${1}"
-  local v2version="${2}"
   local modules
   run go mod tidy
   modules=$(run go list -f '{{if not .Main}}{{if not .Indirect}}{{.Path}}{{end}}{{end}}' -m all)
@@ -38,11 +37,6 @@ function update_module_version() {
     run go mod edit -require "${dep}@${v3version}"
   done
 
-  v2deps=$(echo "${modules}" | grep -E "${ROOT_MODULE}/.*/v2")
-  for dep in ${v2deps}; do
-    run go mod edit -require "${dep}@${v2version}"
-  done
-
   run go mod tidy
 }
 
@@ -61,18 +55,13 @@ function update_versions_cmd() {
   fi
 
   local v3version="${TARGET_VERSION}"
-  local v2version
-  # converts e.g. v3.5.0-alpha.0 --> v2.305.0-alpha.0
-  # shellcheck disable=SC2001
-  v2version="$(echo "${TARGET_VERSION}" | sed 's|^v3.\([0-9]*\).|v2.30\1.|g')"
 
   log_info "DRY_RUN       : ${DRY_RUN}"
   log_info "TARGET_VERSION: ${TARGET_VERSION}"
   log_info ""
   log_info "v3version: ${v3version}"
-  log_info "v2version: ${v2version}"
 
-  run_for_modules update_module_version "${v3version}" "${v2version}"
+  run_for_modules update_module_version "${v3version}"
   run_for_modules mod_tidy_fix || exit 2
 }
 

etcdutl/go.mod

@@ -166,7 +166,7 @@ function run_for_module {
 }
 
 function module_dirs() {
-  echo "api pkg client/pkg client/internal/v2 client/v3 server etcdutl etcdctl tests tools/mod tools/rw-heatmaps tools/testgrid-analysis ."
+  echo "api pkg client/pkg client/v3 server etcdutl etcdctl tests tools/mod tools/rw-heatmaps tools/testgrid-analysis ."
 }
 
 # maybe_run [cmd...] runs given command depending on the DRY_RUN flag.
@@ -186,7 +186,6 @@ function modules() {
     "${ROOT_MODULE}/api/v3"
     "${ROOT_MODULE}/pkg/v3"
     "${ROOT_MODULE}/client/pkg/v3"
-    "${ROOT_MODULE}/client/v2"
     "${ROOT_MODULE}/client/v3"
     "${ROOT_MODULE}/server/v3"
     "${ROOT_MODULE}/etcdutl/v3"

go.mod

@@ -34,7 +34,7 @@ import (
 
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	"go.etcd.io/etcd/client/pkg/v3/types"
-	"go.etcd.io/etcd/client/v2"
+	client "go.etcd.io/etcd/server/v3/internal/clientv2"
 )
 
 var (