WIP: Rebase v3.5.31

.gitignore

@@ -21,3 +21,8 @@ hack/tls-setup/certs
 *.tmp
 *.bak
 .gobincache/
+
+/tools/etcd-dump-db/etcd-dump-db
+/tools/etcd-dump-logs/etcd-dump-logs
+/tools/etcd-dump-metrics/etcd-dump-metrics
+/tools/benchmark/benchmark

.go-version

@@ -1 +1 @@
-1.22.11
+1.23.12

Makefile

@@ -156,7 +156,7 @@ test:
 
 test-smoke:
 	$(info log-file: test-$(TEST_SUFFIX).log)
-	PASSES="fmt bom dep build unit" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log
+	PASSES="dep build unit" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log
 	! grep "FAIL:" test-$(TEST_SUFFIX).log
 
 test-full:
@@ -175,10 +175,22 @@ test-integration:
 test-e2e:
 	PASSES="build e2e" ./test.sh $(GO_TEST_FLAGS)
 
+.PHONY: test-grpcproxy-integration
+test-grpcproxy-integration:
+	PASSES='build grpcproxy_integration' RACE='true' ./test.sh $(GO_TEST_FLAGS)
+
+.PHONY: test-grpcproxy-e2e
+test-grpcproxy-e2e:
+	PASSES='build grpcproxy_e2e' RACE='true' ./test.sh $(GO_TEST_FLAGS)
+
 .PHONY: test-e2e-release
 test-e2e-release:
 	PASSES="build release e2e" ./test.sh $(GO_TEST_FLAGS)
 
+.PHONY: test-release
+test-release:
+	PASSES="release_tests" ./test.sh $(GO_TEST_FLAGS)
+
 ensure-docker-test-image-exists:
 	make pull-docker-test || ( echo "WARNING: Container Image not found in registry, building locally"; make build-docker-test )
 
@@ -582,8 +594,61 @@ gofail-enable: install-gofail
 gofail-disable: install-gofail
 	PASSES="toggle_failpoints" ./test.sh
 
+.PHONY: run-govulncheck
+run-govulncheck:
+ifeq (, $(shell which govulncheck))
+	$(shell go install golang.org/x/vuln/cmd/govulncheck@latest)
+endif
+	PASSES="govuln" ./test.sh
+
+# Static analysis
+
 .PHONY: verify
-verify: verify-go-versions verify-dep
+verify: verify-gofmt verify-bom verify-dep verify-shellcheck verify-goword verify-govet verify-revive verify-license-header verify-receiver-name verify-mod-tidy verify-shellws verify-go-versions verify-markdown-marker
+
+.PHONY: verify-gofmt
+verify-gofmt:
+	PASSES="gofmt" ./test.sh
+
+.PHONY: verify-bom
+verify-bom:
+	PASSES="bom" ./test.sh
+
+.PHONY: verify-shellcheck
+verify-shellcheck:
+	PASSES="shellcheck" ./test.sh
+
+.PHONY: verify-goword
+verify-goword:
+	PASSES="goword" ./test.sh
+
+.PHONY: verify-govet
+verify-govet:
+	PASSES="govet" ./test.sh
+
+.PHONY: verify-revive
+verify-revive:
+	PASSES="revive" ./test.sh
+
+.PHONY: verify-license-header
+verify-license-header:
+	PASSES="license_header" ./test.sh
+
+.PHONY: verify-receiver-name
+verify-receiver-name:
+	PASSES="receiver_name" ./test.sh
+
+.PHONY: verify-mod-tidy
+verify-mod-tidy:
+	PASSES="mod_tidy" ./test.sh
+
+.PHONY: verify-shellws
+verify-shellws:
+	PASSES="shellws" ./test.sh
+
+.PHONY: verify-markdown-marker
+verify-markdown-marker:
+	PASSES="markdown_marker" ./test.sh
 
 .PHONY: verify-go-versions
 verify-go-versions:

api/go.mod

@@ -1,25 +1,25 @@
 module go.etcd.io/etcd/api/v3
 
-go 1.22
+go 1.23
 
-toolchain go1.22.11
+toolchain go1.23.12
 
 require (
 	github.com/coreos/go-semver v0.3.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
-	google.golang.org/grpc v1.59.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f
+	google.golang.org/grpc v1.71.1
 )
 
 require (
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )