forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
``` 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 - etcd-io/etcd#14413 - etcd-io/etcd#14538 Closes cockroachdb#87264. Release note: None
- Loading branch information
Showing
33 changed files
with
272 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/[email protected]", | ||
| 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/[email protected]", | ||
| 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/[email protected]", | ||
| 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( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.