From 2c1c354d9285bc14b02e40a261b97c565dfd3017 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Mon, 10 Oct 2022 10:46:14 +0200 Subject: [PATCH] go.mod: bump raft ``` go get go.etcd.io/etcd/raft/v3@d19116e6ee66e52a5fd8cce2e10f9422fb80e42f go: downloading go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221009201006-d19116e6ee66 go: module github.com/golang/protobuf is deprecated: Use the "google.golang.org/protobuf" module instead. go: upgraded go.etcd.io/etcd/api/v3 v3.5.0 => v3.6.0-alpha.0 go: upgraded go.etcd.io/etcd/raft/v3 v3.0.0-20210320072418-e51c697ec6e8 => v3.6.0-alpha.0.0.20221009201006-d19116e6ee66 ``` This picks up - https://github.com/etcd-io/etcd/pull/14413 - https://github.com/etcd-io/etcd/pull/14538 Closes #87264. Release note: None --- DEPS.bzl | 34 +++++++-------- build/bazelutil/distdir_files.bzl | 7 ++-- build/patches/io_etcd_go_etcd_api_v3.patch | 48 ++++++++++++++++++++++ build/vendor_rebuild.sh | 5 +++ docs/generated/http/BUILD.bazel | 1 + go.mod | 3 +- go.sum | 16 +++----- pkg/cmd/mirror/mirror.go | 3 ++ pkg/cmd/protoc-gen-gogoroach/main.go | 1 + vendor | 2 +- 10 files changed, 84 insertions(+), 36 deletions(-) create mode 100644 build/patches/io_etcd_go_etcd_api_v3.patch diff --git a/DEPS.bzl b/DEPS.bzl index 8a95d7d86435..e5c3b5d7769a 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -8804,20 +8804,24 @@ def go_deps(): name = "io_etcd_go_etcd_api_v3", build_file_proto_mode = "disable_global", importpath = "go.etcd.io/etcd/api/v3", - sha256 = "8754587bf6d4b1bc889d519355ea8899e093d8550e0d98730f8570d608f998f9", - strip_prefix = "go.etcd.io/etcd/api/v3@v3.5.0", + patch_args = ["-p1"], + patches = [ + "@com_github_cockroachdb_cockroach//build/patches:io_etcd_go_etcd_api_v3.patch", + ], + sha256 = "7664ddbf05148db36ec74d8c5e72ba65db25cd594ea38a471077298c398a9ea7", + strip_prefix = "go.etcd.io/etcd/api/v3@v3.6.0-alpha.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/api/v3/io_etcd_go_etcd_api_v3-v3.5.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/api/v3/io_etcd_go_etcd_api_v3-v3.6.0-alpha.0.zip", ], ) go_repository( name = "io_etcd_go_etcd_client_pkg_v3", build_file_proto_mode = "disable_global", importpath = "go.etcd.io/etcd/client/pkg/v3", - sha256 = "c0ca209767c5734c6ed023888ba5be02aab5bd3c4d018999467f2bfa8bf65ee3", - strip_prefix = "go.etcd.io/etcd/client/pkg/v3@v3.5.0", + sha256 = "abfb4724be4ea8b042737efbdd1bc11ba4d3c4c8dd8e749c7791adf8d16ef062", + strip_prefix = "go.etcd.io/etcd/client/pkg/v3@v3.6.0-alpha.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.5.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.6.0-alpha.0.zip", ], ) go_repository( @@ -8830,16 +8834,6 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/v2/io_etcd_go_etcd_client_v2-v2.305.0.zip", ], ) - go_repository( - name = "io_etcd_go_etcd_pkg_v3", - build_file_proto_mode = "disable_global", - importpath = "go.etcd.io/etcd/pkg/v3", - sha256 = "1700dfed48becf82ccfe6865fe59daac2121d48f60b7c4bf090f0ff2320d33d4", - strip_prefix = "go.etcd.io/etcd/pkg/v3@v3.0.0-20201109164711-01844fd28560", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/pkg/v3/io_etcd_go_etcd_pkg_v3-v3.0.0-20201109164711-01844fd28560.zip", - ], - ) go_repository( name = "io_etcd_go_etcd_raft_v3", build_directives = [ @@ -8848,13 +8842,15 @@ def go_deps(): "gazelle:go_proto_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler", "gazelle:go_grpc_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler", "gazelle:proto_import_prefix etcd/raft/v3", + "gazelle:resolve proto proto etcd/api/versionpb/version.proto @io_etcd_go_etcd_api_v3//versionpb:versionpb_proto", + "gazelle:resolve proto go etcd/api/versionpb/version.proto @io_etcd_go_etcd_api_v3//versionpb:versionpb", ], build_file_proto_mode = "default", importpath = "go.etcd.io/etcd/raft/v3", - sha256 = "62faedd81e10061a4e0d7476865a62b84121ea462514afeaa1b9d66cc53b5a4b", - strip_prefix = "go.etcd.io/etcd/raft/v3@v3.0.0-20210320072418-e51c697ec6e8", + sha256 = "dfe1caafc6ba5b17d52218c1b393a6829195c3c06d38c9e7492301433f6b6bd7", + strip_prefix = "go.etcd.io/etcd/raft/v3@v3.6.0-alpha.0.0.20221009201006-d19116e6ee66", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.0.0-20210320072418-e51c697ec6e8.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.6.0-alpha.0.0.20221009201006-d19116e6ee66.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 123e46581be2..3984ab7418e3 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -843,12 +843,11 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/zenazn/goji/com_github_zenazn_goji-v0.9.0.zip": "0807a255d9d715d18427a6eedd8e4f5a22670b09e5f45fddd229c1ae38da25a9", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/ziutek/mymysql/com_github_ziutek_mymysql-v1.5.4.zip": "1ea104186e0990a3d97a1e67fcd31177849c975de4abd9399270ab0a04c025de", "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/bbolt/io_etcd_go_bbolt-v1.3.5.zip": "cbb488f86631df05edb2aa3e2c25e0d5994d46a118fc5f2150932fa6ed469cff", - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/api/v3/io_etcd_go_etcd_api_v3-v3.5.0.zip": "8754587bf6d4b1bc889d519355ea8899e093d8550e0d98730f8570d608f998f9", - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.5.0.zip": "c0ca209767c5734c6ed023888ba5be02aab5bd3c4d018999467f2bfa8bf65ee3", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/api/v3/io_etcd_go_etcd_api_v3-v3.6.0-alpha.0.zip": "7664ddbf05148db36ec74d8c5e72ba65db25cd594ea38a471077298c398a9ea7", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.6.0-alpha.0.zip": "abfb4724be4ea8b042737efbdd1bc11ba4d3c4c8dd8e749c7791adf8d16ef062", "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/v2/io_etcd_go_etcd_client_v2-v2.305.0.zip": "91fcb507fe8c193844b56bfb6c8741aaeb6ffa11ee9043de2af0f141173679f3", "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/io_etcd_go_etcd-v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip": "d982ee501979b41b68625693bad77d15e4ae79ab9d0eae5f6028205f96a74e49", - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/pkg/v3/io_etcd_go_etcd_pkg_v3-v3.0.0-20201109164711-01844fd28560.zip": "1700dfed48becf82ccfe6865fe59daac2121d48f60b7c4bf090f0ff2320d33d4", - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.0.0-20210320072418-e51c697ec6e8.zip": "62faedd81e10061a4e0d7476865a62b84121ea462514afeaa1b9d66cc53b5a4b", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.6.0-alpha.0.0.20221009201006-d19116e6ee66.zip": "dfe1caafc6ba5b17d52218c1b393a6829195c3c06d38c9e7492301433f6b6bd7", "https://storage.googleapis.com/cockroach-godeps/gomod/go.mongodb.org/mongo-driver/org_mongodb_go_mongo_driver-v1.5.1.zip": "446cff132e82c64af7ffcf48e268eb16ec81f694914aa6baecb06cbbae1be0d7", "https://storage.googleapis.com/cockroach-godeps/gomod/go.mozilla.org/pkcs7/org_mozilla_go_pkcs7-v0.0.0-20200128120323-432b2356ecb1.zip": "3c4c1667907ff3127e371d44696326bad9e965216d4257917ae28e8b82a9e08d", "https://storage.googleapis.com/cockroach-godeps/gomod/go.opencensus.io/io_opencensus_go-v0.23.0.zip": "81c78beb84872084d6d5ddc0a0bffc47294412898472c891a29cfcb66f3fa2d8", diff --git a/build/patches/io_etcd_go_etcd_api_v3.patch b/build/patches/io_etcd_go_etcd_api_v3.patch new file mode 100644 index 000000000000..8f6f34581739 --- /dev/null +++ b/build/patches/io_etcd_go_etcd_api_v3.patch @@ -0,0 +1,48 @@ +diff -urN a/versionpb/BUILD.bazel b/versionpb/BUILD.bazel +--- a/versionpb/BUILD.bazel 1970-01-01 00:00:00.000000000 +0000 ++++ b/versionpb/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000 +@@ -1,4 +1,16 @@ + load("@io_bazel_rules_go//go:def.bzl", "go_library") ++load("@rules_proto//proto:defs.bzl", "proto_library") ++ ++proto_library( ++ name = "versionpb_proto", ++ visibility = ["//visibility:public"], ++ deps = [ ++ "@com_github_gogo_protobuf//gogoproto:gogo_proto", ++ "@com_google_protobuf//:descriptor_proto", ++ ], ++ import_prefix = "etcd/api", ++ srcs = ["@io_etcd_go_etcd_api_v3//versionpb:version.proto"], ++) + + go_library( + name = "versionpb", +diff -urN a/versionpb/version.proto b/versionpb/version.proto +--- a/versionpb/version.proto 1970-01-01 00:00:00.000000000 +0000 ++++ b/versionpb/version.proto 2000-01-01 00:00:00.000000000 -0000 +@@ -9,20 +9,20 @@ + + // Indicates etcd version that introduced the message, used to determine minimal etcd version required to interpret wal that includes this message. + extend google.protobuf.MessageOptions { +- optional string etcd_version_msg = 50000; ++ string etcd_version_msg = 50000; + } + + // Indicates etcd version that introduced the field, used to determine minimal etcd version required to interpret wal that sets this field. + extend google.protobuf.FieldOptions { +- optional string etcd_version_field = 50001; ++ string etcd_version_field = 50001; + } + + // Indicates etcd version that introduced the enum, used to determine minimal etcd version required to interpret wal that uses this enum. + extend google.protobuf.EnumOptions { +- optional string etcd_version_enum = 50002; ++ string etcd_version_enum = 50002; + } + + // Indicates etcd version that introduced the enum value, used to determine minimal etcd version required to interpret wal that sets this enum value. + extend google.protobuf.EnumValueOptions { +- optional string etcd_version_enum_value = 50003; ++ string etcd_version_enum_value = 50003; + } diff --git a/build/vendor_rebuild.sh b/build/vendor_rebuild.sh index 4915f761874d..1b31024b9b3e 100755 --- a/build/vendor_rebuild.sh +++ b/build/vendor_rebuild.sh @@ -16,5 +16,10 @@ function restore() { mv vendor $TMP_VENDOR_DIR go mod vendor modvendor -copy="**/*.c **/*.h **/*.proto" -include 'github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/rpc,github.com/prometheus/client_model' + +# See https://github.com/cockroachdb/cockroach/issues/89640. +sed 's~etcd/api/versionpb/version.proto~etcd/api/v3/versionpb/version.proto~' vendor/go.etcd.io/etcd/raft/v3/raftpb/raft.proto > vendor/go.etcd.io/etcd/raft/v3/raftpb/raft.proto.sed +mv vendor/go.etcd.io/etcd/raft/v3/raftpb/raft.proto{.sed,} + mv $TMP_VENDOR_DIR/.git vendor/.git rm -rf $TMP_VENDOR_DIR diff --git a/docs/generated/http/BUILD.bazel b/docs/generated/http/BUILD.bazel index 8f7c570c246d..a1b9ec8f00df 100644 --- a/docs/generated/http/BUILD.bazel +++ b/docs/generated/http/BUILD.bazel @@ -48,6 +48,7 @@ genrule( "@com_google_protobuf//:timestamp_proto", "@go_googleapis//google/api:annotations_proto", "@io_etcd_go_etcd_raft_v3//raftpb:raftpb_proto", + "@io_etcd_go_etcd_api_v3//versionpb:versionpb_proto", ], outs = [ "full.md", diff --git a/go.mod b/go.mod index 944ea03171cf..b79be63b4a55 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/google/btree v1.0.1 github.com/google/pprof v0.0.0-20210827144239-02619b876842 github.com/google/uuid v1.3.0 - go.etcd.io/etcd/raft/v3 v3.0.0-20210320072418-e51c697ec6e8 + go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221009201006-d19116e6ee66 golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 golang.org/x/exp v0.0.0-20220104160115-025e73f80486 golang.org/x/exp/typeparams v0.0.0-20220713135740-79cabaa25d75 // indirect @@ -352,6 +352,7 @@ require ( github.com/twpayne/go-kml v1.5.2 // indirect github.com/urfave/cli/v2 v2.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.etcd.io/etcd/api/v3 v3.6.0-alpha.0 // indirect go.mongodb.org/mongo-driver v1.5.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/proto/otlp v0.9.0 // indirect diff --git a/go.sum b/go.sum index 0cbc9781b316..b11ae291e5b4 100644 --- a/go.sum +++ b/go.sum @@ -396,8 +396,6 @@ github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -443,12 +441,10 @@ github.com/cockroachdb/cockroach-go/v2 v2.2.6/go.mod h1:q4ZRgO6CQpwNyEvEwSxwNrOS github.com/cockroachdb/crlfmt v0.0.0-20210128092314-b3eff0b87c79 h1:4s0GWs4NXFK4JEeUc0Q1pRbL4oMbqh1DK70qeQ+viOA= github.com/cockroachdb/crlfmt v0.0.0-20210128092314-b3eff0b87c79/go.mod h1:EOI6rrXIdP+4EXwM8837kmmb6IJesf7k7W6bUu8BDOg= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/datadriven v1.0.1-0.20211007161720-b558070c3be0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7/go.mod h1:hi0MtSY3AYDQNDi83kDkMH5/yqM/CsIrsOITkSoH7KI= github.com/cockroachdb/datadriven v1.0.1 h1:eb8u+AQ1BnWwsINwqh9Ts2bdIZKdP87sUvT0k3wde7s= github.com/cockroachdb/datadriven v1.0.1/go.mod h1:ayXb8FgaXxgGObAHeeLXa1bPh52ZpuWSY560iFfB3jI= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= github.com/cockroachdb/errors v1.8.8/go.mod h1:z6VnEL3hZ/2ONZEvG7S5Ym0bU2AqPcEKnIiA1wbsSu0= github.com/cockroachdb/errors v1.9.0 h1:B48dYem5SlAY7iU8AKsgedb4gH6mo+bDkbtLIvM/a88= @@ -756,7 +752,6 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXt github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/sentry-go v0.12.0 h1:era7g0re5iY13bHSdN/xMkyV+5zZppjRVQhZrXCaEIk= github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9 h1:r5GgOLGbza2wVHRzK7aAj6lWZjfbAwiu/RDCVOKjRyM= @@ -2232,12 +2227,13 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1ZtgjTBwO+blA6gVOmZurpiMEsETKo= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.6.0-alpha.0 h1:se+XckWlVTTfwjZSsAZJ2zGPzmIMq3j7fKBCmHoB9UA= +go.etcd.io/etcd/api/v3 v3.6.0-alpha.0/go.mod h1:z13pg39zewDLZeXIKeM0xELOeFKcqjLocfwl5M820+w= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0 h1:2UyRzFWbZZzgu/xzxoRukgixvafiJtGyxO+3IKUyJ6c= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/pkg/v3 v3.0.0-20201109164711-01844fd28560 h1:U/PIBuOTa8JXLPKF81Xh7xhIjA0jbpyqFWUPIiT4Ilc= -go.etcd.io/etcd/pkg/v3 v3.0.0-20201109164711-01844fd28560/go.mod h1:0HiXlybqS+XtfgnNkiEZWwGXYYEhWsWL8fDVdZzb7is= -go.etcd.io/etcd/raft/v3 v3.0.0-20210320072418-e51c697ec6e8 h1:aRP8pJvbOsFy8SaZ0tcWeV4RYTlp8ZIWS49usJjO4Ac= -go.etcd.io/etcd/raft/v3 v3.0.0-20210320072418-e51c697ec6e8/go.mod h1:i+srOieUHQl4y/EwlGOpuYtoKG7nb2uhtA/hrFsFTsc= +go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221009201006-d19116e6ee66 h1:jvWNsQyNPwM6OQiN7Z+d7SOxok/+69GEnpas1RFc/r0= +go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221009201006-d19116e6ee66/go.mod h1:tW2/2laPtjMV+ITtHu87FnnnxeGn62sjDTlwB1+Gg08= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= @@ -2303,7 +2299,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= @@ -2626,7 +2621,6 @@ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/cmd/mirror/mirror.go b/pkg/cmd/mirror/mirror.go index 4320e97db89f..8b5b352111fb 100644 --- a/pkg/cmd/mirror/mirror.go +++ b/pkg/cmd/mirror/mirror.go @@ -286,6 +286,9 @@ func dumpBuildDirectivesForRepo(repoName string) { directives = append(directives, protoDirectives...) directives = append(directives, "gazelle:proto_import_prefix etcd/raft/v3") + directives = append(directives, + "gazelle:resolve proto proto etcd/api/versionpb/version.proto @io_etcd_go_etcd_api_v3//versionpb:versionpb_proto", + "gazelle:resolve proto go etcd/api/versionpb/version.proto @io_etcd_go_etcd_api_v3//versionpb:versionpb") } else if repoName == "io_opentelemetry_go_proto_otlp" { directives = append(directives, diff --git a/pkg/cmd/protoc-gen-gogoroach/main.go b/pkg/cmd/protoc-gen-gogoroach/main.go index 4fc5515d43d4..54dbe1fb4cc0 100644 --- a/pkg/cmd/protoc-gen-gogoroach/main.go +++ b/pkg/cmd/protoc-gen-gogoroach/main.go @@ -28,6 +28,7 @@ func fixImports(s string) string { lines := strings.Split(s, "\n") var builder strings.Builder for _, line := range lines { + line = strings.ReplaceAll(line, "\"etcd/api/versionpb\"", "\"go.etcd.io/etcd/api/v3/versionpb\"") if strings.Contains(line, "import _ ") || strings.Contains(line, "import fmt \"github.com/cockroachdb/cockroach/pkg/fmt\"") || strings.Contains(line, "import math \"github.com/cockroachdb/cockroach/pkg/math\"") { diff --git a/vendor b/vendor index dcb71870f4c3..025290f349e3 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit dcb71870f4c338c6e5dc732b0ac5961e975ce49f +Subproject commit 025290f349e318479bce4925869948f366309443