From 389642dd169b8865a9798dbeb043a2afcbd0ad31 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Mon, 5 Oct 2020 14:20:14 +0200 Subject: [PATCH 1/5] client: Move client specific code (protos, version) to api/ client: Move client specific code (protos, version) to the api/ directory. Thanks to this change /client directory will not need to depend on the server code. In next commits we make "/api" a module on its own. Mechanical consequences of execution: % git mv version/version.go api/version % git mv etcdserver/api/v3rpc/rpctypes api/v3rpc % git mv mvcc/mvccpb api/ % git mv etcdserver/etcdserverpb api/ % git mv auth/authpb api/ % git mv etcdserver/api/membership/membershippb api/ --- {auth => api}/authpb/auth.pb.go | 0 {auth => api}/authpb/auth.proto | 0 {etcdserver => api}/etcdserverpb/etcdserver.pb.go | 0 {etcdserver => api}/etcdserverpb/etcdserver.proto | 0 {etcdserver => api}/etcdserverpb/gw/rpc.pb.gw.go | 0 {etcdserver => api}/etcdserverpb/raft_internal.pb.go | 0 {etcdserver => api}/etcdserverpb/raft_internal.proto | 0 {etcdserver => api}/etcdserverpb/raft_internal_stringer.go | 0 {etcdserver => api}/etcdserverpb/raft_internal_stringer_test.go | 0 {etcdserver => api}/etcdserverpb/rpc.pb.go | 0 {etcdserver => api}/etcdserverpb/rpc.proto | 0 {etcdserver/api/membership => api}/membershippb/membership.pb.go | 0 {etcdserver/api/membership => api}/membershippb/membership.proto | 0 {mvcc => api}/mvccpb/kv.pb.go | 0 {mvcc => api}/mvccpb/kv.proto | 0 {etcdserver/api => api}/v3rpc/rpctypes/doc.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/error.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/error_test.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/md.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/metadatafields.go | 0 {version => api/version}/version.go | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename {auth => api}/authpb/auth.pb.go (100%) rename {auth => api}/authpb/auth.proto (100%) rename {etcdserver => api}/etcdserverpb/etcdserver.pb.go (100%) rename {etcdserver => api}/etcdserverpb/etcdserver.proto (100%) rename {etcdserver => api}/etcdserverpb/gw/rpc.pb.gw.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal.pb.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal.proto (100%) rename {etcdserver => api}/etcdserverpb/raft_internal_stringer.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal_stringer_test.go (100%) rename {etcdserver => api}/etcdserverpb/rpc.pb.go (100%) rename {etcdserver => api}/etcdserverpb/rpc.proto (100%) rename {etcdserver/api/membership => api}/membershippb/membership.pb.go (100%) rename {etcdserver/api/membership => api}/membershippb/membership.proto (100%) rename {mvcc => api}/mvccpb/kv.pb.go (100%) rename {mvcc => api}/mvccpb/kv.proto (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/doc.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/error.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/error_test.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/md.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/metadatafields.go (100%) rename {version => api/version}/version.go (100%) diff --git a/auth/authpb/auth.pb.go b/api/authpb/auth.pb.go similarity index 100% rename from auth/authpb/auth.pb.go rename to api/authpb/auth.pb.go diff --git a/auth/authpb/auth.proto b/api/authpb/auth.proto similarity index 100% rename from auth/authpb/auth.proto rename to api/authpb/auth.proto diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/api/etcdserverpb/etcdserver.pb.go similarity index 100% rename from etcdserver/etcdserverpb/etcdserver.pb.go rename to api/etcdserverpb/etcdserver.pb.go diff --git a/etcdserver/etcdserverpb/etcdserver.proto b/api/etcdserverpb/etcdserver.proto similarity index 100% rename from etcdserver/etcdserverpb/etcdserver.proto rename to api/etcdserverpb/etcdserver.proto diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go similarity index 100% rename from etcdserver/etcdserverpb/gw/rpc.pb.gw.go rename to api/etcdserverpb/gw/rpc.pb.gw.go diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/api/etcdserverpb/raft_internal.pb.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal.pb.go rename to api/etcdserverpb/raft_internal.pb.go diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/api/etcdserverpb/raft_internal.proto similarity index 100% rename from etcdserver/etcdserverpb/raft_internal.proto rename to api/etcdserverpb/raft_internal.proto diff --git a/etcdserver/etcdserverpb/raft_internal_stringer.go b/api/etcdserverpb/raft_internal_stringer.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal_stringer.go rename to api/etcdserverpb/raft_internal_stringer.go diff --git a/etcdserver/etcdserverpb/raft_internal_stringer_test.go b/api/etcdserverpb/raft_internal_stringer_test.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal_stringer_test.go rename to api/etcdserverpb/raft_internal_stringer_test.go diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/api/etcdserverpb/rpc.pb.go similarity index 100% rename from etcdserver/etcdserverpb/rpc.pb.go rename to api/etcdserverpb/rpc.pb.go diff --git a/etcdserver/etcdserverpb/rpc.proto b/api/etcdserverpb/rpc.proto similarity index 100% rename from etcdserver/etcdserverpb/rpc.proto rename to api/etcdserverpb/rpc.proto diff --git a/etcdserver/api/membership/membershippb/membership.pb.go b/api/membershippb/membership.pb.go similarity index 100% rename from etcdserver/api/membership/membershippb/membership.pb.go rename to api/membershippb/membership.pb.go diff --git a/etcdserver/api/membership/membershippb/membership.proto b/api/membershippb/membership.proto similarity index 100% rename from etcdserver/api/membership/membershippb/membership.proto rename to api/membershippb/membership.proto diff --git a/mvcc/mvccpb/kv.pb.go b/api/mvccpb/kv.pb.go similarity index 100% rename from mvcc/mvccpb/kv.pb.go rename to api/mvccpb/kv.pb.go diff --git a/mvcc/mvccpb/kv.proto b/api/mvccpb/kv.proto similarity index 100% rename from mvcc/mvccpb/kv.proto rename to api/mvccpb/kv.proto diff --git a/etcdserver/api/v3rpc/rpctypes/doc.go b/api/v3rpc/rpctypes/doc.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/doc.go rename to api/v3rpc/rpctypes/doc.go diff --git a/etcdserver/api/v3rpc/rpctypes/error.go b/api/v3rpc/rpctypes/error.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/error.go rename to api/v3rpc/rpctypes/error.go diff --git a/etcdserver/api/v3rpc/rpctypes/error_test.go b/api/v3rpc/rpctypes/error_test.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/error_test.go rename to api/v3rpc/rpctypes/error_test.go diff --git a/etcdserver/api/v3rpc/rpctypes/md.go b/api/v3rpc/rpctypes/md.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/md.go rename to api/v3rpc/rpctypes/md.go diff --git a/etcdserver/api/v3rpc/rpctypes/metadatafields.go b/api/v3rpc/rpctypes/metadatafields.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/metadatafields.go rename to api/v3rpc/rpctypes/metadatafields.go diff --git a/version/version.go b/api/version/version.go similarity index 100% rename from version/version.go rename to api/version/version.go From 2edb08642c22c94a71a055d47ccf5f60d65e3490 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Tue, 6 Oct 2020 09:59:04 +0200 Subject: [PATCH 2/5] api: Make api/ a module that will contain proto-definitions. The module is supposed to contain minimal set of files that establish public etcd server API. In particular client libraries for etcd built in different languages might want to depend on this file. --- api/go.mod | 16 ++++++ api/go.sum | 121 ++++++++++++++++++++++++++++++++++++++++++++ scripts/test_lib.sh | 1 + 3 files changed, 138 insertions(+) create mode 100644 api/go.mod create mode 100644 api/go.sum diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 000000000..9979eab2f --- /dev/null +++ b/api/go.mod @@ -0,0 +1,16 @@ +module go.etcd.io/etcd/api/v3 + +go 1.15 + +require ( + github.com/coreos/go-semver v0.2.0 + github.com/gogo/protobuf v1.2.1 + github.com/golang/protobuf v1.3.2 + github.com/grpc-ecosystem/grpc-gateway v1.9.5 + golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 + google.golang.org/grpc v1.26.0 +) + +// Bad imports are sometimes causing attempts to pull that code. +// This makes the error more explicit. +replace go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 000000000..71e94b134 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,121 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.15.0 h1:ntPNC9TD/6l2XDenJZe6T5lSMg95thpV9sGAqHX4WU8= +github.com/grpc-ecosystem/grpc-gateway v1.15.0/go.mod h1:vO11I9oWA+KsxmfFQPhLnnIb1VDE24M+pdxZFiuZcA8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +go.etcd.io/etcd v0.5.0-alpha.5 h1:VOolFSo3XgsmnYDLozjvZ6JL6AAwIDu1Yx1y+4EYLDo= +go.etcd.io/etcd v3.3.25+incompatible h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c h1:dk0ukUIHmGHqASjP0iue2261isepFCC6XRCSd1nHgDw= +golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod h1:iQL9McJNjoIa5mjH6nYTCTZXUN6RP+XW3eib7Ya3XcI= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index 51279c4ca..dce300a08 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -96,6 +96,7 @@ function run_for_module { function run_for_modules { local pkg="${PKG:-./...}" if [ -z "${USERMOD}" ]; then + run_for_module "api" "$@" "${pkg}" || return "$?" run_for_module "." "$@" "${pkg}" || return "$?" else run_for_module "${USERMOD}" "$@" "${pkg}" || return "$?" From 28f2b07623312377814b896c360f3cce7052adc4 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Mon, 5 Oct 2020 17:21:03 +0200 Subject: [PATCH 3/5] *: Update references to code moved to the api/ dir. Follow up to file-moves done in the previous commit. The commit contains purely mechanical consequences of execution (apart of scripts/genproto.sh): % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/v3rpc/rpctypes|v3/api/v3rpc/rpctypes|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/version|v3/api/version|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/mvcc/mvccpb|v3/api/mvccpb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/etcdserverpb|v3/api/etcdserverpb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/membership/membershippb|v3/api/membershippb|g' % find ./ -name '*.go' | xargs sed --follow-symlinks -i 's|v3/auth/authpb|v3/api/authpb|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/mvcc/mvccpb/kv.proto|/api/mvccpb/kv.proto|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/auth/authpb/auth.proto|/api/authpb/auth.proto|g' % find ./ -name '*.proto' -o -name '*.md' | xargs -L 1 sed --follow-symlinks -i 's|/etcdserver/api/membership/membershippb/membership.proto|/api/membershippb/membership.proto|g' I also modified manually paths in scripts/genproto.sh. % go fmt ./... --- Documentation/learning/api.md | 4 +-- Documentation/rfc/v3api.md | 4 +-- api/etcdserverpb/gw/rpc.pb.gw.go | 4 +-- api/etcdserverpb/raft_internal.proto | 2 +- .../raft_internal_stringer_test.go | 2 +- api/etcdserverpb/rpc.proto | 4 +-- auth/range_perm_cache.go | 2 +- auth/range_perm_cache_test.go | 2 +- auth/store.go | 6 ++-- auth/store_test.go | 6 ++-- client/client.go | 2 +- client/client_test.go | 2 +- clientv3/auth.go | 4 +-- clientv3/balancer/balancer_test.go | 2 +- clientv3/client.go | 2 +- clientv3/client_test.go | 2 +- clientv3/cluster.go | 2 +- clientv3/compact_op.go | 2 +- clientv3/compact_op_test.go | 2 +- clientv3/compare.go | 2 +- clientv3/concurrency/election.go | 4 +-- clientv3/concurrency/key.go | 4 +-- clientv3/concurrency/mutex.go | 2 +- clientv3/credentials/credentials.go | 2 +- clientv3/ctx.go | 4 +-- clientv3/ctx_test.go | 4 +-- clientv3/example_kv_test.go | 2 +- clientv3/integration/black_hole_test.go | 2 +- clientv3/integration/dial_test.go | 2 +- clientv3/integration/kv_test.go | 6 ++-- clientv3/integration/lease_test.go | 2 +- clientv3/integration/maintenance_test.go | 2 +- clientv3/integration/mirror_test.go | 2 +- clientv3/integration/namespace_test.go | 2 +- .../integration/network_partition_test.go | 4 +-- clientv3/integration/role_test.go | 2 +- clientv3/integration/server_shutdown_test.go | 2 +- clientv3/integration/txn_test.go | 2 +- clientv3/integration/user_test.go | 2 +- clientv3/integration/watch_test.go | 6 ++-- clientv3/kv.go | 2 +- clientv3/lease.go | 4 +-- clientv3/leasing/cache.go | 4 +-- clientv3/leasing/kv.go | 6 ++-- clientv3/leasing/txn.go | 2 +- clientv3/leasing/util.go | 2 +- clientv3/maintenance.go | 2 +- clientv3/namespace/kv.go | 4 +-- clientv3/op.go | 2 +- clientv3/op_test.go | 2 +- clientv3/ordering/kv_test.go | 2 +- clientv3/retry.go | 4 +-- clientv3/retry_interceptor.go | 2 +- clientv3/snapshot/v3_snapshot.go | 2 +- clientv3/txn.go | 2 +- clientv3/watch.go | 6 ++-- clientv3/watch_test.go | 2 +- contrib/recipes/barrier.go | 2 +- contrib/recipes/client.go | 2 +- contrib/recipes/double_barrier.go | 2 +- contrib/recipes/priority_queue.go | 2 +- contrib/recipes/queue.go | 2 +- contrib/recipes/rwmutex.go | 2 +- contrib/recipes/watch.go | 2 +- embed/etcd.go | 2 +- embed/serve.go | 2 +- etcdctl/README.md | 6 ++-- etcdctl/ctlv2/command/backup_command.go | 2 +- etcdctl/ctlv2/ctl.go | 2 +- etcdctl/ctlv3/command/auth_command.go | 2 +- etcdctl/ctlv3/command/ep_command.go | 2 +- etcdctl/ctlv3/command/make_mirror_command.go | 4 +-- etcdctl/ctlv3/command/migrate_command.go | 4 +-- etcdctl/ctlv3/command/printer.go | 2 +- etcdctl/ctlv3/command/printer_fields.go | 4 +-- etcdctl/ctlv3/command/printer_protobuf.go | 4 +-- etcdctl/ctlv3/command/printer_simple.go | 2 +- etcdctl/ctlv3/command/txn_command.go | 2 +- etcdctl/ctlv3/command/util.go | 2 +- etcdctl/ctlv3/command/version_command.go | 2 +- etcdctl/ctlv3/help.go | 2 +- etcdmain/config.go | 2 +- etcdmain/grpc_proxy.go | 2 +- etcdserver/api/capability.go | 2 +- etcdserver/api/etcdhttp/base.go | 2 +- etcdserver/api/etcdhttp/metrics.go | 2 +- etcdserver/api/etcdhttp/peer_test.go | 2 +- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/membership/cluster.go | 2 +- etcdserver/api/membership/downgrade.go | 2 +- etcdserver/api/membership/downgrade_test.go | 2 +- etcdserver/api/rafthttp/http.go | 2 +- etcdserver/api/rafthttp/http_test.go | 2 +- etcdserver/api/rafthttp/pipeline_test.go | 2 +- etcdserver/api/rafthttp/stream.go | 2 +- etcdserver/api/rafthttp/stream_test.go | 2 +- etcdserver/api/rafthttp/util.go | 2 +- etcdserver/api/rafthttp/util_test.go | 2 +- etcdserver/api/v2auth/auth.go | 2 +- etcdserver/api/v2auth/auth_requests.go | 2 +- etcdserver/api/v2auth/auth_test.go | 2 +- etcdserver/api/v2http/client.go | 2 +- etcdserver/api/v2http/client_test.go | 2 +- etcdserver/api/v2http/http_test.go | 2 +- etcdserver/api/v2http/metrics.go | 2 +- etcdserver/api/v2v3/server.go | 2 +- etcdserver/api/v2v3/store.go | 2 +- etcdserver/api/v3alarm/alarms.go | 2 +- etcdserver/api/v3compactor/compactor.go | 2 +- etcdserver/api/v3compactor/compactor_test.go | 2 +- etcdserver/api/v3compactor/periodic.go | 2 +- etcdserver/api/v3compactor/periodic_test.go | 2 +- etcdserver/api/v3compactor/revision.go | 2 +- etcdserver/api/v3compactor/revision_test.go | 2 +- .../v3election/v3electionpb/v3election.proto | 4 +-- etcdserver/api/v3lock/v3lockpb/v3lock.proto | 2 +- etcdserver/api/v3rpc/auth.go | 2 +- etcdserver/api/v3rpc/grpc.go | 2 +- etcdserver/api/v3rpc/header.go | 2 +- etcdserver/api/v3rpc/interceptor.go | 4 +-- etcdserver/api/v3rpc/key.go | 4 +-- etcdserver/api/v3rpc/lease.go | 4 +-- etcdserver/api/v3rpc/maintenance.go | 6 ++-- etcdserver/api/v3rpc/member.go | 4 +-- etcdserver/api/v3rpc/quota.go | 4 +-- etcdserver/api/v3rpc/util.go | 4 +-- etcdserver/api/v3rpc/util_test.go | 2 +- etcdserver/api/v3rpc/watch.go | 6 ++-- etcdserver/api/v3rpc/watch_test.go | 4 +-- etcdserver/apply.go | 6 ++-- etcdserver/apply_auth.go | 2 +- etcdserver/cluster_util.go | 2 +- etcdserver/cluster_util_test.go | 2 +- etcdserver/corrupt.go | 4 +-- etcdserver/metrics.go | 2 +- etcdserver/quota.go | 2 +- etcdserver/raft.go | 2 +- etcdserver/server.go | 6 ++-- etcdserver/server_test.go | 2 +- etcdserver/storage.go | 2 +- etcdserver/util.go | 2 +- etcdserver/v2_server.go | 2 +- etcdserver/v3_server.go | 4 +-- functional/rpcpb/member.go | 2 +- functional/runner/help.go | 2 +- functional/tester/checker_lease_expire.go | 2 +- functional/tester/stresser_key.go | 2 +- functional/tester/stresser_lease.go | 2 +- go.mod | 7 ++++ integration/cluster.go | 2 +- integration/cluster_direct.go | 2 +- integration/metrics_test.go | 2 +- integration/v3_alarm_test.go | 4 +-- integration/v3_auth_test.go | 6 ++-- integration/v3_grpc_inflight_test.go | 4 +-- integration/v3_grpc_test.go | 4 +-- integration/v3_leadership_test.go | 4 +-- integration/v3_lease_test.go | 6 ++-- integration/v3_lock_test.go | 2 +- integration/v3_watch_restore_test.go | 2 +- integration/v3_watch_test.go | 4 +-- integration/v3election_grpc_test.go | 2 +- integration/v3lock_grpc_test.go | 2 +- lease/leasehttp/http.go | 2 +- lease/leasepb/lease.proto | 2 +- lease/lessor.go | 2 +- lease/lessor_test.go | 2 +- mvcc/kv.go | 2 +- mvcc/kv_test.go | 2 +- mvcc/kvstore.go | 2 +- mvcc/kvstore_test.go | 2 +- mvcc/kvstore_txn.go | 2 +- mvcc/util.go | 2 +- mvcc/watchable_store.go | 2 +- mvcc/watchable_store_test.go | 2 +- mvcc/watchable_store_txn.go | 2 +- mvcc/watcher.go | 2 +- mvcc/watcher_group.go | 2 +- mvcc/watcher_test.go | 2 +- pkg/mock/mockserver/mockserver.go | 2 +- .../grpcproxy/adapter/auth_client_adapter.go | 2 +- .../adapter/cluster_client_adapter.go | 2 +- proxy/grpcproxy/adapter/kv_client_adapter.go | 2 +- .../grpcproxy/adapter/lease_client_adapter.go | 2 +- .../adapter/maintenance_client_adapter.go | 2 +- .../grpcproxy/adapter/watch_client_adapter.go | 2 +- proxy/grpcproxy/auth.go | 2 +- proxy/grpcproxy/cache/store.go | 4 +-- proxy/grpcproxy/cluster.go | 4 +-- proxy/grpcproxy/cluster_test.go | 2 +- proxy/grpcproxy/health.go | 2 +- proxy/grpcproxy/kv.go | 2 +- proxy/grpcproxy/kv_test.go | 2 +- proxy/grpcproxy/lease.go | 4 +-- proxy/grpcproxy/maintenance.go | 2 +- proxy/grpcproxy/util.go | 2 +- proxy/grpcproxy/watch.go | 4 +-- proxy/grpcproxy/watch_broadcast.go | 2 +- proxy/grpcproxy/watcher.go | 4 +-- scripts/genproto.sh | 36 +++++++++++-------- tests/e2e/ctl_v3_member_test.go | 2 +- tests/e2e/ctl_v3_test.go | 2 +- tests/e2e/etcd_corrupt_test.go | 2 +- tests/e2e/etcd_release_upgrade_test.go | 2 +- tests/e2e/metrics_test.go | 2 +- tests/e2e/v3_cipher_suite_test.go | 2 +- tests/e2e/v3_curl_lease_test.go | 2 +- tests/e2e/v3_curl_test.go | 6 ++-- tools/etcd-dump-db/backend.go | 4 +-- tools/etcd-dump-logs/etcd-dump-log_test.go | 4 +-- tools/etcd-dump-logs/main.go | 2 +- 211 files changed, 306 insertions(+), 291 deletions(-) diff --git a/Documentation/learning/api.md b/Documentation/learning/api.md index 828c73eee..90de19c31 100644 --- a/Documentation/learning/api.md +++ b/Documentation/learning/api.md @@ -475,9 +475,9 @@ message LeaseKeepAliveResponse { * TTL - the new time-to-live, in seconds, that the lease has remaining. [elections]: https://github.com/etcd-io/etcd/blob/master/clientv3/concurrency/election.go -[kv-proto]: https://github.com/etcd-io/etcd/blob/master/mvcc/mvccpb/kv.proto +[kv-proto]: https://github.com/etcd-io/etcd/blob/master/api/mvccpb/kv.proto [grpc-api]: ../dev-guide/api_reference_v3.md -[grpc-service]: https://github.com/etcd-io/etcd/blob/master/etcdserver/etcdserverpb/rpc.proto +[grpc-service]: https://github.com/etcd-io/etcd/blob/master/api/etcdserverpb/rpc.proto [locks]: https://github.com/etcd-io/etcd/blob/master/clientv3/concurrency/mutex.go [mvcc]: https://en.wikipedia.org/wiki/Multiversion_concurrency_control [stm]: https://github.com/etcd-io/etcd/blob/master/clientv3/concurrency/stm.go diff --git a/Documentation/rfc/v3api.md b/Documentation/rfc/v3api.md index 21e081da4..6cee95e06 100644 --- a/Documentation/rfc/v3api.md +++ b/Documentation/rfc/v3api.md @@ -209,5 +209,5 @@ WatchResponse { ``` -[api-protobuf]: https://github.com/etcd-io/etcd/blob/master/etcdserver/etcdserverpb/rpc.proto -[kv-protobuf]: https://github.com/etcd-io/etcd/blob/master/mvcc/mvccpb/kv.proto +[api-protobuf]: https://github.com/etcd-io/etcd/blob/master/api/etcdserverpb/rpc.proto +[kv-protobuf]: https://github.com/etcd-io/etcd/blob/master/api/mvccpb/kv.proto diff --git a/api/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go index 5b1f7eba2..2ace64f13 100644 --- a/api/etcdserverpb/gw/rpc.pb.gw.go +++ b/api/etcdserverpb/gw/rpc.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: etcdserver/etcdserverpb/rpc.proto +// source: client/api/etcdserverpb/rpc.proto /* Package etcdserverpb is a reverse proxy. @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/v3/api/etcdserverpb" "io" "net/http" diff --git a/api/etcdserverpb/raft_internal.proto b/api/etcdserverpb/raft_internal.proto index b7f2f311f..68926e59f 100644 --- a/api/etcdserverpb/raft_internal.proto +++ b/api/etcdserverpb/raft_internal.proto @@ -4,7 +4,7 @@ package etcdserverpb; import "gogoproto/gogo.proto"; import "etcdserver.proto"; import "rpc.proto"; -import "etcd/etcdserver/api/membership/membershippb/membership.proto"; +import "etcd/api/membershippb/membership.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.sizer_all) = true; diff --git a/api/etcdserverpb/raft_internal_stringer_test.go b/api/etcdserverpb/raft_internal_stringer_test.go index 49e38e77c..35be87824 100644 --- a/api/etcdserverpb/raft_internal_stringer_test.go +++ b/api/etcdserverpb/raft_internal_stringer_test.go @@ -17,7 +17,7 @@ package etcdserverpb_test import ( "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) // TestInvalidGoYypeIntPanic tests conditions that caused diff --git a/api/etcdserverpb/rpc.proto b/api/etcdserverpb/rpc.proto index 1c27bafae..e63d4057b 100644 --- a/api/etcdserverpb/rpc.proto +++ b/api/etcdserverpb/rpc.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package etcdserverpb; import "gogoproto/gogo.proto"; -import "etcd/mvcc/mvccpb/kv.proto"; -import "etcd/auth/authpb/auth.proto"; +import "etcd/api/mvccpb/kv.proto"; +import "etcd/api/authpb/auth.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 9e33c0535..c4ad8e7c4 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,7 +15,7 @@ package auth import ( - "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/pkg/adt" diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go index 5e697d1b2..99be6b840 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,7 +17,7 @@ package auth import ( "testing" - "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/v3/pkg/adt" "go.uber.org/zap" diff --git a/auth/store.go b/auth/store.go index c6d02495b..674577a98 100644 --- a/auth/store.go +++ b/auth/store.go @@ -26,10 +26,10 @@ import ( "sync/atomic" "time" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/authpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/cindex" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" diff --git a/auth/store_test.go b/auth/store_test.go index 760126f23..9448a7655 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/api/v3/authpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" diff --git a/client/client.go b/client/client.go index 197b90247..ee6e0ef96 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index 8691db2df..efca97b01 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" ) type actionAssertingHTTPClient struct { diff --git a/clientv3/auth.go b/clientv3/auth.go index 39d391e94..a6f75d321 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/v3/auth/authpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/api/v3/authpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index 31f1fcbab..28ace00fd 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3/balancer/picker" "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/mock/mockserver" "go.uber.org/zap" diff --git a/clientv3/client.go b/clientv3/client.go index 960bb4099..8adf75551 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -26,11 +26,11 @@ import ( "time" "github.com/google/uuid" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3/balancer" "go.etcd.io/etcd/v3/clientv3/balancer/picker" "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" "go.etcd.io/etcd/v3/clientv3/credentials" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/logutil" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/client_test.go b/clientv3/client_test.go index 232aa441c..963a737f3 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/clientv3/cluster.go b/clientv3/cluster.go index 58721c4e0..3c9d88c0b 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,7 +17,7 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "google.golang.org/grpc" diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go index b1b09708a..a6e660aa8 100644 --- a/clientv3/compact_op.go +++ b/clientv3/compact_op.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) // CompactOp represents a compact operation. diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go index c4ddfc89e..f483322ad 100644 --- a/clientv3/compact_op_test.go +++ b/clientv3/compact_op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/api/v3/etcdserverpb" ) func TestCompactOp(t *testing.T) { diff --git a/clientv3/compare.go b/clientv3/compare.go index 149ab7893..e2967cf38 100644 --- a/clientv3/compare.go +++ b/clientv3/compare.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) type CompareTarget int diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go index 5dadb2e1b..7e7821579 100644 --- a/clientv3/concurrency/election.go +++ b/clientv3/concurrency/election.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) var ( diff --git a/clientv3/concurrency/key.go b/clientv3/concurrency/key.go index 684019ac5..61f2abe5a 100644 --- a/clientv3/concurrency/key.go +++ b/clientv3/concurrency/key.go @@ -18,9 +18,9 @@ import ( "context" "fmt" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error { diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index 8a1ef3fb9..22ecf2d1f 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) // ErrLocked is returned by TryLock when Mutex is already locked by another session. diff --git a/clientv3/credentials/credentials.go b/clientv3/credentials/credentials.go index bb049d045..42f688eb3 100644 --- a/clientv3/credentials/credentials.go +++ b/clientv3/credentials/credentials.go @@ -22,7 +22,7 @@ import ( "net" "sync" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" grpccredentials "google.golang.org/grpc/credentials" ) diff --git a/clientv3/ctx.go b/clientv3/ctx.go index a937f94e0..56b69cf2e 100644 --- a/clientv3/ctx.go +++ b/clientv3/ctx.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/ctx_test.go b/clientv3/ctx_test.go index 74deed61b..c0e054341 100644 --- a/clientv3/ctx_test.go +++ b/clientv3/ctx_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go index f5cbd7921..7aa4f6856 100644 --- a/clientv3/example_kv_test.go +++ b/clientv3/example_kv_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" ) func ExampleKV_put() { diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go index 950e0dae5..769bdbf42 100644 --- a/clientv3/integration/black_hole_test.go +++ b/clientv3/integration/black_hole_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index ecf1a05dc..9e62ce6ab 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index 168e64a20..3e25430c8 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index 51b0cd05e..49815806c 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index db160d212..b3cea9dbb 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" "google.golang.org/grpc" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index 48756ef2c..1d2397415 100644 --- a/clientv3/integration/mirror_test.go +++ b/clientv3/integration/mirror_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3/mirror" "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go index 959f419e8..7fa5ced08 100644 --- a/clientv3/integration/namespace_test.go +++ b/clientv3/integration/namespace_test.go @@ -19,10 +19,10 @@ import ( "reflect" "testing" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/namespace" "go.etcd.io/etcd/v3/integration" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index 2787b4c54..e3523d325 100644 --- a/clientv3/integration/network_partition_test.go +++ b/clientv3/integration/network_partition_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go index 61f2db6a2..0a75cf47c 100644 --- a/clientv3/integration/role_test.go +++ b/clientv3/integration/role_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go index d3cef6c18..a95c96237 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" diff --git a/clientv3/integration/txn_test.go b/clientv3/integration/txn_test.go index 9c4a4fd6f..050ae5011 100644 --- a/clientv3/integration/txn_test.go +++ b/clientv3/integration/txn_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go index 81fcd7721..e697f3cb8 100644 --- a/clientv3/integration/user_test.go +++ b/clientv3/integration/user_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go index e33e7605a..8e53f83f1 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" + mvccpb "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/integration" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 0628ed0f1..5e9fb7d45 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,7 +17,7 @@ package clientv3 import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/lease.go b/clientv3/lease.go index 5a26709c4..eb6e8dc3c 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index 377a487c7..d2683a549 100644 --- a/clientv3/leasing/cache.go +++ b/clientv3/leasing/cache.go @@ -20,9 +20,9 @@ import ( "sync" "time" + v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) const revokeBackoff = 2 * time.Second diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go index 804eeb2cf..d7bf95fe8 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,11 +20,11 @@ import ( "sync" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go index a9e4ed4a6..db34e48cb 100644 --- a/clientv3/leasing/txn.go +++ b/clientv3/leasing/txn.go @@ -18,8 +18,8 @@ import ( "context" "strings" + v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type txnLeasing struct { diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go index f72e1bcf4..5ab191d49 100644 --- a/clientv3/leasing/util.go +++ b/clientv3/leasing/util.go @@ -17,8 +17,8 @@ package leasing import ( "bytes" + v3pb "go.etcd.io/etcd/api/v3/etcdserverpb" v3 "go.etcd.io/etcd/v3/clientv3" - v3pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) func compareInt64(a, b int64) int { diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go index a2a7fd3b6..dbea530e6 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" ) diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go index 9899222a5..5cc902899 100644 --- a/clientv3/namespace/kv.go +++ b/clientv3/namespace/kv.go @@ -17,9 +17,9 @@ package namespace import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type kvPrefix struct { diff --git a/clientv3/op.go b/clientv3/op.go index f0592ccf5..03b0cceaa 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -14,7 +14,7 @@ package clientv3 -import pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" +import pb "go.etcd.io/etcd/api/v3/etcdserverpb" type opType int diff --git a/clientv3/op_test.go b/clientv3/op_test.go index cb0feb59e..762044fc5 100644 --- a/clientv3/op_test.go +++ b/clientv3/op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified, diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go index 6dc1989e4..a349f6019 100644 --- a/clientv3/ordering/kv_test.go +++ b/clientv3/ordering/kv_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type mockKV struct { diff --git a/clientv3/retry.go b/clientv3/retry.go index c4e840303..69ecc6314 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index 75f51be67..ff9ad601a 100644 --- a/clientv3/retry_interceptor.go +++ b/clientv3/retry_interceptor.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index 0e883e772..4b1196042 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -30,13 +30,13 @@ import ( "github.com/dustin/go-humanize" bolt "go.etcd.io/bbolt" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/cindex" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" diff --git a/clientv3/txn.go b/clientv3/txn.go index e4cac1521..22301fba6 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,7 +18,7 @@ import ( "context" "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/watch.go b/clientv3/watch.go index 773688488..73b65539e 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -21,9 +21,9 @@ import ( "sync" "time" - v3rpc "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" + v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go index 2efe81076..2a56ca4a9 100644 --- a/clientv3/watch_test.go +++ b/clientv3/watch_test.go @@ -17,7 +17,7 @@ package clientv3 import ( "testing" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" ) func TestEvent(t *testing.T) { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 0f82b9833..95d1ca866 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "context" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // Barrier creates a key in etcd to block processes, then deletes the key to diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go index d97d0303f..cdaf15553 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "errors" + spb "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - spb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 393b22a20..ba6cf3d29 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -17,9 +17,9 @@ package recipe import ( "context" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // DoubleBarrier blocks processes on Enter until an expected count enters, then diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index cd7b9ecf0..2c4e916aa 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -18,8 +18,8 @@ import ( "context" "fmt" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index ef609965b..b71ba1b0e 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "context" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 6b3a96473..ce6ff2a82 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "context" + "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 0ef394cd7..339fb2e0e 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "context" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // WaitEvents waits on a key until it observes the given events and returns the final one. diff --git a/embed/etcd.go b/embed/etcd.go index 85a4c7932..95e43ced9 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -29,6 +29,7 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" @@ -40,7 +41,6 @@ import ( runtimeutil "go.etcd.io/etcd/v3/pkg/runtime" "go.etcd.io/etcd/v3/pkg/transport" "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/soheilhy/cmux" diff --git a/embed/serve.go b/embed/serve.go index 71d892c5f..ffd42f2f9 100644 --- a/embed/serve.go +++ b/embed/serve.go @@ -23,6 +23,7 @@ import ( "net/http" "strings" + etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw" "go.etcd.io/etcd/v3/clientv3/credentials" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v3client" @@ -33,7 +34,6 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" v3lockgw "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb/gw" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - etcdservergw "go.etcd.io/etcd/v3/etcdserver/etcdserverpb/gw" "go.etcd.io/etcd/v3/pkg/debugutil" "go.etcd.io/etcd/v3/pkg/httputil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/etcdctl/README.md b/etcdctl/README.md index 5ec84dfd4..2fa019868 100644 --- a/etcdctl/README.md +++ b/etcdctl/README.md @@ -1682,6 +1682,6 @@ backward compatibility for `JSON` format and the format in non-interactive mode. [etcd]: https://github.com/coreos/etcd [READMEv2]: READMEv2.md [v2key]: ../store/node_extern.go#L28-L37 -[v3key]: ../mvcc/mvccpb/kv.proto#L12-L29 -[etcdrpc]: ../etcdserver/etcdserverpb/rpc.proto -[storagerpc]: ../mvcc/mvccpb/kv.proto +[v3key]: ../api/mvccpb/kv.proto#L12-L29 +[etcdrpc]: ../api/etcdserverpb/rpc.proto +[storagerpc]: ../api/mvccpb/kv.proto diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 3b6e0c576..a4072684c 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -23,9 +23,9 @@ import ( "regexp" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/idutil" "go.etcd.io/etcd/v3/pkg/pbutil" diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index 4cbfd9415..5e48c3ff6 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -20,8 +20,8 @@ import ( "os" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdctl/ctlv2/command" - "go.etcd.io/etcd/v3/version" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go index 3ec7cb2b4..8a889c60d 100644 --- a/etcdctl/ctlv3/command/auth_command.go +++ b/etcdctl/ctlv3/command/auth_command.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/cobra" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" ) // NewAuthCommand returns the cobra command for "auth". diff --git a/etcdctl/ctlv3/command/ep_command.go b/etcdctl/ctlv3/command/ep_command.go index 7cb6bb149..9b97a6681 100644 --- a/etcdctl/ctlv3/command/ep_command.go +++ b/etcdctl/ctlv3/command/ep_command.go @@ -20,8 +20,8 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" v3 "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/flags" "github.com/spf13/cobra" diff --git a/etcdctl/ctlv3/command/make_mirror_command.go b/etcdctl/ctlv3/command/make_mirror_command.go index eea33e179..9b69077bf 100644 --- a/etcdctl/ctlv3/command/make_mirror_command.go +++ b/etcdctl/ctlv3/command/make_mirror_command.go @@ -23,10 +23,10 @@ import ( "sync/atomic" "time" + "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/mirror" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 12620d136..d45beb7cb 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -24,6 +24,8 @@ import ( "path/filepath" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/client" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" @@ -31,10 +33,8 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 2bb6086c8..7ad9676de 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/dustin/go-humanize" ) diff --git a/etcdctl/ctlv3/command/printer_fields.go b/etcdctl/ctlv3/command/printer_fields.go index 38f5c7d93..6941636fc 100644 --- a/etcdctl/ctlv3/command/printer_fields.go +++ b/etcdctl/ctlv3/command/printer_fields.go @@ -17,10 +17,10 @@ package command import ( "fmt" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + spb "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - spb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type fieldsPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_protobuf.go b/etcdctl/ctlv3/command/printer_protobuf.go index 9c2446c84..8dd04e39d 100644 --- a/etcdctl/ctlv3/command/printer_protobuf.go +++ b/etcdctl/ctlv3/command/printer_protobuf.go @@ -18,9 +18,9 @@ import ( "fmt" "os" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + mvccpb "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type pbPrinter struct{ printer } diff --git a/etcdctl/ctlv3/command/printer_simple.go b/etcdctl/ctlv3/command/printer_simple.go index 1ed5c21da..e0213a2a2 100644 --- a/etcdctl/ctlv3/command/printer_simple.go +++ b/etcdctl/ctlv3/command/printer_simple.go @@ -19,9 +19,9 @@ import ( "os" "strings" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" v3 "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" ) diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go index a04a06f7e..a56ea00ee 100644 --- a/etcdctl/ctlv3/command/txn_command.go +++ b/etcdctl/ctlv3/command/txn_command.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/util.go b/etcdctl/ctlv3/command/util.go index f256ef01b..5c572f069 100644 --- a/etcdctl/ctlv3/command/util.go +++ b/etcdctl/ctlv3/command/util.go @@ -25,8 +25,8 @@ import ( "strings" "time" + pb "go.etcd.io/etcd/api/v3/mvccpb" v3 "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/mvcc/mvccpb" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index e59c64ca0..b65c29904 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index 229d02092..331e20cdd 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdmain/config.go b/etcdmain/config.go index d576d70b9..7295f34f9 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -24,10 +24,10 @@ import ( "os" "runtime" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/pkg/flags" "go.etcd.io/etcd/v3/pkg/logutil" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" "sigs.k8s.io/yaml" diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index dcab44e4a..29e36b384 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -29,6 +29,7 @@ import ( "path/filepath" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/leasing" "go.etcd.io/etcd/v3/clientv3/namespace" @@ -36,7 +37,6 @@ import ( "go.etcd.io/etcd/v3/embed" "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/debugutil" "go.etcd.io/etcd/v3/pkg/logutil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index a0edd5b4e..08ca4c186 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,8 +17,8 @@ package api import ( "sync" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index 5a1dfa64d..80e97479d 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -20,11 +20,11 @@ import ( "fmt" "net/http" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index 96fd189d5..5765028a7 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -23,8 +23,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/raft" "go.uber.org/zap" ) diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go index bc2f206eb..89222d46a 100644 --- a/etcdserver/api/etcdhttp/peer_test.go +++ b/etcdserver/api/etcdhttp/peer_test.go @@ -29,10 +29,10 @@ import ( "go.uber.org/zap" "github.com/coreos/go-semver/semver" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" ) diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index 63271c704..37a14dd1d 100644 --- a/etcdserver/api/etcdhttp/version_test.go +++ b/etcdserver/api/etcdhttp/version_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index b0939131b..aecd9ed15 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -27,13 +27,13 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/pkg/netutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/etcdserver/api/membership/downgrade.go b/etcdserver/api/membership/downgrade.go index 2ec2363c9..9fdafe22a 100644 --- a/etcdserver/api/membership/downgrade.go +++ b/etcdserver/api/membership/downgrade.go @@ -16,7 +16,7 @@ package membership import ( "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/membership/downgrade_test.go b/etcdserver/api/membership/downgrade_test.go index cbe7e7e5f..8bb612d35 100644 --- a/etcdserver/api/membership/downgrade_test.go +++ b/etcdserver/api/membership/downgrade_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 51dd290cc..b586e31ff 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -24,11 +24,11 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver/api/snap" pioutil "go.etcd.io/etcd/v3/pkg/ioutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index 5cb248c65..7cd4fa982 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index 0f8388ce8..bf4f33646 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index 4ee5ed749..f7a9714c2 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -25,12 +25,12 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/version" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" "go.etcd.io/etcd/v3/pkg/httputil" "go.etcd.io/etcd/v3/pkg/transport" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index d6bf5c153..f97e5ed6d 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/util.go b/etcdserver/api/rafthttp/util.go index 204f028f1..f084c0c68 100644 --- a/etcdserver/api/rafthttp/util.go +++ b/etcdserver/api/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/transport" "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index 41e1256c6..857f06bc5 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/v2auth/auth.go b/etcdserver/api/v2auth/auth.go index dfefc3545..6cb4d676b 100644 --- a/etcdserver/api/v2auth/auth.go +++ b/etcdserver/api/v2auth/auth.go @@ -26,9 +26,9 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" diff --git a/etcdserver/api/v2auth/auth_requests.go b/etcdserver/api/v2auth/auth_requests.go index a6cbfe7e5..d3742b889 100644 --- a/etcdserver/api/v2auth/auth_requests.go +++ b/etcdserver/api/v2auth/auth_requests.go @@ -19,9 +19,9 @@ import ( "encoding/json" "path" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2auth/auth_test.go b/etcdserver/api/v2auth/auth_test.go index 6fdac203d..4264a976f 100644 --- a/etcdserver/api/v2auth/auth_test.go +++ b/etcdserver/api/v2auth/auth_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client.go b/etcdserver/api/v2http/client.go index d758bd49c..f8a93a7ce 100644 --- a/etcdserver/api/v2http/client.go +++ b/etcdserver/api/v2http/client.go @@ -27,6 +27,7 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" @@ -36,7 +37,6 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index fbf1fae38..2722d9701 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -29,13 +29,13 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index a5cdbcad4..cc0ddb099 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -22,10 +22,10 @@ import ( "sort" "testing" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 03ca58b96..848ceade5 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -20,9 +20,9 @@ import ( "net/http" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/api/v2v3/server.go b/etcdserver/api/v2v3/server.go index 0093f6e0a..773b688e1 100644 --- a/etcdserver/api/v2v3/server.go +++ b/etcdserver/api/v2v3/server.go @@ -19,11 +19,11 @@ import ( "net/http" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "github.com/coreos/go-semver/semver" diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index e446ceda1..d225181b4 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -22,11 +22,11 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) // store implements the Store interface for V2 using diff --git a/etcdserver/api/v3alarm/alarms.go b/etcdserver/api/v3alarm/alarms.go index 0a46f735b..e1035b537 100644 --- a/etcdserver/api/v3alarm/alarms.go +++ b/etcdserver/api/v3alarm/alarms.go @@ -18,7 +18,7 @@ package v3alarm import ( "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/pkg/types" diff --git a/etcdserver/api/v3compactor/compactor.go b/etcdserver/api/v3compactor/compactor.go index 7a05f0693..e352670c1 100644 --- a/etcdserver/api/v3compactor/compactor.go +++ b/etcdserver/api/v3compactor/compactor.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/etcdserver/api/v3compactor/compactor_test.go b/etcdserver/api/v3compactor/compactor_test.go index c10a39858..1060ddb44 100644 --- a/etcdserver/api/v3compactor/compactor_test.go +++ b/etcdserver/api/v3compactor/compactor_test.go @@ -18,7 +18,7 @@ import ( "context" "sync/atomic" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/etcdserver/api/v3compactor/periodic.go b/etcdserver/api/v3compactor/periodic.go index fa0d45330..b3c1d3900 100644 --- a/etcdserver/api/v3compactor/periodic.go +++ b/etcdserver/api/v3compactor/periodic.go @@ -19,7 +19,7 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v3compactor/periodic_test.go b/etcdserver/api/v3compactor/periodic_test.go index 31248d772..08e4eddf3 100644 --- a/etcdserver/api/v3compactor/periodic_test.go +++ b/etcdserver/api/v3compactor/periodic_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v3compactor/revision.go b/etcdserver/api/v3compactor/revision.go index a4d6d3c52..1ab216662 100644 --- a/etcdserver/api/v3compactor/revision.go +++ b/etcdserver/api/v3compactor/revision.go @@ -19,7 +19,7 @@ import ( "sync" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v3compactor/revision_test.go b/etcdserver/api/v3compactor/revision_test.go index f4085abca..90ae6c7c1 100644 --- a/etcdserver/api/v3compactor/revision_test.go +++ b/etcdserver/api/v3compactor/revision_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.proto b/etcdserver/api/v3election/v3electionpb/v3election.proto index 918f39fa8..24ccaf138 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.proto +++ b/etcdserver/api/v3election/v3electionpb/v3election.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package v3electionpb; import "gogoproto/gogo.proto"; -import "etcd/etcdserver/etcdserverpb/rpc.proto"; -import "etcd/mvcc/mvccpb/kv.proto"; +import "etcd/api/etcdserverpb/rpc.proto"; +import "etcd/api/mvccpb/kv.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.proto b/etcdserver/api/v3lock/v3lockpb/v3lock.proto index 7220c7f0a..1b5c456ae 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.proto +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v3lockpb; import "gogoproto/gogo.proto"; -import "etcd/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/api/etcdserverpb/rpc.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 97129aa03..52cdd6965 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -17,8 +17,8 @@ package v3rpc import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type AuthServer struct { diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go index 2e9910746..f3c973d7b 100644 --- a/etcdserver/api/v3rpc/grpc.go +++ b/etcdserver/api/v3rpc/grpc.go @@ -18,8 +18,8 @@ import ( "crypto/tls" "math" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" diff --git a/etcdserver/api/v3rpc/header.go b/etcdserver/api/v3rpc/header.go index 04c5f5714..0238d811c 100644 --- a/etcdserver/api/v3rpc/header.go +++ b/etcdserver/api/v3rpc/header.go @@ -15,8 +15,8 @@ package v3rpc import ( + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type header struct { diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index fb0328166..3b31b6deb 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -19,13 +19,13 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go index 19a0320cf..748e9804a 100644 --- a/etcdserver/api/v3rpc/key.go +++ b/etcdserver/api/v3rpc/key.go @@ -18,9 +18,9 @@ package v3rpc import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/adt" ) diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go index 8bbcebad3..170892c21 100644 --- a/etcdserver/api/v3rpc/lease.go +++ b/etcdserver/api/v3rpc/lease.go @@ -18,9 +18,9 @@ import ( "context" "io" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.uber.org/zap" diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 1d96e970a..9d2dde2b6 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -21,14 +21,14 @@ import ( "time" "github.com/dustin/go-humanize" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/version" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/member.go b/etcdserver/api/v3rpc/member.go index 5cf3feaf7..394594c06 100644 --- a/etcdserver/api/v3rpc/member.go +++ b/etcdserver/api/v3rpc/member.go @@ -18,11 +18,11 @@ import ( "context" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" ) diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go index b40edbdfc..b26bd27a3 100644 --- a/etcdserver/api/v3rpc/quota.go +++ b/etcdserver/api/v3rpc/quota.go @@ -17,9 +17,9 @@ package v3rpc import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" ) diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index 2ae37af05..89938fe05 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,11 +18,11 @@ import ( "context" "strings" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" diff --git a/etcdserver/api/v3rpc/util_test.go b/etcdserver/api/v3rpc/util_test.go index b84a267d5..cd5674a57 100644 --- a/etcdserver/api/v3rpc/util_test.go +++ b/etcdserver/api/v3rpc/util_test.go @@ -19,7 +19,7 @@ import ( "errors" "testing" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/mvcc" "google.golang.org/grpc/codes" diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index 2144779fc..4c7794f6a 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -21,12 +21,12 @@ import ( "sync" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v3rpc/watch_test.go b/etcdserver/api/v3rpc/watch_test.go index f507f5eab..bd3f4943b 100644 --- a/etcdserver/api/v3rpc/watch_test.go +++ b/etcdserver/api/v3rpc/watch_test.go @@ -19,8 +19,8 @@ import ( "math" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" ) func TestSendFragment(t *testing.T) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 201486a71..fc7667585 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -22,14 +22,14 @@ import ( "time" "github.com/coreos/go-semver/semver" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/membershippb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/membership/membershippb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" "go.etcd.io/etcd/v3/pkg/types" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 40ed7bde5..f36217a52 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -18,8 +18,8 @@ import ( "context" "sync" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/auth" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/pkg/traceutil" diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index fc09e1a39..8b9edbb03 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -24,9 +24,9 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 29ba9f90d..8571cc08a 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/types" - "go.etcd.io/etcd/v3/version" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index 5e68c4bd0..a57b993d7 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/pkg/traceutil" "go.etcd.io/etcd/v3/pkg/types" diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index 417e05f21..502f9f739 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -18,8 +18,8 @@ import ( goruntime "runtime" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/runtime" - "go.etcd.io/etcd/v3/version" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/etcdserver/quota.go b/etcdserver/quota.go index 4727ac14a..eb8967d62 100644 --- a/etcdserver/quota.go +++ b/etcdserver/quota.go @@ -17,7 +17,7 @@ package etcdserver import ( "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/raft.go b/etcdserver/raft.go index e4bd7635b..b68d1b444 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -23,9 +23,9 @@ import ( "sync" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/contention" "go.etcd.io/etcd/v3/pkg/logutil" "go.etcd.io/etcd/v3/pkg/pbutil" diff --git a/etcdserver/server.go b/etcdserver/server.go index 6e04a14d8..fb5d04ea6 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -34,10 +34,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/membershippb" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/membership/membershippb" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/api/v2discovery" @@ -47,7 +49,6 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/v3alarm" "go.etcd.io/etcd/v3/etcdserver/api/v3compactor" "go.etcd.io/etcd/v3/etcdserver/cindex" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/lease/leasehttp" "go.etcd.io/etcd/v3/mvcc" @@ -62,7 +63,6 @@ import ( "go.etcd.io/etcd/v3/pkg/wait" "go.etcd.io/etcd/v3/raft" "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/version" "go.etcd.io/etcd/v3/wal" ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index d09ccc30b..fb34d2283 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/cindex" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 88271aaca..bf8b954d7 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -17,8 +17,8 @@ package etcdserver import ( "io" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" diff --git a/etcdserver/util.go b/etcdserver/util.go index 9c7128097..c519cfbf7 100644 --- a/etcdserver/util.go +++ b/etcdserver/util.go @@ -21,9 +21,9 @@ import ( "time" "github.com/golang/protobuf/proto" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/types" "go.uber.org/zap" diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go index cf6bc05d6..a95408d8d 100644 --- a/etcdserver/v2_server.go +++ b/etcdserver/v2_server.go @@ -18,8 +18,8 @@ import ( "context" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type RequestV2 pb.Request diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 2f50f0f0e..8c3881b33 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -22,10 +22,10 @@ import ( "strconv" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/etcdserver/api/membership/membershippb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/lease/leasehttp" "go.etcd.io/etcd/v3/mvcc" diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index f9ea5528b..47bd9438d 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -22,9 +22,9 @@ import ( "os" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/snapshot" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/logutil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/functional/runner/help.go b/functional/runner/help.go index 06196a89e..9bf9560a7 100644 --- a/functional/runner/help.go +++ b/functional/runner/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/functional/tester/checker_lease_expire.go b/functional/tester/checker_lease_expire.go index 668ee41dc..524977df5 100644 --- a/functional/tester/checker_lease_expire.go +++ b/functional/tester/checker_lease_expire.go @@ -19,8 +19,8 @@ import ( "fmt" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" diff --git a/functional/tester/stresser_key.go b/functional/tester/stresser_key.go index ca3d50ecf..402a1aef9 100644 --- a/functional/tester/stresser_key.go +++ b/functional/tester/stresser_key.go @@ -23,9 +23,9 @@ import ( "sync/atomic" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/functional/rpcpb" "go.etcd.io/etcd/v3/raft" diff --git a/functional/tester/stresser_lease.go b/functional/tester/stresser_lease.go index 45671154e..e046234e8 100644 --- a/functional/tester/stresser_lease.go +++ b/functional/tester/stresser_lease.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/v3/functional/rpcpb" "go.uber.org/zap" diff --git a/go.mod b/go.mod index e585a0019..b5e2bb9b7 100644 --- a/go.mod +++ b/go.mod @@ -39,6 +39,7 @@ require ( github.com/urfave/cli v1.20.0 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 go.etcd.io/bbolt v1.3.5 + go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 go.uber.org/zap v1.15.0 golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 @@ -50,3 +51,9 @@ require ( gopkg.in/yaml.v2 v2.2.2 sigs.k8s.io/yaml v1.1.0 ) + +// Bad imports are sometimes causing attempts to pull that code. +// This makes the error more explicit. +replace go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY + +replace go.etcd.io/etcd/api/v3 => ./api diff --git a/integration/cluster.go b/integration/cluster.go index e29f66616..284319e19 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -33,6 +33,7 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/client" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" @@ -46,7 +47,6 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/v3lock" lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/logutil" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/tlsutil" diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index 0db7b232e..c0b15908b 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) const ThroughProxy = false diff --git a/integration/metrics_test.go b/integration/metrics_test.go index 288d5c2a0..8e429b837 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" ) diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index 02fa128ca..57aa07ba1 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/etcdserver/cindex" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/pkg/testutil" diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 93764d2fc..f928be48e 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/api/v3/authpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go index 4b7ccea02..8745cd540 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index b27f99572..2191a5d17 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index 5b51dab86..ec79e2552 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go index 4f88995ee..6a4c9c7d2 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/codes" diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index bafaf9d03..bb85ccaab 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" recipe "go.etcd.io/etcd/v3/contrib/recipes" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/integration/v3_watch_restore_test.go b/integration/v3_watch_restore_test.go index f2f64fae9..a7dc0b504 100644 --- a/integration/v3_watch_restore_test.go +++ b/integration/v3_watch_restore_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) // MustFetchNotEmptyMetric attempts to fetch given 'metric' from 'member', diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index 38cc17dd9..444b79d47 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index 2e13a7c0d..60ede52e5 100644 --- a/integration/v3election_grpc_test.go +++ b/integration/v3election_grpc_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index 3ecb7e2a1..d4c6b03af 100644 --- a/integration/v3lock_grpc_test.go +++ b/integration/v3lock_grpc_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" lockpb "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index 27f042bb4..933b0b737 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/lease/leasepb" "go.etcd.io/etcd/v3/pkg/httputil" diff --git a/lease/leasepb/lease.proto b/lease/leasepb/lease.proto index 1169d9f10..5b40e3b17 100644 --- a/lease/leasepb/lease.proto +++ b/lease/leasepb/lease.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package leasepb; import "gogoproto/gogo.proto"; -import "etcd/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/api/etcdserverpb/rpc.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.sizer_all) = true; diff --git a/lease/lessor.go b/lease/lessor.go index 9a8ba5a81..f4f82d7ba 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -24,8 +24,8 @@ import ( "sync" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/cindex" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/lease/leasepb" "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" diff --git a/lease/lessor_test.go b/lease/lessor_test.go index 200171eb6..38f5b42d2 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/mvcc/backend" "go.uber.org/zap" ) diff --git a/mvcc/kv.go b/mvcc/kv.go index e26d8a637..0b8831610 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" ) diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index 25b45403e..03dd3b04d 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/traceutil" diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index 6bafb270a..ac6a7735f 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -23,10 +23,10 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/etcdserver/cindex" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/schedule" "go.etcd.io/etcd/v3/pkg/traceutil" diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index d61f392be..81d519562 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/schedule" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/traceutil" diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 28e39d0c6..c1d3b7f57 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/util.go b/mvcc/util.go index 86d4805fe..b99d6c838 100644 --- a/mvcc/util.go +++ b/mvcc/util.go @@ -18,8 +18,8 @@ import ( "encoding/binary" "fmt" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index 130279f54..42f6b455a 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,10 +18,10 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/etcdserver/cindex" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index 7f2a720d3..48047d2ca 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/etcdserver/cindex" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" "go.uber.org/zap" ) diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index 7bf6cdb7f..bc3dc85c7 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -15,7 +15,7 @@ package mvcc import ( - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/pkg/traceutil" ) diff --git a/mvcc/watcher.go b/mvcc/watcher.go index 2a3cb4ada..f48a9ef3b 100644 --- a/mvcc/watcher.go +++ b/mvcc/watcher.go @@ -19,7 +19,7 @@ import ( "errors" "sync" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" ) // AutoWatchID is the watcher ID passed in WatchStream.Watch when no diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go index 310220360..3bad9f281 100644 --- a/mvcc/watcher_group.go +++ b/mvcc/watcher_group.go @@ -18,7 +18,7 @@ import ( "fmt" "math" - "go.etcd.io/etcd/v3/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/pkg/adt" ) diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index b4b426edb..ef53e6843 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" "go.uber.org/zap" ) diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go index c68cb3c2c..21a8b013b 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index ffdb3449f..140212b96 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go index b5dab26ca..c1fff054d 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go index cc08e09d0..ddb6ada47 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go index e2c9518c5..6640d1d39 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go index ca5b0c86c..6369a16d8 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go index 5bede2594..fbc09f6ff 100644 --- a/proxy/grpcproxy/adapter/watch_client_adapter.go +++ b/proxy/grpcproxy/adapter/watch_client_adapter.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index f5c652ed7..be699d9ca 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index bfbae2682..e85c691a3 100644 --- a/proxy/grpcproxy/cache/store.go +++ b/proxy/grpcproxy/cache/store.go @@ -21,8 +21,8 @@ import ( "sync" "github.com/golang/groupcache/lru" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/pkg/adt" ) diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index d91d0c847..5f3ab7658 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -21,10 +21,10 @@ import ( "os" "sync" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/naming" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index 3d63180a9..530531cb4 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index 0e1f2f015..a546dadae 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -20,9 +20,9 @@ import ( "net/http" "time" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/etcdhttp" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" ) diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 7340326f5..6fbbedf00 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/proxy/grpcproxy/cache" ) diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index 49ee69863..86a3106de 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index f10acf60a..5fb3cad4a 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index ca6c0b638..82cc53616 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/util.go b/proxy/grpcproxy/util.go index f33479c24..856ac5769 100644 --- a/proxy/grpcproxy/util.go +++ b/proxy/grpcproxy/util.go @@ -17,7 +17,7 @@ package grpcproxy import ( "context" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index 146b466a6..e884d9bd1 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +18,10 @@ import ( "context" "sync" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" "google.golang.org/grpc/codes" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index fc62e6dd6..e7d901e53 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -19,8 +19,8 @@ import ( "sync" "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.uber.org/zap" ) diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 879b8179e..881fe030c 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/mvcc/mvccpb" ) type watchRange struct { diff --git a/scripts/genproto.sh b/scripts/genproto.sh index d50d535a0..31462485c 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -10,13 +10,13 @@ if ! [[ "$0" =~ scripts/genproto.sh ]]; then exit 255 fi -if [[ $(protoc --version | cut -f2 -d' ') != "3.7.1" ]]; then - echo "could not find protoc 3.7.1, is it installed + in PATH?" +if [[ $(protoc --version | cut -f2 -d' ') != "3.12.3" ]]; then + echo "could not find protoc 3.12.3, is it installed + in PATH?" exit 255 fi # directories containing protos to be built -DIRS="./wal/walpb ./etcdserver/etcdserverpb ./etcdserver/api/snap/snappb ./raft/raftpb ./mvcc/mvccpb ./lease/leasepb ./auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb ./etcdserver/api/membership/membershippb" +DIRS="./wal/walpb ./api/etcdserverpb ./etcdserver/api/snap/snappb ./raft/raftpb ./api/mvccpb ./lease/leasepb ./api/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb ./api/membershippb" # disable go mod - this is for the go get/install invocations export GO111MODULE=off @@ -82,7 +82,9 @@ for dir in ${DIRS}; do # shellcheck disable=SC1117 sed -i.bak -E 's/import _ \"google\.golang\.org\/genproto\/googleapis\/api\/annotations\"//g' ./*.pb.go # shellcheck disable=SC1117 - sed -i.bak -E "s/go.etcd.io\/etcd\//go.etcd.io\/etcd\/v3\//" ./*.pb.go + sed -i.bak -E "s|go.etcd.io/etcd|go.etcd.io/etcd/v3|g" ./*.pb.go + # shellcheck disable=SC1117 + sed -i.bak -E "s|go.etcd.io/etcd/v3/api|go.etcd.io/etcd/api/v3|g" ./*.pb.go rm -f ./*.bak gofmt -s -w ./*.pb.go goimports -w ./*.pb.go @@ -91,8 +93,8 @@ done # remove old swagger files so it's obvious whether the files fail to generate rm -rf Documentation/dev-guide/apispec/swagger/*json -for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionpb/v3election; do - protobase="etcdserver/${pb}" +for pb in api/etcdserverpb/rpc etcdserver/api/v3lock/v3lockpb/v3lock etcdserver/api/v3election/v3electionpb/v3election; do + protobase="${pb}" protoc -I. \ -I"${GRPC_GATEWAY_ROOT}"/third_party/googleapis \ -I"${GOGOPROTO_PATH}" \ @@ -104,6 +106,10 @@ for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionp pkgpath=$(dirname "${protobase}") pkg=$(basename "${pkgpath}") gwfile="${protobase}.pb.gw.go" + + echo ">>> $gwfile" + head -n 30 "$gwfile" + sed -i.bak -E "s/package $pkg/package gw/g" ${gwfile} # shellcheck disable=SC1117 sed -i.bak -E "s/protoReq /&$pkg\./g" ${gwfile} @@ -113,15 +119,17 @@ for pb in etcdserverpb/rpc api/v3lock/v3lockpb/v3lock api/v3election/v3electionp sed -i.bak -E "s/New[A-Za-z]*Client/${pkg}.&/" ${gwfile} # darwin doesn't like newlines in sed... # shellcheck disable=SC1117 - sed -i.bak -E "s|import \(|& \"go.etcd.io/etcd/v3/${pkgpath}\"|" ${gwfile} + sed -i.bak -E "s|import \(|& \"go.etcd.io/etcd/${pkgpath}\"|" ${gwfile} # shellcheck disable=SC1117 - sed -i.bak -E "s/go.etcd.io\etcd\//go.etcd.io\/etcd\/v3/" ${gwfile} + sed -i.bak -E "s|go.etcd.io/etcd|go.etcd.io/etcd/v3|g" ${gwfile} + # shellcheck disable=SC1117 + sed -i.bak -E "s|go.etcd.io/etcd/v3/api|go.etcd.io/etcd/api/v3|g" ${gwfile} mkdir -p "${pkgpath}"/gw/ go fmt ${gwfile} mv ${gwfile} "${pkgpath}/gw/" - rm -f ./etcdserver/${pb}*.bak - swaggerName=$(basename ${pb}) - mv Documentation/dev-guide/apispec/swagger/etcdserver/${pb}.swagger.json \ + rm -f ./${protobase}*.bak + swaggerName=$(basename ${protobase}) + mv Documentation/dev-guide/apispec/swagger/${protobase}.swagger.json \ Documentation/dev-guide/apispec/swagger/"${swaggerName}".swagger.json done rm -rf Documentation/dev-guide/apispec/swagger/etcdserver/ @@ -151,13 +159,13 @@ if [ "$1" != "--skip-protodoc" ]; then echo "protodoc is updated" popd - protodoc --directories="etcdserver/etcdserverpb=service_message,mvcc/mvccpb=service_message,lease/leasepb=service_message,auth/authpb=service_message" \ + protodoc --directories="api/etcdserverpb=service_message,api/mvccpb=service_message,lease/leasepb=service_message,api/authpb=service_message" \ --title="etcd API Reference" \ --output="Documentation/dev-guide/api_reference_v3.md" \ - --message-only-from-this-file="etcdserver/etcdserverpb/rpc.proto" \ + --message-only-from-this-file="api/etcdserverpb/rpc.proto" \ --disclaimer="This is a generated documentation. Please read the proto files for more." - protodoc --directories="etcdserver/api/v3lock/v3lockpb=service_message,etcdserver/api/v3election/v3electionpb=service_message,mvcc/mvccpb=service_message" \ + protodoc --directories="etcdserver/api/v3lock/v3lockpb=service_message,etcdserver/api/v3election/v3electionpb=service_message,api/mvccpb=service_message" \ --title="etcd concurrency API Reference" \ --output="Documentation/dev-guide/api_concurrency_reference_v3.md" \ --disclaimer="This is a generated documentation. Please read the proto files for more." diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go index b324160fd..a711d0d23 100644 --- a/tests/e2e/ctl_v3_member_test.go +++ b/tests/e2e/ctl_v3_member_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/api/v3/etcdserverpb" ) func TestCtlV3MemberList(t *testing.T) { testCtl(t, memberListTest) } diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index fdcb6d234..532e2fddf 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/flags" "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index f5aed150c..78f448662 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/mvcc/mvccpb" bolt "go.etcd.io/bbolt" ) diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index 53ecde18e..3f666745f 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/v3/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/testutil" - "go.etcd.io/etcd/v3/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index e20b0f88d..6ae6d2fed 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 9b0548878..16db27e47 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "go.etcd.io/etcd/v3/version" + "go.etcd.io/etcd/api/v3/version" ) func TestV3CurlCipherSuitesValid(t *testing.T) { testV3CurlCipherSuites(t, true) } diff --git a/tests/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go index 91e59243c..5dea0726e 100644 --- a/tests/e2e/v3_curl_lease_test.go +++ b/tests/e2e/v3_curl_lease_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" ) func TestV3CurlLeaseGrantNoTLS(t *testing.T) { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index a19cb68d4..76e24204c 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/api/v3/authpb" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" epb "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" - "go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes" - pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/testutil" "github.com/grpc-ecosystem/grpc-gateway/runtime" diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 44e304209..7e8f64d8f 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -17,13 +17,13 @@ package main import ( "encoding/binary" "fmt" - "go.etcd.io/etcd/v3/auth/authpb" + "go.etcd.io/etcd/api/v3/authpb" "path/filepath" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/v3/lease/leasepb" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/mvcc/mvccpb" bolt "go.etcd.io/bbolt" ) diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index f7c802341..99ebd4213 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "go.etcd.io/etcd/v3/auth/authpb" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + "go.etcd.io/etcd/api/v3/authpb" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/raft/raftpb" diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index c59b3c9e2..a75382439 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,8 +28,8 @@ import ( "strings" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" From ec3026fdc9d0b71f8dd5b6056ce3e5a7922a04d7 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Mon, 5 Oct 2020 17:32:19 +0200 Subject: [PATCH 4/5] *: Run ./scripts/genproto.sh (protoc 3.12.3) after proto file moves. The changed blobs are consequences of proto-descriptors changing as a result of file moves. --- .../dev-guide/api_concurrency_reference_v3.md | 4 +- Documentation/dev-guide/api_reference_v3.md | 214 ++++---- .../apispec/swagger/rpc.swagger.json | 157 +++--- .../apispec/swagger/v3election.swagger.json | 10 +- .../apispec/swagger/v3lock.swagger.json | 4 +- api/etcdserverpb/gw/rpc.pb.gw.go | 4 +- api/etcdserverpb/raft_internal.pb.go | 129 +++-- api/etcdserverpb/rpc.pb.go | 518 +++++++++--------- .../v3election/v3electionpb/v3election.pb.go | 72 +-- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 42 +- lease/leasepb/lease.pb.go | 32 +- 11 files changed, 581 insertions(+), 605 deletions(-) diff --git a/Documentation/dev-guide/api_concurrency_reference_v3.md b/Documentation/dev-guide/api_concurrency_reference_v3.md index a5ae7624c..3ea9d4a60 100644 --- a/Documentation/dev-guide/api_concurrency_reference_v3.md +++ b/Documentation/dev-guide/api_concurrency_reference_v3.md @@ -143,7 +143,7 @@ The election service exposes client-side election facilities as a gRPC interface -##### message `Event` (mvcc/mvccpb/kv.proto) +##### message `Event` (api/mvccpb/kv.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -153,7 +153,7 @@ The election service exposes client-side election facilities as a gRPC interface -##### message `KeyValue` (mvcc/mvccpb/kv.proto) +##### message `KeyValue` (api/mvccpb/kv.proto) | Field | Description | Type | | ----- | ----------- | ---- | diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index f2904a981..e27258506 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -4,7 +4,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `Auth` (etcdserver/etcdserverpb/rpc.proto) +##### service `Auth` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -28,7 +28,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `Cluster` (etcdserver/etcdserverpb/rpc.proto) +##### service `Cluster` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -40,7 +40,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `KV` (etcdserver/etcdserverpb/rpc.proto) +##### service `KV` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -52,7 +52,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `Lease` (etcdserver/etcdserverpb/rpc.proto) +##### service `Lease` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -64,7 +64,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `Maintenance` (etcdserver/etcdserverpb/rpc.proto) +##### service `Maintenance` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -79,7 +79,7 @@ This is a generated documentation. Please read the proto files for more. -##### service `Watch` (etcdserver/etcdserverpb/rpc.proto) +##### service `Watch` (api/etcdserverpb/rpc.proto) | Method | Request Type | Response Type | Description | | ------ | ------------ | ------------- | ----------- | @@ -87,7 +87,7 @@ This is a generated documentation. Please read the proto files for more. -##### message `AlarmMember` (etcdserver/etcdserverpb/rpc.proto) +##### message `AlarmMember` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -96,7 +96,7 @@ This is a generated documentation. Please read the proto files for more. -##### message `AlarmRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AlarmRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -106,7 +106,7 @@ This is a generated documentation. Please read the proto files for more. -##### message `AlarmResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AlarmResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -115,13 +115,13 @@ This is a generated documentation. Please read the proto files for more. -##### message `AuthDisableRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthDisableRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `AuthDisableResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthDisableResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -129,13 +129,13 @@ Empty field. -##### message `AuthEnableRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthEnableRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `AuthEnableResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthEnableResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -143,7 +143,7 @@ Empty field. -##### message `AuthRoleAddRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleAddRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -151,7 +151,7 @@ Empty field. -##### message `AuthRoleAddResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleAddResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -159,7 +159,7 @@ Empty field. -##### message `AuthRoleDeleteRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleDeleteRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -167,7 +167,7 @@ Empty field. -##### message `AuthRoleDeleteResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleDeleteResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -175,7 +175,7 @@ Empty field. -##### message `AuthRoleGetRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleGetRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -183,7 +183,7 @@ Empty field. -##### message `AuthRoleGetResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleGetResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -192,7 +192,7 @@ Empty field. -##### message `AuthRoleGrantPermissionRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleGrantPermissionRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -201,7 +201,7 @@ Empty field. -##### message `AuthRoleGrantPermissionResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleGrantPermissionResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -209,13 +209,13 @@ Empty field. -##### message `AuthRoleListRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleListRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `AuthRoleListResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleListResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -224,7 +224,7 @@ Empty field. -##### message `AuthRoleRevokePermissionRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleRevokePermissionRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -234,7 +234,7 @@ Empty field. -##### message `AuthRoleRevokePermissionResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthRoleRevokePermissionResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -242,13 +242,13 @@ Empty field. -##### message `AuthStatusRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthStatusRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `AuthStatusResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthStatusResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -258,7 +258,7 @@ Empty field. -##### message `AuthUserAddRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserAddRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -269,7 +269,7 @@ Empty field. -##### message `AuthUserAddResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserAddResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -277,7 +277,7 @@ Empty field. -##### message `AuthUserChangePasswordRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserChangePasswordRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -287,7 +287,7 @@ Empty field. -##### message `AuthUserChangePasswordResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserChangePasswordResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -295,7 +295,7 @@ Empty field. -##### message `AuthUserDeleteRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserDeleteRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -303,7 +303,7 @@ Empty field. -##### message `AuthUserDeleteResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserDeleteResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -311,7 +311,7 @@ Empty field. -##### message `AuthUserGetRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserGetRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -319,7 +319,7 @@ Empty field. -##### message `AuthUserGetResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserGetResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -328,7 +328,7 @@ Empty field. -##### message `AuthUserGrantRoleRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserGrantRoleRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -337,7 +337,7 @@ Empty field. -##### message `AuthUserGrantRoleResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserGrantRoleResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -345,13 +345,13 @@ Empty field. -##### message `AuthUserListRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserListRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `AuthUserListResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserListResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -360,7 +360,7 @@ Empty field. -##### message `AuthUserRevokeRoleRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserRevokeRoleRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -369,7 +369,7 @@ Empty field. -##### message `AuthUserRevokeRoleResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthUserRevokeRoleResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -377,7 +377,7 @@ Empty field. -##### message `AuthenticateRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthenticateRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -386,7 +386,7 @@ Empty field. -##### message `AuthenticateResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `AuthenticateResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -395,7 +395,7 @@ Empty field. -##### message `CompactionRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `CompactionRequest` (api/etcdserverpb/rpc.proto) CompactionRequest compacts the key-value store up to a given revision. All superseded keys with a revision less than the compaction revision will be removed. @@ -406,7 +406,7 @@ CompactionRequest compacts the key-value store up to a given revision. All super -##### message `CompactionResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `CompactionResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -414,7 +414,7 @@ CompactionRequest compacts the key-value store up to a given revision. All super -##### message `Compare` (etcdserver/etcdserverpb/rpc.proto) +##### message `Compare` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -431,13 +431,13 @@ CompactionRequest compacts the key-value store up to a given revision. All super -##### message `DefragmentRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `DefragmentRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `DefragmentResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `DefragmentResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -445,7 +445,7 @@ Empty field. -##### message `DeleteRangeRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `DeleteRangeRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -455,7 +455,7 @@ Empty field. -##### message `DeleteRangeResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `DeleteRangeResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -465,7 +465,7 @@ Empty field. -##### message `DowngradeRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `DowngradeRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -474,7 +474,7 @@ Empty field. -##### message `DowngradeResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `DowngradeResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -483,7 +483,7 @@ Empty field. -##### message `HashKVRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `HashKVRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -491,7 +491,7 @@ Empty field. -##### message `HashKVResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `HashKVResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -501,13 +501,13 @@ Empty field. -##### message `HashRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `HashRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `HashResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `HashResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -516,7 +516,7 @@ Empty field. -##### message `LeaseCheckpoint` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseCheckpoint` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -525,7 +525,7 @@ Empty field. -##### message `LeaseCheckpointRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseCheckpointRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -533,7 +533,7 @@ Empty field. -##### message `LeaseCheckpointResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseCheckpointResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -541,7 +541,7 @@ Empty field. -##### message `LeaseGrantRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseGrantRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -550,7 +550,7 @@ Empty field. -##### message `LeaseGrantResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseGrantResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -561,7 +561,7 @@ Empty field. -##### message `LeaseKeepAliveRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseKeepAliveRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -569,7 +569,7 @@ Empty field. -##### message `LeaseKeepAliveResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseKeepAliveResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -579,13 +579,13 @@ Empty field. -##### message `LeaseLeasesRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseLeasesRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `LeaseLeasesResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseLeasesResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -594,7 +594,7 @@ Empty field. -##### message `LeaseRevokeRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseRevokeRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -602,7 +602,7 @@ Empty field. -##### message `LeaseRevokeResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseRevokeResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -610,7 +610,7 @@ Empty field. -##### message `LeaseStatus` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseStatus` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -618,7 +618,7 @@ Empty field. -##### message `LeaseTimeToLiveRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseTimeToLiveRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -627,7 +627,7 @@ Empty field. -##### message `LeaseTimeToLiveResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `LeaseTimeToLiveResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -639,7 +639,7 @@ Empty field. -##### message `Member` (etcdserver/etcdserverpb/rpc.proto) +##### message `Member` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -651,7 +651,7 @@ Empty field. -##### message `MemberAddRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberAddRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -660,7 +660,7 @@ Empty field. -##### message `MemberAddResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberAddResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -670,7 +670,7 @@ Empty field. -##### message `MemberListRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberListRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -678,7 +678,7 @@ Empty field. -##### message `MemberListResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberListResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -687,7 +687,7 @@ Empty field. -##### message `MemberPromoteRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberPromoteRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -695,7 +695,7 @@ Empty field. -##### message `MemberPromoteResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberPromoteResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -704,7 +704,7 @@ Empty field. -##### message `MemberRemoveRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberRemoveRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -712,7 +712,7 @@ Empty field. -##### message `MemberRemoveResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberRemoveResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -721,7 +721,7 @@ Empty field. -##### message `MemberUpdateRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberUpdateRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -730,7 +730,7 @@ Empty field. -##### message `MemberUpdateResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MemberUpdateResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -739,7 +739,7 @@ Empty field. -##### message `MoveLeaderRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `MoveLeaderRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -747,7 +747,7 @@ Empty field. -##### message `MoveLeaderResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `MoveLeaderResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -755,7 +755,7 @@ Empty field. -##### message `PutRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `PutRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -768,7 +768,7 @@ Empty field. -##### message `PutResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `PutResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -777,7 +777,7 @@ Empty field. -##### message `RangeRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `RangeRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -797,7 +797,7 @@ Empty field. -##### message `RangeResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `RangeResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -808,7 +808,7 @@ Empty field. -##### message `RequestOp` (etcdserver/etcdserverpb/rpc.proto) +##### message `RequestOp` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -820,7 +820,7 @@ Empty field. -##### message `ResponseHeader` (etcdserver/etcdserverpb/rpc.proto) +##### message `ResponseHeader` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -831,7 +831,7 @@ Empty field. -##### message `ResponseOp` (etcdserver/etcdserverpb/rpc.proto) +##### message `ResponseOp` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -843,13 +843,13 @@ Empty field. -##### message `SnapshotRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `SnapshotRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `SnapshotResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `SnapshotResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -859,13 +859,13 @@ Empty field. -##### message `StatusRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `StatusRequest` (api/etcdserverpb/rpc.proto) Empty field. -##### message `StatusResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `StatusResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -882,7 +882,7 @@ Empty field. -##### message `TxnRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `TxnRequest` (api/etcdserverpb/rpc.proto) From google paxosdb paper: Our implementation hinges around a powerful primitive which we call MultiOp. All other database operations except for iteration are implemented as a single call to MultiOp. A MultiOp is applied atomically and consists of three components: 1. A list of tests called guard. Each test in guard checks a single entry in the database. It may check for the absence or presence of a value, or compare with a given value. Two different tests in the guard may apply to the same or different entries in the database. All tests in the guard are applied and MultiOp returns the results. If all tests are true, MultiOp executes t op (see item 2 below), otherwise it executes f op (see item 3 below). 2. A list of database operations called t op. Each operation in the list is either an insert, delete, or lookup operation, and applies to a single database entry. Two different operations in the list may apply to the same or different entries in the database. These operations are executed if guard evaluates to true. 3. A list of database operations called f op. Like t op, but executed if guard evaluates to false. @@ -894,7 +894,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive -##### message `TxnResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `TxnResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -904,7 +904,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive -##### message `WatchCancelRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `WatchCancelRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -912,7 +912,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive -##### message `WatchCreateRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `WatchCreateRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -927,7 +927,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive -##### message `WatchProgressRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `WatchProgressRequest` (api/etcdserverpb/rpc.proto) Requests the a watch stream progress status be sent in the watch response stream as soon as possible. @@ -935,7 +935,7 @@ Empty field. -##### message `WatchRequest` (etcdserver/etcdserverpb/rpc.proto) +##### message `WatchRequest` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -946,7 +946,7 @@ Empty field. -##### message `WatchResponse` (etcdserver/etcdserverpb/rpc.proto) +##### message `WatchResponse` (api/etcdserverpb/rpc.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -961,7 +961,7 @@ Empty field. -##### message `Event` (mvcc/mvccpb/kv.proto) +##### message `Event` (api/mvccpb/kv.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -971,7 +971,7 @@ Empty field. -##### message `KeyValue` (mvcc/mvccpb/kv.proto) +##### message `KeyValue` (api/mvccpb/kv.proto) | Field | Description | Type | | ----- | ----------- | ---- | @@ -1010,7 +1010,7 @@ Empty field. -##### message `Permission` (auth/authpb/auth.proto) +##### message `Permission` (api/authpb/auth.proto) Permission is a single entity @@ -1022,7 +1022,7 @@ Permission is a single entity -##### message `Role` (auth/authpb/auth.proto) +##### message `Role` (api/authpb/auth.proto) Role is a single entry in the bucket authRoles @@ -1033,7 +1033,7 @@ Role is a single entry in the bucket authRoles -##### message `User` (auth/authpb/auth.proto) +##### message `User` (api/authpb/auth.proto) User is a single entry in the bucket authUsers @@ -1046,7 +1046,7 @@ User is a single entry in the bucket authUsers -##### message `UserAddOptions` (auth/authpb/auth.proto) +##### message `UserAddOptions` (api/authpb/auth.proto) | Field | Description | Type | | ----- | ----------- | ---- | diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index cdcb32c3d..28fb83b13 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -7,7 +7,7 @@ ], "swagger": "2.0", "info": { - "title": "etcdserver/etcdserverpb/rpc.proto", + "title": "api/etcdserverpb/rpc.proto", "version": "version not set" }, "paths": { @@ -36,7 +36,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -69,7 +69,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -102,7 +102,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -135,7 +135,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -168,7 +168,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -201,7 +201,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -234,7 +234,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -267,7 +267,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -300,7 +300,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -333,7 +333,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -366,7 +366,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -399,7 +399,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -432,7 +432,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -465,7 +465,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -498,7 +498,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -531,7 +531,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -564,7 +564,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -597,7 +597,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -630,7 +630,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -663,7 +663,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -696,7 +696,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -729,7 +729,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -762,7 +762,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -795,7 +795,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -828,7 +828,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -861,7 +861,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -894,7 +894,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -927,7 +927,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -960,7 +960,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -993,7 +993,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1026,7 +1026,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1069,7 +1069,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1102,7 +1102,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1135,7 +1135,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1168,7 +1168,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1201,7 +1201,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1234,7 +1234,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1267,7 +1267,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1300,7 +1300,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1342,7 +1342,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1375,7 +1375,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1408,7 +1408,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1451,7 +1451,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -1567,8 +1567,7 @@ "type": "object", "properties": { "no_password": { - "type": "boolean", - "format": "boolean" + "type": "boolean" } } }, @@ -1779,8 +1778,7 @@ "title": "authRevision is the current revision of auth store" }, "enabled": { - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "header": { "$ref": "#/definitions/etcdserverpbResponseHeader" @@ -1962,8 +1960,7 @@ "properties": { "physical": { "description": "physical is set so the RPC will wait until the compaction is physically\napplied to the local database such that compacted entries are totally\nremoved from the backend database.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "revision": { "description": "revision is the key-value store revision for the compaction operation.", @@ -2049,8 +2046,7 @@ }, "prev_kv": { "description": "If prev_kv is set, etcd gets the previous key-value pairs before deleting it.\nThe previous key-value pairs will be returned in the delete response.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "range_end": { "description": "range_end is the key following the last key to delete for the range [key, range_end).\nIf range_end is not given, the range is defined to contain only the key argument.\nIf range_end is one bit larger than the given key, then the range is all the keys\nwith the prefix (the given key).\nIf range_end is '\\0', the range is all keys greater than or equal to the key argument.", @@ -2266,8 +2262,7 @@ }, "keys": { "description": "keys is true to query all the keys attached to this lease.", - "type": "boolean", - "format": "boolean" + "type": "boolean" } } }, @@ -2319,8 +2314,7 @@ }, "isLearner": { "description": "isLearner indicates if the member is raft learner.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "name": { "description": "name is the human-readable name of the member. If the member is not started, the name will be an empty string.", @@ -2340,8 +2334,7 @@ "properties": { "isLearner": { "description": "isLearner indicates if the added member is raft learner.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "peerURLs": { "description": "peerURLs is the list of URLs the added member will use to communicate with the cluster.", @@ -2375,8 +2368,7 @@ "type": "object", "properties": { "linearizable": { - "type": "boolean", - "format": "boolean" + "type": "boolean" } } }, @@ -2500,13 +2492,11 @@ "properties": { "ignore_lease": { "description": "If ignore_lease is set, etcd updates the key using its current lease.\nReturns an error if the key does not exist.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "ignore_value": { "description": "If ignore_value is set, etcd updates the key using its current value.\nReturns an error if the key does not exist.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "key": { "description": "key is the key, in bytes, to put into the key-value store.", @@ -2520,8 +2510,7 @@ }, "prev_kv": { "description": "If prev_kv is set, etcd gets the previous key-value pair before changing it.\nThe previous key-value pair will be returned in the put response.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "value": { "description": "value is the value, in bytes, to associate with the key in the key-value store.", @@ -2547,8 +2536,7 @@ "properties": { "count_only": { "description": "count_only when set returns only the count of the keys in the range.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "key": { "description": "key is the first key for the range. If range_end is not given, the request only looks up key.", @@ -2557,8 +2545,7 @@ }, "keys_only": { "description": "keys_only when set returns only the keys and not the values.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "limit": { "description": "limit is a limit on the number of keys returned for the request. When limit is set to 0,\nit is treated as no limit.", @@ -2597,8 +2584,7 @@ }, "serializable": { "description": "serializable sets the range request to use serializable member-local reads.\nRange requests are linearizable by default; linearizable requests have higher\nlatency and lower throughput than serializable requests but reflect the current\nconsensus of the cluster. For better performance, in exchange for possible stale reads,\na serializable range request is served locally without needing to reach consensus\nwith other nodes in the cluster.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "sort_order": { "description": "sort_order is the order for returned sorted results.", @@ -2630,8 +2616,7 @@ }, "more": { "description": "more indicates if there are more keys to return in the requested range.", - "type": "boolean", - "format": "boolean" + "type": "boolean" } } }, @@ -2744,8 +2729,7 @@ }, "isLearner": { "description": "isLearner indicates if the member is raft learner.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "leader": { "description": "leader is the member ID which the responding member believes is the current leader.", @@ -2815,8 +2799,7 @@ }, "succeeded": { "description": "succeeded is set to true if the compare evaluated to true or false otherwise.", - "type": "boolean", - "format": "boolean" + "type": "boolean" } } }, @@ -2842,8 +2825,7 @@ }, "fragment": { "description": "fragment enables splitting large revisions into multiple watch responses.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "key": { "description": "key is the key to register for watching.", @@ -2852,13 +2834,11 @@ }, "prev_kv": { "description": "If prev_kv is set, created watcher gets the previous KV before the event happens.\nIf the previous KV is already compacted, nothing will be returned.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "progress_notify": { "description": "progress_notify is set so that the etcd server will periodically send a WatchResponse with\nno events to the new watcher if there are no recent events. It is useful when clients\nwish to recover a disconnected watcher starting from a recent known revision.\nThe etcd server may decide how often it will send notifications based on current load.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "range_end": { "description": "range_end is the end of the range [key, range_end) to watch. If range_end is not given,\nonly the key argument is watched. If range_end is equal to '\\0', all keys greater than\nor equal to the key argument are watched.\nIf the range_end is one bit larger than the given key,\nthen all keys with the prefix (the given key) will be watched.", @@ -2904,8 +2884,7 @@ }, "canceled": { "description": "canceled is set to true if the response is for a cancel watch request.\nNo further events will be sent to the canceled watcher.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "compact_revision": { "description": "compact_revision is set to the minimum index if a watcher tries to watch\nat a compacted index.\n\nThis happens when creating a watcher at a compacted revision or the watcher cannot\ncatch up with the progress of the key-value store.\n\nThe client should treat the watcher as canceled and should not try to create any\nwatcher with the same start_revision again.", @@ -2914,8 +2893,7 @@ }, "created": { "description": "created is set to true if the response is for a create watch request.\nThe client should record the watch_id and expect to receive events for\nthe created watcher from the same stream.\nAll events sent to the created watcher will attach with the same watch_id.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "events": { "type": "array", @@ -2925,8 +2903,7 @@ }, "fragment": { "description": "framgment is true if large watch response was split over multiple responses.", - "type": "boolean", - "format": "boolean" + "type": "boolean" }, "header": { "$ref": "#/definitions/etcdserverpbResponseHeader" diff --git a/Documentation/dev-guide/apispec/swagger/v3election.swagger.json b/Documentation/dev-guide/apispec/swagger/v3election.swagger.json index efd647ae6..7df6582f3 100644 --- a/Documentation/dev-guide/apispec/swagger/v3election.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/v3election.swagger.json @@ -23,7 +23,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -56,7 +56,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -98,7 +98,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -131,7 +131,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -164,7 +164,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } diff --git a/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json b/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json index b3692fd68..3418dc55d 100644 --- a/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json @@ -23,7 +23,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } @@ -56,7 +56,7 @@ } }, "default": { - "description": "An unexpected error response", + "description": "An unexpected error response.", "schema": { "$ref": "#/definitions/runtimeError" } diff --git a/api/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go index 2ace64f13..2e52c1b3c 100644 --- a/api/etcdserverpb/gw/rpc.pb.gw.go +++ b/api/etcdserverpb/gw/rpc.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: client/api/etcdserverpb/rpc.proto +// source: api/etcdserverpb/rpc.proto /* Package etcdserverpb is a reverse proxy. @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/api/etcdserverpb" + "go.etcd.io/etcd/api/v3/etcdserverpb" "io" "net/http" diff --git a/api/etcdserverpb/raft_internal.pb.go b/api/etcdserverpb/raft_internal.pb.go index c8dad53a0..3a3c9fe1c 100644 --- a/api/etcdserverpb/raft_internal.pb.go +++ b/api/etcdserverpb/raft_internal.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - membershippb "go.etcd.io/etcd/v3/etcdserver/api/membership/membershippb" + membershippb "go.etcd.io/etcd/api/v3/membershippb" io "io" ) @@ -2270,69 +2270,68 @@ var ( func init() { proto.RegisterFile("raft_internal.proto", fileDescriptorRaftInternal) } var fileDescriptorRaftInternal = []byte{ - // 1010 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x96, 0x5b, 0x73, 0xdb, 0x44, + // 1004 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x96, 0xdd, 0x72, 0xdb, 0x44, 0x14, 0xc7, 0x6b, 0x37, 0x4d, 0xe3, 0x75, 0x92, 0xa6, 0x9b, 0x94, 0x2e, 0xce, 0x8c, 0x49, 0x53, - 0x0a, 0xe5, 0x96, 0x30, 0xe9, 0x2b, 0x33, 0x60, 0xec, 0x4c, 0x9a, 0x99, 0x52, 0x32, 0x6a, 0xb8, - 0xcc, 0xf0, 0x20, 0xd6, 0xd2, 0x89, 0x2d, 0x22, 0x4b, 0x62, 0x77, 0xed, 0x86, 0xef, 0x51, 0x18, - 0x3e, 0x06, 0xb7, 0x0f, 0xd1, 0x07, 0x2e, 0x05, 0xbe, 0x00, 0x84, 0x17, 0xde, 0x81, 0x77, 0x66, - 0x2f, 0x5a, 0x49, 0xf6, 0x3a, 0x6f, 0xf2, 0xff, 0xfc, 0xcf, 0xef, 0xec, 0x6a, 0xcf, 0x91, 0x17, - 0xad, 0x33, 0x7a, 0x22, 0xfc, 0x28, 0x11, 0xc0, 0x12, 0x1a, 0xef, 0x64, 0x2c, 0x15, 0x29, 0x5e, - 0x06, 0x11, 0x84, 0x1c, 0xd8, 0x04, 0x58, 0xd6, 0x6f, 0x6d, 0x0c, 0xd2, 0x41, 0xaa, 0x02, 0xbb, - 0xf2, 0x49, 0x7b, 0x5a, 0x6b, 0x85, 0xc7, 0x28, 0x0d, 0x96, 0x05, 0xe6, 0xf1, 0x2d, 0x19, 0xdc, - 0x2d, 0x1c, 0xbb, 0x34, 0x8b, 0x76, 0x47, 0x30, 0xea, 0x03, 0xe3, 0xc3, 0x28, 0x2b, 0x3d, 0x66, - 0xfd, 0xd2, 0x0f, 0x9d, 0xbd, 0xfd, 0x29, 0x5a, 0xf1, 0xe0, 0xf3, 0x31, 0x70, 0x71, 0x1f, 0x68, - 0x08, 0x0c, 0xaf, 0xa2, 0xfa, 0x61, 0x8f, 0xd4, 0xb6, 0x6a, 0x77, 0x17, 0xbc, 0xfa, 0x61, 0x0f, - 0xb7, 0xd0, 0xd2, 0x98, 0xcb, 0x05, 0x8f, 0x80, 0xd4, 0xb7, 0x6a, 0x77, 0x1b, 0x9e, 0xfd, 0x8d, - 0x6f, 0xa3, 0x15, 0x3a, 0x16, 0x43, 0x9f, 0xc1, 0x24, 0xe2, 0x51, 0x9a, 0x90, 0xcb, 0x2a, 0x6d, - 0x59, 0x8a, 0x9e, 0xd1, 0xb6, 0x9f, 0x60, 0xb4, 0x7e, 0x68, 0xf6, 0xec, 0xd1, 0x13, 0x61, 0xca, - 0xcd, 0x14, 0xba, 0x83, 0xea, 0x93, 0x3d, 0x55, 0xa2, 0xb9, 0x77, 0x63, 0xa7, 0xfc, 0x56, 0x76, - 0x4c, 0x8a, 0x57, 0x9f, 0xec, 0xe1, 0x37, 0xd1, 0x15, 0x46, 0x93, 0x01, 0xa8, 0x5a, 0xcd, 0xbd, - 0xd6, 0x94, 0x53, 0x86, 0x72, 0xbb, 0x36, 0xe2, 0x57, 0xd1, 0xe5, 0x6c, 0x2c, 0xc8, 0x82, 0xf2, - 0x93, 0xaa, 0xff, 0x68, 0x9c, 0xaf, 0xc7, 0x93, 0x26, 0xdc, 0x45, 0xcb, 0x21, 0xc4, 0x20, 0xc0, - 0xd7, 0x45, 0xae, 0xa8, 0xa4, 0xad, 0x6a, 0x52, 0x4f, 0x39, 0x2a, 0xa5, 0x9a, 0x61, 0xa1, 0xc9, - 0x82, 0xe2, 0x2c, 0x21, 0x8b, 0xae, 0x82, 0xc7, 0x67, 0x89, 0x2d, 0x28, 0xce, 0x12, 0xfc, 0x36, - 0x42, 0x41, 0x3a, 0xca, 0x68, 0x20, 0xe4, 0xfb, 0xbb, 0xaa, 0x52, 0x5e, 0xa8, 0xa6, 0x74, 0x6d, - 0x3c, 0xcf, 0x2c, 0xa5, 0xe0, 0x77, 0x50, 0x33, 0x06, 0xca, 0xc1, 0x1f, 0x30, 0x9a, 0x08, 0xb2, - 0xe4, 0x22, 0x3c, 0x90, 0x86, 0x03, 0x19, 0xb7, 0x84, 0xd8, 0x4a, 0x72, 0xcf, 0x9a, 0xc0, 0x60, - 0x92, 0x9e, 0x02, 0x69, 0xb8, 0xf6, 0xac, 0x10, 0x9e, 0x32, 0xd8, 0x3d, 0xc7, 0x85, 0x26, 0x8f, - 0x85, 0xc6, 0x94, 0x8d, 0x08, 0x72, 0x1d, 0x4b, 0x47, 0x86, 0xec, 0xb1, 0x28, 0x23, 0x7e, 0x1f, - 0xad, 0xe9, 0xb2, 0xc1, 0x10, 0x82, 0xd3, 0x2c, 0x8d, 0x12, 0x41, 0x9a, 0x2a, 0xf9, 0x45, 0x47, - 0xe9, 0xae, 0x35, 0xe5, 0x98, 0x6b, 0x71, 0x55, 0xc7, 0xf7, 0xd0, 0xe2, 0x50, 0xf5, 0x30, 0x09, - 0x15, 0x66, 0xd3, 0xd9, 0x44, 0xba, 0xcd, 0x3d, 0x63, 0xc5, 0x1d, 0xd4, 0x54, 0x2d, 0x0c, 0x09, - 0xed, 0xc7, 0x40, 0xfe, 0x76, 0x9e, 0x40, 0x67, 0x2c, 0x86, 0xfb, 0xca, 0x60, 0xdf, 0x1f, 0xb5, - 0x12, 0xee, 0x21, 0xd5, 0xf0, 0x7e, 0x18, 0x71, 0xc5, 0xf8, 0xe7, 0xaa, 0xeb, 0x05, 0x4a, 0x46, - 0x4f, 0x3b, 0xec, 0x0b, 0xa4, 0x85, 0x86, 0x1f, 0x6a, 0x0a, 0x24, 0x22, 0x0a, 0xa8, 0x00, 0xf2, - 0xaf, 0xa6, 0xbc, 0x52, 0xa5, 0xe4, 0x83, 0xd4, 0x29, 0x59, 0x73, 0x5c, 0x25, 0xdf, 0x6e, 0x8c, - 0x0b, 0x2a, 0xc6, 0x9c, 0xfc, 0x37, 0x77, 0x63, 0x8f, 0x94, 0xa1, 0xb2, 0x31, 0x2d, 0xe1, 0x7d, - 0x33, 0xde, 0x72, 0xde, 0x7d, 0x1a, 0x86, 0xe4, 0xc7, 0xa5, 0x79, 0x3b, 0xfb, 0x80, 0x03, 0xeb, - 0x84, 0x61, 0x65, 0x67, 0x46, 0xc3, 0x0f, 0xd1, 0x5a, 0x81, 0xd1, 0x73, 0x42, 0x7e, 0xd2, 0xa4, - 0xdb, 0x6e, 0x92, 0x19, 0x30, 0x03, 0x5b, 0xa5, 0x15, 0xb9, 0xba, 0xac, 0x01, 0x08, 0xf2, 0xf3, - 0x85, 0xcb, 0x3a, 0x00, 0x31, 0xb3, 0xac, 0x03, 0x10, 0x78, 0x80, 0x9e, 0x2f, 0x30, 0xc1, 0x50, - 0x4e, 0xae, 0x9f, 0x51, 0xce, 0x1f, 0xa7, 0x2c, 0x24, 0xbf, 0x68, 0xe4, 0x6b, 0x6e, 0x64, 0x57, - 0xb9, 0x8f, 0x8c, 0x39, 0xa7, 0x3f, 0x47, 0x9d, 0x61, 0xfc, 0x31, 0xda, 0x28, 0xad, 0x57, 0x8e, - 0x9c, 0xcf, 0xd2, 0x18, 0xc8, 0x33, 0x5d, 0xe3, 0xa5, 0x39, 0xcb, 0x56, 0xe3, 0x9a, 0x16, 0xdd, - 0x72, 0x9d, 0x4e, 0x47, 0xf0, 0x27, 0xe8, 0x46, 0x41, 0xd6, 0xd3, 0xab, 0xd1, 0xbf, 0x6a, 0xf4, - 0xcb, 0x6e, 0xb4, 0x19, 0xe3, 0x12, 0x1b, 0xd3, 0x99, 0x10, 0xbe, 0x8f, 0x56, 0x0b, 0x78, 0x1c, - 0x71, 0x41, 0x7e, 0xd3, 0xd4, 0x5b, 0x6e, 0xea, 0x83, 0x88, 0x8b, 0x4a, 0x2b, 0xe6, 0xa2, 0x25, - 0xc9, 0xa5, 0x69, 0xd2, 0xef, 0x73, 0x49, 0xb2, 0xf4, 0x0c, 0x29, 0x17, 0xed, 0xd1, 0x2b, 0x92, - 0xec, 0xc8, 0x6f, 0x1a, 0xf3, 0x8e, 0x5e, 0xe6, 0x4c, 0x77, 0xa4, 0xd1, 0x6c, 0x47, 0x2a, 0x8c, - 0xe9, 0xc8, 0x6f, 0x1b, 0xf3, 0x3a, 0x52, 0x66, 0x39, 0x3a, 0xb2, 0x90, 0xab, 0xcb, 0x92, 0x1d, - 0xf9, 0xdd, 0x85, 0xcb, 0x9a, 0xee, 0x48, 0xa3, 0xe1, 0xcf, 0x50, 0xab, 0x84, 0x51, 0x8d, 0x92, - 0x01, 0x1b, 0x45, 0x5c, 0xfd, 0xb7, 0x7e, 0xaf, 0x99, 0xaf, 0xcf, 0x61, 0x4a, 0xfb, 0x91, 0x75, - 0xe7, 0xfc, 0x9b, 0xd4, 0x1d, 0xc7, 0x23, 0xb4, 0x59, 0xd4, 0x32, 0xad, 0x53, 0x2a, 0xf6, 0x83, - 0x2e, 0xf6, 0x86, 0xbb, 0x98, 0xee, 0x92, 0xd9, 0x6a, 0x84, 0xce, 0x31, 0xe0, 0x8f, 0xd0, 0x7a, - 0x10, 0x8f, 0xb9, 0x00, 0xe6, 0x4f, 0x80, 0x49, 0xc9, 0xe7, 0x20, 0xc8, 0x13, 0x64, 0x46, 0xa0, - 0x7c, 0x49, 0xd9, 0xe9, 0x6a, 0xe7, 0x87, 0xda, 0xf8, 0xa8, 0x78, 0x5b, 0xd7, 0x83, 0xe9, 0x08, - 0xa6, 0xe8, 0x66, 0x0e, 0xd6, 0x0c, 0x9f, 0x0a, 0xc1, 0x14, 0xfc, 0x4b, 0x64, 0xbe, 0xa0, 0x2e, - 0xf8, 0x7b, 0x4a, 0xeb, 0x08, 0xc1, 0x4a, 0xfc, 0x8d, 0xc0, 0x11, 0xc4, 0xc7, 0x08, 0x87, 0xe9, - 0xe3, 0x64, 0xc0, 0x68, 0x08, 0x7e, 0x94, 0x9c, 0xa4, 0x8a, 0xfe, 0x95, 0xa6, 0xdf, 0xa9, 0xd2, - 0x7b, 0xb9, 0xf1, 0x30, 0x39, 0x49, 0x4b, 0xe4, 0xb5, 0x70, 0x2a, 0xb0, 0x7d, 0x0d, 0xad, 0xec, - 0x8f, 0x32, 0xf1, 0x85, 0x07, 0x3c, 0x4b, 0x13, 0x0e, 0xdb, 0x19, 0xda, 0xbc, 0xe0, 0xeb, 0x8e, - 0x31, 0x5a, 0x50, 0x77, 0xb0, 0x9a, 0xba, 0x83, 0xa9, 0x67, 0x79, 0x37, 0xb3, 0x5f, 0x2c, 0x73, - 0x37, 0xcb, 0x7f, 0xe3, 0x5b, 0x68, 0x99, 0x47, 0xa3, 0x2c, 0x06, 0x5f, 0xa4, 0xa7, 0xa0, 0xaf, - 0x66, 0x0d, 0xaf, 0xa9, 0xb5, 0x63, 0x29, 0xbd, 0xbb, 0xf1, 0xf4, 0xcf, 0xf6, 0xa5, 0xa7, 0xe7, - 0xed, 0xda, 0xb3, 0xf3, 0x76, 0xed, 0x8f, 0xf3, 0x76, 0xed, 0xeb, 0xbf, 0xda, 0x97, 0xfa, 0x8b, - 0xea, 0x62, 0x78, 0xef, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x24, 0x2a, 0xcc, 0xae, 0x0a, - 0x00, 0x00, + 0x5a, 0xca, 0x57, 0xc2, 0xa4, 0x0f, 0x00, 0xc6, 0xce, 0xa4, 0x99, 0x29, 0x25, 0xa3, 0x86, 0x8f, + 0x19, 0x2e, 0xc4, 0x5a, 0x3a, 0xb1, 0x45, 0x64, 0x49, 0xec, 0xae, 0xdd, 0xf0, 0x1e, 0x85, 0xe1, + 0x31, 0xf8, 0x7a, 0x88, 0x5e, 0xf0, 0x51, 0xe0, 0x05, 0x20, 0xdc, 0x70, 0x0f, 0xdc, 0x33, 0xfb, + 0xa1, 0x95, 0x64, 0xaf, 0x73, 0x67, 0xfd, 0xcf, 0xff, 0xfc, 0xce, 0xae, 0xf6, 0x1c, 0x79, 0xd1, + 0x3a, 0xa3, 0x27, 0xc2, 0x8f, 0x12, 0x01, 0x2c, 0xa1, 0xf1, 0x4e, 0xc6, 0x52, 0x91, 0xe2, 0x65, + 0x10, 0x41, 0xc8, 0x81, 0x4d, 0x80, 0x65, 0xfd, 0xd6, 0xc6, 0x20, 0x1d, 0xa4, 0x2a, 0xb0, 0x2b, + 0x7f, 0x69, 0x4f, 0x6b, 0xad, 0xf0, 0x18, 0xa5, 0xc1, 0xb2, 0xc0, 0xfc, 0xbc, 0x2b, 0x83, 0xbb, + 0x34, 0x8b, 0x76, 0x47, 0x30, 0xea, 0x03, 0xe3, 0xc3, 0x28, 0xcb, 0xfa, 0xa5, 0x07, 0xed, 0xdb, + 0xfe, 0x14, 0xad, 0x78, 0xf0, 0xf9, 0x18, 0xb8, 0x78, 0x00, 0x34, 0x04, 0x86, 0x57, 0x51, 0xfd, + 0xb0, 0x47, 0x6a, 0x5b, 0xb5, 0x7b, 0x0b, 0x5e, 0xfd, 0xb0, 0x87, 0x5b, 0x68, 0x69, 0xcc, 0xe5, + 0xd2, 0x46, 0x40, 0xea, 0x5b, 0xb5, 0x7b, 0x0d, 0xcf, 0x3e, 0xe3, 0xdb, 0x68, 0x85, 0x8e, 0xc5, + 0xd0, 0x67, 0x30, 0x89, 0x78, 0x94, 0x26, 0xe4, 0xb2, 0x4a, 0x5b, 0x96, 0xa2, 0x67, 0xb4, 0xed, + 0xa7, 0x18, 0xad, 0x1f, 0x9a, 0xdd, 0x79, 0xf4, 0x44, 0x98, 0x72, 0x33, 0x85, 0xee, 0xa0, 0xfa, + 0x64, 0x4f, 0x95, 0x68, 0xee, 0xdd, 0xd8, 0x29, 0xef, 0x7f, 0xc7, 0xa4, 0x78, 0xf5, 0xc9, 0x1e, + 0x7e, 0x0b, 0x5d, 0x61, 0x34, 0x19, 0x80, 0xaa, 0xd5, 0xdc, 0x6b, 0x4d, 0x39, 0x65, 0x28, 0xb7, + 0x6b, 0x23, 0x7e, 0x0d, 0x5d, 0xce, 0xc6, 0x82, 0x2c, 0x28, 0x3f, 0xa9, 0xfa, 0x8f, 0xc6, 0xf9, + 0x7a, 0x3c, 0x69, 0xc2, 0x5d, 0xb4, 0x1c, 0x42, 0x0c, 0x02, 0x7c, 0x5d, 0xe4, 0x8a, 0x4a, 0xda, + 0xaa, 0x26, 0xf5, 0x94, 0xa3, 0x52, 0xaa, 0x19, 0x16, 0x9a, 0x2c, 0x28, 0xce, 0x12, 0xb2, 0xe8, + 0x2a, 0x78, 0x7c, 0x96, 0xd8, 0x82, 0xe2, 0x2c, 0xc1, 0x6f, 0x23, 0x14, 0xa4, 0xa3, 0x8c, 0x06, + 0x42, 0xbe, 0xbf, 0xab, 0x2a, 0xe5, 0xa5, 0x6a, 0x4a, 0xd7, 0xc6, 0xf3, 0xcc, 0x52, 0x0a, 0x7e, + 0x07, 0x35, 0x63, 0xa0, 0x1c, 0xfc, 0x01, 0xa3, 0x89, 0x20, 0x4b, 0x2e, 0xc2, 0x43, 0x69, 0x38, + 0x90, 0x71, 0x4b, 0x88, 0xad, 0x24, 0xf7, 0xac, 0x09, 0x0c, 0x26, 0xe9, 0x29, 0x90, 0x86, 0x6b, + 0xcf, 0x0a, 0xe1, 0x29, 0x83, 0xdd, 0x73, 0x5c, 0x68, 0xf2, 0x58, 0x68, 0x4c, 0xd9, 0x88, 0x20, + 0xd7, 0xb1, 0x74, 0x64, 0xc8, 0x1e, 0x8b, 0x32, 0xe2, 0xf7, 0xd1, 0x9a, 0x2e, 0x1b, 0x0c, 0x21, + 0x38, 0xcd, 0xd2, 0x28, 0x11, 0xa4, 0xa9, 0x92, 0x5f, 0x76, 0x94, 0xee, 0x5a, 0x53, 0x8e, 0xb9, + 0x16, 0x57, 0x75, 0x7c, 0x1f, 0x2d, 0x0e, 0x55, 0x0f, 0x93, 0x50, 0x61, 0x36, 0x9d, 0x4d, 0xa4, + 0xdb, 0xdc, 0x33, 0x56, 0xdc, 0x41, 0x4d, 0xd5, 0xc2, 0x90, 0xd0, 0x7e, 0x0c, 0xe4, 0x6f, 0xe7, + 0x09, 0x74, 0xc6, 0x62, 0xb8, 0xaf, 0x0c, 0xf6, 0xfd, 0x51, 0x2b, 0xe1, 0x1e, 0x52, 0x0d, 0xef, + 0x87, 0x11, 0x57, 0x8c, 0x7f, 0xae, 0xba, 0x5e, 0xa0, 0x64, 0xf4, 0xb4, 0xc3, 0xbe, 0x40, 0x5a, + 0x68, 0xf8, 0x91, 0xa6, 0x40, 0x22, 0xa2, 0x80, 0x0a, 0x20, 0xff, 0x6a, 0xca, 0xab, 0x55, 0x4a, + 0x3e, 0x48, 0x9d, 0x92, 0x35, 0xc7, 0x55, 0xf2, 0xed, 0xc6, 0xb8, 0xa0, 0x62, 0xcc, 0xc9, 0x7f, + 0x73, 0x37, 0xf6, 0x58, 0x19, 0x2a, 0x1b, 0xd3, 0x12, 0xde, 0x37, 0xe3, 0x2d, 0xe7, 0xdd, 0xa7, + 0x61, 0x48, 0x7e, 0x5c, 0x9a, 0xb7, 0xb3, 0x0f, 0x38, 0xb0, 0x4e, 0x18, 0x56, 0x76, 0x66, 0x34, + 0xfc, 0x08, 0xad, 0x15, 0x18, 0x3d, 0x27, 0xe4, 0x27, 0x4d, 0xba, 0xed, 0x26, 0x99, 0x01, 0x33, + 0xb0, 0x55, 0x5a, 0x91, 0xab, 0xcb, 0x1a, 0x80, 0x20, 0x3f, 0x5f, 0xb8, 0xac, 0x03, 0x10, 0x33, + 0xcb, 0x3a, 0x00, 0x81, 0x07, 0xe8, 0xc5, 0x02, 0x13, 0x0c, 0xe5, 0xe4, 0xfa, 0x19, 0xe5, 0xfc, + 0x49, 0xca, 0x42, 0xf2, 0x8b, 0x46, 0xbe, 0xee, 0x46, 0x76, 0x95, 0xfb, 0xc8, 0x98, 0x73, 0xfa, + 0x0b, 0xd4, 0x19, 0xc6, 0x1f, 0xa3, 0x8d, 0xd2, 0x7a, 0xe5, 0xc8, 0xf9, 0x2c, 0x8d, 0x81, 0x3c, + 0xd7, 0x35, 0xee, 0xce, 0x59, 0xb6, 0x1a, 0xd7, 0xb4, 0xe8, 0x96, 0xeb, 0x74, 0x3a, 0x82, 0x3f, + 0x41, 0x37, 0x0a, 0xb2, 0x9e, 0x5e, 0x8d, 0xfe, 0x55, 0xa3, 0x5f, 0x71, 0xa3, 0xcd, 0x18, 0x97, + 0xd8, 0x98, 0xce, 0x84, 0xf0, 0x03, 0xb4, 0x5a, 0xc0, 0xe3, 0x88, 0x0b, 0xf2, 0x9b, 0xa6, 0xde, + 0x72, 0x53, 0x1f, 0x46, 0x5c, 0x54, 0x5a, 0x31, 0x17, 0x2d, 0x49, 0x2e, 0x4d, 0x93, 0x7e, 0x9f, + 0x4b, 0x92, 0xa5, 0x67, 0x48, 0xb9, 0x68, 0x8f, 0x5e, 0x91, 0x64, 0x47, 0x7e, 0xd3, 0x98, 0x77, + 0xf4, 0x32, 0x67, 0xba, 0x23, 0x8d, 0x66, 0x3b, 0x52, 0x61, 0x4c, 0x47, 0x7e, 0xdb, 0x98, 0xd7, + 0x91, 0x32, 0xcb, 0xd1, 0x91, 0x85, 0x5c, 0x5d, 0x96, 0xec, 0xc8, 0xef, 0x2e, 0x5c, 0xd6, 0x74, + 0x47, 0x1a, 0x0d, 0x7f, 0x86, 0x5a, 0x25, 0x8c, 0x6a, 0x94, 0x0c, 0xd8, 0x28, 0xe2, 0xea, 0xbf, + 0xf5, 0x7b, 0xcd, 0x7c, 0x63, 0x0e, 0x53, 0xda, 0x8f, 0xac, 0x3b, 0xe7, 0xdf, 0xa4, 0xee, 0x38, + 0x1e, 0xa1, 0xcd, 0xa2, 0x96, 0x69, 0x9d, 0x52, 0xb1, 0x1f, 0x74, 0xb1, 0x37, 0xdd, 0xc5, 0x74, + 0x97, 0xcc, 0x56, 0x23, 0x74, 0x8e, 0x01, 0x7f, 0x84, 0xd6, 0x83, 0x78, 0xcc, 0x05, 0x30, 0x7f, + 0x02, 0x4c, 0x4a, 0x3e, 0x07, 0x41, 0x9e, 0x22, 0x33, 0x02, 0xe5, 0x4b, 0xca, 0x4e, 0x57, 0x3b, + 0x3f, 0xd4, 0xc6, 0xc7, 0xc5, 0xdb, 0xba, 0x1e, 0x4c, 0x47, 0x30, 0x45, 0x37, 0x73, 0xb0, 0x66, + 0xf8, 0x54, 0x08, 0xa6, 0xe0, 0x5f, 0x22, 0xf3, 0x05, 0x75, 0xc1, 0xdf, 0x53, 0x5a, 0x47, 0x08, + 0x56, 0xe2, 0x6f, 0x04, 0x8e, 0x20, 0x3e, 0x46, 0x38, 0x4c, 0x9f, 0x24, 0x03, 0x46, 0x43, 0xf0, + 0xa3, 0xe4, 0x24, 0x55, 0xf4, 0xaf, 0x34, 0xfd, 0x4e, 0x95, 0xde, 0xcb, 0x8d, 0x87, 0xc9, 0x49, + 0x5a, 0x22, 0xaf, 0x85, 0x53, 0x81, 0xed, 0x6b, 0x68, 0x65, 0x7f, 0x94, 0x89, 0x2f, 0x3c, 0xe0, + 0x59, 0x9a, 0x70, 0xd8, 0xce, 0xd0, 0xe6, 0x05, 0x5f, 0x77, 0x8c, 0xd1, 0x82, 0xba, 0x83, 0xd5, + 0xd4, 0x1d, 0x4c, 0xfd, 0x96, 0x77, 0x33, 0xfb, 0xc5, 0x32, 0x77, 0xb3, 0xfc, 0x19, 0xdf, 0x42, + 0xcb, 0x3c, 0x1a, 0x65, 0x31, 0xf8, 0x22, 0x3d, 0x05, 0x7d, 0x35, 0x6b, 0x78, 0x4d, 0xad, 0x1d, + 0x4b, 0xe9, 0xdd, 0x8d, 0x67, 0x7f, 0xb6, 0x2f, 0x3d, 0x3b, 0x6f, 0xd7, 0x9e, 0x9f, 0xb7, 0x6b, + 0x7f, 0x9c, 0xb7, 0x6b, 0x5f, 0xff, 0xd5, 0xbe, 0xd4, 0x5f, 0x54, 0x17, 0xc3, 0xfb, 0xff, 0x07, + 0x00, 0x00, 0xff, 0xff, 0x57, 0x86, 0x61, 0xad, 0x98, 0x0a, 0x00, 0x00, } diff --git a/api/etcdserverpb/rpc.pb.go b/api/etcdserverpb/rpc.pb.go index a101ee715..7c58d4989 100644 --- a/api/etcdserverpb/rpc.pb.go +++ b/api/etcdserverpb/rpc.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/api/v3/mvccpb" - authpb "go.etcd.io/etcd/v3/auth/authpb" + authpb "go.etcd.io/etcd/api/v3/authpb" context "golang.org/x/net/context" @@ -20724,262 +20724,262 @@ var ( func init() { proto.RegisterFile("rpc.proto", fileDescriptorRpc) } var fileDescriptorRpc = []byte{ - // 4111 bytes of a gzipped FileDescriptorProto + // 4107 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0x5b, 0x73, 0x1b, 0xc9, - 0x75, 0xe6, 0x00, 0xc4, 0xed, 0xe0, 0x42, 0xb0, 0x79, 0x11, 0x04, 0x49, 0x14, 0xb7, 0xb5, 0xd2, - 0x72, 0xa5, 0x5d, 0x62, 0x4d, 0xdb, 0xd9, 0x2a, 0x25, 0x71, 0x0c, 0x91, 0x58, 0x89, 0x4b, 0x8a, - 0xe4, 0x0e, 0x21, 0xed, 0xa5, 0x5c, 0x61, 0x0d, 0x81, 0x26, 0x39, 0x21, 0x30, 0x03, 0xcf, 0x0c, - 0x20, 0x72, 0x73, 0x71, 0xca, 0xe5, 0xb8, 0x92, 0x57, 0xbb, 0x2a, 0x95, 0x3c, 0x24, 0x2f, 0xa9, - 0x94, 0xcb, 0x0f, 0x7e, 0xce, 0x5f, 0xc8, 0x53, 0x2e, 0x95, 0x3f, 0x90, 0xda, 0xf8, 0x25, 0xf9, - 0x11, 0x29, 0x57, 0xdf, 0x66, 0x7a, 0x6e, 0xa4, 0x6c, 0xac, 0xf6, 0x85, 0x9c, 0x3e, 0x7d, 0xfa, - 0x7c, 0xa7, 0x4f, 0x77, 0x9f, 0xd3, 0x7d, 0xba, 0x01, 0x25, 0x67, 0xd4, 0x5b, 0x1f, 0x39, 0xb6, - 0x67, 0xa3, 0x0a, 0xf1, 0x7a, 0x7d, 0x97, 0x38, 0x13, 0xe2, 0x8c, 0x8e, 0x9b, 0x8b, 0xa7, 0xf6, - 0xa9, 0xcd, 0x2a, 0x5a, 0xf4, 0x8b, 0xf3, 0x34, 0x6f, 0x52, 0x9e, 0xd6, 0x70, 0xd2, 0xeb, 0xb1, - 0x3f, 0xa3, 0xe3, 0xd6, 0xf9, 0x44, 0x54, 0xdd, 0x62, 0x55, 0xc6, 0xd8, 0x3b, 0x63, 0x7f, 0x46, - 0xc7, 0xec, 0x9f, 0xa8, 0xbc, 0x7d, 0x6a, 0xdb, 0xa7, 0x03, 0xd2, 0x32, 0x46, 0x66, 0xcb, 0xb0, - 0x2c, 0xdb, 0x33, 0x3c, 0xd3, 0xb6, 0x5c, 0x5e, 0x8b, 0xff, 0x4a, 0x83, 0x9a, 0x4e, 0xdc, 0x91, - 0x6d, 0xb9, 0xe4, 0x19, 0x31, 0xfa, 0xc4, 0x41, 0x77, 0x00, 0x7a, 0x83, 0xb1, 0xeb, 0x11, 0xe7, - 0xc8, 0xec, 0x37, 0xb4, 0x55, 0x6d, 0x6d, 0x56, 0x2f, 0x09, 0xca, 0x76, 0x1f, 0xdd, 0x82, 0xd2, - 0x90, 0x0c, 0x8f, 0x79, 0x6d, 0x86, 0xd5, 0x16, 0x39, 0x61, 0xbb, 0x8f, 0x9a, 0x50, 0x74, 0xc8, - 0xc4, 0x74, 0x4d, 0xdb, 0x6a, 0x64, 0x57, 0xb5, 0xb5, 0xac, 0xee, 0x97, 0x69, 0x43, 0xc7, 0x38, - 0xf1, 0x8e, 0x3c, 0xe2, 0x0c, 0x1b, 0xb3, 0xbc, 0x21, 0x25, 0x74, 0x89, 0x33, 0xc4, 0x3f, 0xc9, - 0x41, 0x45, 0x37, 0xac, 0x53, 0xa2, 0x93, 0x1f, 0x8e, 0x89, 0xeb, 0xa1, 0x3a, 0x64, 0xcf, 0xc9, - 0x25, 0x83, 0xaf, 0xe8, 0xf4, 0x93, 0xb7, 0xb7, 0x4e, 0xc9, 0x11, 0xb1, 0x38, 0x70, 0x85, 0xb6, - 0xb7, 0x4e, 0x49, 0xc7, 0xea, 0xa3, 0x45, 0xc8, 0x0d, 0xcc, 0xa1, 0xe9, 0x09, 0x54, 0x5e, 0x08, - 0xa9, 0x33, 0x1b, 0x51, 0x67, 0x13, 0xc0, 0xb5, 0x1d, 0xef, 0xc8, 0x76, 0xfa, 0xc4, 0x69, 0xe4, - 0x56, 0xb5, 0xb5, 0xda, 0xc6, 0xdb, 0xeb, 0xea, 0x40, 0xac, 0xab, 0x0a, 0xad, 0x1f, 0xda, 0x8e, - 0xb7, 0x4f, 0x79, 0xf5, 0x92, 0x2b, 0x3f, 0xd1, 0x47, 0x50, 0x66, 0x42, 0x3c, 0xc3, 0x39, 0x25, - 0x5e, 0x23, 0xcf, 0xa4, 0xdc, 0xbf, 0x46, 0x4a, 0x97, 0x31, 0xeb, 0x0c, 0x9e, 0x7f, 0x23, 0x0c, - 0x15, 0x97, 0x38, 0xa6, 0x31, 0x30, 0xbf, 0x34, 0x8e, 0x07, 0xa4, 0x51, 0x58, 0xd5, 0xd6, 0x8a, - 0x7a, 0x88, 0x46, 0xfb, 0x7f, 0x4e, 0x2e, 0xdd, 0x23, 0xdb, 0x1a, 0x5c, 0x36, 0x8a, 0x8c, 0xa1, - 0x48, 0x09, 0xfb, 0xd6, 0xe0, 0x92, 0x0d, 0x9a, 0x3d, 0xb6, 0x3c, 0x5e, 0x5b, 0x62, 0xb5, 0x25, - 0x46, 0x61, 0xd5, 0x6b, 0x50, 0x1f, 0x9a, 0xd6, 0xd1, 0xd0, 0xee, 0x1f, 0xf9, 0x06, 0x01, 0x66, - 0x90, 0xda, 0xd0, 0xb4, 0x9e, 0xdb, 0x7d, 0x5d, 0x9a, 0x85, 0x72, 0x1a, 0x17, 0x61, 0xce, 0xb2, - 0xe0, 0x34, 0x2e, 0x54, 0xce, 0x75, 0x58, 0xa0, 0x32, 0x7b, 0x0e, 0x31, 0x3c, 0x12, 0x30, 0x57, - 0x18, 0xf3, 0xfc, 0xd0, 0xb4, 0x36, 0x59, 0x4d, 0x88, 0xdf, 0xb8, 0x88, 0xf1, 0x57, 0x05, 0xbf, - 0x71, 0x11, 0xe6, 0xc7, 0xeb, 0x50, 0xf2, 0x6d, 0x8e, 0x8a, 0x30, 0xbb, 0xb7, 0xbf, 0xd7, 0xa9, - 0xcf, 0x20, 0x80, 0x7c, 0xfb, 0x70, 0xb3, 0xb3, 0xb7, 0x55, 0xd7, 0x50, 0x19, 0x0a, 0x5b, 0x1d, - 0x5e, 0xc8, 0xe0, 0x27, 0x00, 0x81, 0x75, 0x51, 0x01, 0xb2, 0x3b, 0x9d, 0xcf, 0xeb, 0x33, 0x94, - 0xe7, 0x65, 0x47, 0x3f, 0xdc, 0xde, 0xdf, 0xab, 0x6b, 0xb4, 0xf1, 0xa6, 0xde, 0x69, 0x77, 0x3b, - 0xf5, 0x0c, 0xe5, 0x78, 0xbe, 0xbf, 0x55, 0xcf, 0xa2, 0x12, 0xe4, 0x5e, 0xb6, 0x77, 0x5f, 0x74, - 0xea, 0xb3, 0xf8, 0xe7, 0x1a, 0x54, 0xc5, 0x78, 0xf1, 0x35, 0x81, 0xbe, 0x03, 0xf9, 0x33, 0xb6, - 0x2e, 0xd8, 0x54, 0x2c, 0x6f, 0xdc, 0x8e, 0x0c, 0x6e, 0x68, 0xed, 0xe8, 0x82, 0x17, 0x61, 0xc8, - 0x9e, 0x4f, 0xdc, 0x46, 0x66, 0x35, 0xbb, 0x56, 0xde, 0xa8, 0xaf, 0xf3, 0x05, 0xbb, 0xbe, 0x43, - 0x2e, 0x5f, 0x1a, 0x83, 0x31, 0xd1, 0x69, 0x25, 0x42, 0x30, 0x3b, 0xb4, 0x1d, 0xc2, 0x66, 0x6c, - 0x51, 0x67, 0xdf, 0x74, 0x1a, 0xb3, 0x41, 0x13, 0xb3, 0x95, 0x17, 0xf0, 0x2f, 0x35, 0x80, 0x83, - 0xb1, 0x97, 0xbe, 0x34, 0x16, 0x21, 0x37, 0xa1, 0x82, 0xc5, 0xb2, 0xe0, 0x05, 0xb6, 0x26, 0x88, - 0xe1, 0x12, 0x7f, 0x4d, 0xd0, 0x02, 0xba, 0x01, 0x85, 0x91, 0x43, 0x26, 0x47, 0xe7, 0x13, 0x06, - 0x52, 0xd4, 0xf3, 0xb4, 0xb8, 0x33, 0x41, 0x6f, 0x41, 0xc5, 0x3c, 0xb5, 0x6c, 0x87, 0x1c, 0x71, - 0x59, 0x39, 0x56, 0x5b, 0xe6, 0x34, 0xa6, 0xb7, 0xc2, 0xc2, 0x05, 0xe7, 0x55, 0x96, 0x5d, 0x4a, - 0xc2, 0x16, 0x94, 0x99, 0xaa, 0x53, 0x99, 0xef, 0xdd, 0x40, 0xc7, 0x0c, 0x6b, 0x16, 0x37, 0xa1, - 0xd0, 0x1a, 0xff, 0x00, 0xd0, 0x16, 0x19, 0x10, 0x8f, 0x4c, 0xe3, 0x3d, 0x14, 0x9b, 0x64, 0x55, - 0x9b, 0xe0, 0x9f, 0x69, 0xb0, 0x10, 0x12, 0x3f, 0x55, 0xb7, 0x1a, 0x50, 0xe8, 0x33, 0x61, 0x5c, - 0x83, 0xac, 0x2e, 0x8b, 0xe8, 0x11, 0x14, 0x85, 0x02, 0x6e, 0x23, 0x9b, 0x32, 0x69, 0x0a, 0x5c, - 0x27, 0x17, 0xff, 0x32, 0x03, 0x25, 0xd1, 0xd1, 0xfd, 0x11, 0x6a, 0x43, 0xd5, 0xe1, 0x85, 0x23, - 0xd6, 0x1f, 0xa1, 0x51, 0x33, 0xdd, 0x09, 0x3d, 0x9b, 0xd1, 0x2b, 0xa2, 0x09, 0x23, 0xa3, 0xdf, - 0x87, 0xb2, 0x14, 0x31, 0x1a, 0x7b, 0xc2, 0xe4, 0x8d, 0xb0, 0x80, 0x60, 0xfe, 0x3d, 0x9b, 0xd1, - 0x41, 0xb0, 0x1f, 0x8c, 0x3d, 0xd4, 0x85, 0x45, 0xd9, 0x98, 0xf7, 0x46, 0xa8, 0x91, 0x65, 0x52, - 0x56, 0xc3, 0x52, 0xe2, 0x43, 0xf5, 0x6c, 0x46, 0x47, 0xa2, 0xbd, 0x52, 0xa9, 0xaa, 0xe4, 0x5d, - 0x70, 0xe7, 0x1d, 0x53, 0xa9, 0x7b, 0x61, 0xc5, 0x55, 0xea, 0x5e, 0x58, 0x4f, 0x4a, 0x50, 0x10, - 0x25, 0xfc, 0x2f, 0x19, 0x00, 0x39, 0x1a, 0xfb, 0x23, 0xb4, 0x05, 0x35, 0x47, 0x94, 0x42, 0xd6, - 0xba, 0x95, 0x68, 0x2d, 0x31, 0x88, 0x33, 0x7a, 0x55, 0x36, 0xe2, 0xca, 0x7d, 0x0f, 0x2a, 0xbe, - 0x94, 0xc0, 0x60, 0x37, 0x13, 0x0c, 0xe6, 0x4b, 0x28, 0xcb, 0x06, 0xd4, 0x64, 0x9f, 0xc2, 0x92, - 0xdf, 0x3e, 0xc1, 0x66, 0x6f, 0x5d, 0x61, 0x33, 0x5f, 0xe0, 0x82, 0x94, 0xa0, 0x5a, 0x4d, 0x55, - 0x2c, 0x30, 0xdb, 0xcd, 0x04, 0xb3, 0xc5, 0x15, 0xa3, 0x86, 0x03, 0x1a, 0x2f, 0x79, 0x11, 0xff, - 0x6f, 0x16, 0x0a, 0x9b, 0xf6, 0x70, 0x64, 0x38, 0x74, 0x34, 0xf2, 0x0e, 0x71, 0xc7, 0x03, 0x8f, - 0x99, 0xab, 0xb6, 0x71, 0x2f, 0x2c, 0x51, 0xb0, 0xc9, 0xff, 0x3a, 0x63, 0xd5, 0x45, 0x13, 0xda, - 0x58, 0x84, 0xc7, 0xcc, 0x6b, 0x34, 0x16, 0xc1, 0x51, 0x34, 0x91, 0x0b, 0x39, 0x1b, 0x2c, 0xe4, - 0x26, 0x14, 0x26, 0xc4, 0x09, 0x42, 0xfa, 0xb3, 0x19, 0x5d, 0x12, 0xd0, 0xbb, 0x30, 0x17, 0x0d, - 0x2f, 0x39, 0xc1, 0x53, 0xeb, 0x85, 0xa3, 0xd1, 0x3d, 0xa8, 0x84, 0x62, 0x5c, 0x5e, 0xf0, 0x95, - 0x87, 0x4a, 0x88, 0x5b, 0x96, 0x7e, 0x95, 0xc6, 0xe3, 0xca, 0xb3, 0x19, 0xe9, 0x59, 0x97, 0xa5, - 0x67, 0x2d, 0x8a, 0x56, 0xc2, 0xb7, 0x86, 0x9c, 0xcc, 0xf7, 0xc3, 0x4e, 0x06, 0x7f, 0x1f, 0xaa, - 0x21, 0x03, 0xd1, 0xb8, 0xd3, 0xf9, 0xe4, 0x45, 0x7b, 0x97, 0x07, 0xa9, 0xa7, 0x2c, 0x2e, 0xe9, - 0x75, 0x8d, 0xc6, 0xba, 0xdd, 0xce, 0xe1, 0x61, 0x3d, 0x83, 0xaa, 0x50, 0xda, 0xdb, 0xef, 0x1e, - 0x71, 0xae, 0x2c, 0x7e, 0xea, 0x4b, 0x10, 0x41, 0x4e, 0x89, 0x6d, 0x33, 0x4a, 0x6c, 0xd3, 0x64, - 0x6c, 0xcb, 0x04, 0xb1, 0x8d, 0x85, 0xb9, 0xdd, 0x4e, 0xfb, 0xb0, 0x53, 0x9f, 0x7d, 0x52, 0x83, - 0x0a, 0xb7, 0xef, 0xd1, 0xd8, 0xa2, 0xa1, 0xf6, 0x9f, 0x34, 0x80, 0x60, 0x35, 0xa1, 0x16, 0x14, - 0x7a, 0x1c, 0xa7, 0xa1, 0x31, 0x67, 0xb4, 0x94, 0x38, 0x64, 0xba, 0xe4, 0x42, 0xdf, 0x82, 0x82, - 0x3b, 0xee, 0xf5, 0x88, 0x2b, 0x43, 0xde, 0x8d, 0xa8, 0x3f, 0x14, 0xde, 0x4a, 0x97, 0x7c, 0xb4, - 0xc9, 0x89, 0x61, 0x0e, 0xc6, 0x2c, 0x00, 0x5e, 0xdd, 0x44, 0xf0, 0xe1, 0xbf, 0xd7, 0xa0, 0xac, - 0x4c, 0xde, 0xdf, 0xd1, 0x09, 0xdf, 0x86, 0x12, 0xd3, 0x81, 0xf4, 0x85, 0x1b, 0x2e, 0xea, 0x01, - 0x01, 0xfd, 0x1e, 0x94, 0xe4, 0x0a, 0x90, 0x9e, 0xb8, 0x91, 0x2c, 0x76, 0x7f, 0xa4, 0x07, 0xac, - 0x78, 0x07, 0xe6, 0x99, 0x55, 0x7a, 0x74, 0x73, 0x2d, 0xed, 0xa8, 0x6e, 0x3f, 0xb5, 0xc8, 0xf6, - 0xb3, 0x09, 0xc5, 0xd1, 0xd9, 0xa5, 0x6b, 0xf6, 0x8c, 0x81, 0xd0, 0xc2, 0x2f, 0xe3, 0x8f, 0x01, - 0xa9, 0xc2, 0xa6, 0xe9, 0x2e, 0xae, 0x42, 0xf9, 0x99, 0xe1, 0x9e, 0x09, 0x95, 0xf0, 0x23, 0xa8, - 0xd2, 0xe2, 0xce, 0xcb, 0xd7, 0xd0, 0x91, 0x1d, 0x0e, 0x24, 0xf7, 0x54, 0x36, 0x47, 0x30, 0x7b, - 0x66, 0xb8, 0x67, 0xac, 0xa3, 0x55, 0x9d, 0x7d, 0xa3, 0x77, 0xa1, 0xde, 0xe3, 0x9d, 0x3c, 0x8a, - 0x1c, 0x19, 0xe6, 0x04, 0xdd, 0xdf, 0x09, 0x7e, 0x06, 0x15, 0xde, 0x87, 0xaf, 0x5b, 0x09, 0x3c, - 0x0f, 0x73, 0x87, 0x96, 0x31, 0x72, 0xcf, 0x6c, 0x19, 0xdd, 0x68, 0xa7, 0xeb, 0x01, 0x6d, 0x2a, - 0xc4, 0x77, 0x60, 0xce, 0x21, 0x43, 0xc3, 0xb4, 0x4c, 0xeb, 0xf4, 0xe8, 0xf8, 0xd2, 0x23, 0xae, - 0x38, 0x30, 0xd5, 0x7c, 0xf2, 0x13, 0x4a, 0xa5, 0xaa, 0x1d, 0x0f, 0xec, 0x63, 0xe1, 0xe6, 0xd8, - 0x37, 0xfe, 0x69, 0x06, 0x2a, 0x9f, 0x1a, 0x5e, 0x4f, 0x0e, 0x1d, 0xda, 0x86, 0x9a, 0xef, 0xdc, - 0x18, 0x45, 0xe8, 0x12, 0x09, 0xb1, 0xac, 0x8d, 0xdc, 0x4a, 0xcb, 0xe8, 0x58, 0xed, 0xa9, 0x04, - 0x26, 0xca, 0xb0, 0x7a, 0x64, 0xe0, 0x8b, 0xca, 0xa4, 0x8b, 0x62, 0x8c, 0xaa, 0x28, 0x95, 0x80, - 0xf6, 0xa1, 0x3e, 0x72, 0xec, 0x53, 0x87, 0xb8, 0xae, 0x2f, 0x8c, 0x87, 0x31, 0x9c, 0x20, 0xec, - 0x40, 0xb0, 0x06, 0xe2, 0xe6, 0x46, 0x61, 0xd2, 0x93, 0xb9, 0x60, 0x3f, 0xc3, 0x9d, 0xd3, 0x7f, - 0x66, 0x00, 0xc5, 0x3b, 0xf5, 0xdb, 0x6e, 0xf1, 0xee, 0x43, 0xcd, 0xf5, 0x0c, 0x27, 0x36, 0xd9, - 0xaa, 0x8c, 0xea, 0x7b, 0xfc, 0x77, 0xc0, 0x57, 0xe8, 0xc8, 0xb2, 0x3d, 0xf3, 0xe4, 0x52, 0xec, - 0x92, 0x6b, 0x92, 0xbc, 0xc7, 0xa8, 0xa8, 0x03, 0x85, 0x13, 0x73, 0xe0, 0x11, 0xc7, 0x6d, 0xe4, - 0x56, 0xb3, 0x6b, 0xb5, 0x8d, 0x47, 0xd7, 0x0d, 0xc3, 0xfa, 0x47, 0x8c, 0xbf, 0x7b, 0x39, 0x22, - 0xba, 0x6c, 0xab, 0xee, 0x3c, 0xf3, 0xa1, 0xdd, 0xf8, 0x4d, 0x28, 0xbe, 0xa2, 0x22, 0xe8, 0x29, - 0xbb, 0xc0, 0x37, 0x8b, 0xac, 0xcc, 0x0f, 0xd9, 0x27, 0x8e, 0x71, 0x3a, 0x24, 0x96, 0x27, 0xcf, - 0x81, 0xb2, 0x8c, 0xef, 0x03, 0x04, 0x30, 0xd4, 0xe5, 0xef, 0xed, 0x1f, 0xbc, 0xe8, 0xd6, 0x67, - 0x50, 0x05, 0x8a, 0x7b, 0xfb, 0x5b, 0x9d, 0xdd, 0x0e, 0x8d, 0x0f, 0xb8, 0x25, 0x4d, 0x1a, 0x1a, - 0x4b, 0x15, 0x53, 0x0b, 0x61, 0xe2, 0x65, 0x58, 0x4c, 0x1a, 0x40, 0xba, 0x17, 0xad, 0x8a, 0x59, - 0x3a, 0xd5, 0x52, 0x51, 0xa1, 0x33, 0xe1, 0xee, 0x36, 0xa0, 0xc0, 0x67, 0x6f, 0x5f, 0x6c, 0xce, - 0x65, 0x91, 0x1a, 0x82, 0x4f, 0x46, 0xd2, 0x17, 0xa3, 0xe4, 0x97, 0x13, 0xdd, 0x4b, 0x2e, 0xd1, - 0xbd, 0xa0, 0x7b, 0x50, 0xf5, 0x57, 0x83, 0xe1, 0x8a, 0xbd, 0x40, 0x49, 0xaf, 0xc8, 0x89, 0x4e, - 0x69, 0x21, 0xa3, 0x17, 0xc2, 0x46, 0x47, 0xf7, 0x21, 0x4f, 0x26, 0xc4, 0xf2, 0xdc, 0x46, 0x99, - 0x45, 0x8c, 0xaa, 0xdc, 0xbb, 0x77, 0x28, 0x55, 0x17, 0x95, 0xf8, 0xbb, 0x30, 0xcf, 0xce, 0x48, - 0x4f, 0x1d, 0xc3, 0x52, 0x0f, 0x73, 0xdd, 0xee, 0xae, 0x30, 0x37, 0xfd, 0x44, 0x35, 0xc8, 0x6c, - 0x6f, 0x09, 0x23, 0x64, 0xb6, 0xb7, 0xf0, 0x8f, 0x35, 0x40, 0x6a, 0xbb, 0xa9, 0xec, 0x1c, 0x11, - 0x2e, 0xe1, 0xb3, 0x01, 0xfc, 0x22, 0xe4, 0x88, 0xe3, 0xd8, 0x0e, 0xb3, 0x68, 0x49, 0xe7, 0x05, - 0xfc, 0xb6, 0xd0, 0x41, 0x27, 0x13, 0xfb, 0xdc, 0x5f, 0x83, 0x5c, 0x9a, 0xe6, 0xab, 0xba, 0x03, - 0x0b, 0x21, 0xae, 0xa9, 0x22, 0xd7, 0x47, 0x30, 0xc7, 0x84, 0x6d, 0x9e, 0x91, 0xde, 0xf9, 0xc8, - 0x36, 0xad, 0x18, 0x1e, 0x1d, 0xb9, 0xc0, 0xc1, 0xd2, 0x7e, 0xf0, 0x8e, 0x55, 0x7c, 0x62, 0xb7, - 0xbb, 0x8b, 0x3f, 0x87, 0xe5, 0x88, 0x1c, 0xa9, 0xfe, 0x1f, 0x41, 0xb9, 0xe7, 0x13, 0x5d, 0xb1, - 0xd7, 0xb9, 0x13, 0x56, 0x2e, 0xda, 0x54, 0x6d, 0x81, 0xf7, 0xe1, 0x46, 0x4c, 0xf4, 0x54, 0x7d, - 0x7e, 0x07, 0x96, 0x98, 0xc0, 0x1d, 0x42, 0x46, 0xed, 0x81, 0x39, 0x49, 0xb5, 0xf4, 0x48, 0x74, - 0x4a, 0x61, 0x7c, 0xb3, 0xf3, 0x02, 0xff, 0x81, 0x40, 0xec, 0x9a, 0x43, 0xd2, 0xb5, 0x77, 0xd3, - 0x75, 0xa3, 0xd1, 0xec, 0x9c, 0x5c, 0xba, 0x62, 0x5b, 0xc3, 0xbe, 0xf1, 0x3f, 0x6b, 0xc2, 0x54, - 0x6a, 0xf3, 0x37, 0x3c, 0x93, 0x57, 0x00, 0x4e, 0xe9, 0x92, 0x21, 0x7d, 0x5a, 0xc1, 0x33, 0x2a, - 0x0a, 0xc5, 0xd7, 0x93, 0xfa, 0xef, 0x8a, 0xd0, 0x73, 0x51, 0xcc, 0x73, 0xf6, 0xc7, 0xf7, 0x72, - 0x77, 0xa0, 0xcc, 0x08, 0x87, 0x9e, 0xe1, 0x8d, 0xdd, 0xd8, 0x60, 0xfc, 0x85, 0x98, 0xf6, 0xb2, - 0xd1, 0x54, 0xfd, 0xfa, 0x16, 0xe4, 0xd9, 0x61, 0x42, 0x6e, 0xa5, 0x6f, 0x26, 0xcc, 0x47, 0xae, - 0x87, 0x2e, 0x18, 0xf1, 0x4f, 0x35, 0xc8, 0x3f, 0x67, 0x29, 0x58, 0x45, 0xb5, 0x59, 0x39, 0x16, - 0x96, 0x31, 0xe4, 0x89, 0xa1, 0x92, 0xce, 0xbe, 0xd9, 0xd6, 0x93, 0x10, 0xe7, 0x85, 0xbe, 0xcb, - 0xb7, 0xb8, 0x25, 0xdd, 0x2f, 0x53, 0x9b, 0xf5, 0x06, 0x26, 0xb1, 0x3c, 0x56, 0x3b, 0xcb, 0x6a, - 0x15, 0x0a, 0xdd, 0x3d, 0x9b, 0xee, 0x2e, 0x31, 0x1c, 0x4b, 0x24, 0x4d, 0x8b, 0x7a, 0x40, 0xc0, - 0xbb, 0x50, 0xe7, 0x7a, 0xb4, 0xfb, 0x7d, 0x65, 0x83, 0xe9, 0xa3, 0x69, 0x11, 0xb4, 0x90, 0xb4, - 0x4c, 0x54, 0xda, 0x2f, 0x34, 0x98, 0x57, 0xc4, 0x4d, 0x65, 0xd5, 0xf7, 0x20, 0xcf, 0x93, 0xd4, - 0x62, 0xa7, 0xb3, 0x18, 0x6e, 0xc5, 0x61, 0x74, 0xc1, 0x83, 0xd6, 0xa1, 0xc0, 0xbf, 0xe4, 0x19, - 0x20, 0x99, 0x5d, 0x32, 0xe1, 0xfb, 0xb0, 0x20, 0x48, 0x64, 0x68, 0x27, 0x2d, 0x0c, 0x36, 0x18, - 0xf8, 0xcf, 0x60, 0x31, 0xcc, 0x36, 0x55, 0x97, 0x14, 0x25, 0x33, 0xaf, 0xa3, 0x64, 0x5b, 0x2a, - 0xf9, 0x62, 0xd4, 0x57, 0xf6, 0x51, 0xd1, 0x19, 0xa3, 0x8e, 0x57, 0x26, 0x3c, 0x5e, 0x41, 0x07, - 0xa4, 0x88, 0x6f, 0xb4, 0x03, 0x1f, 0xca, 0xe9, 0xb0, 0x6b, 0xba, 0xbe, 0x0f, 0xc7, 0x50, 0x19, - 0x98, 0x16, 0x31, 0x1c, 0x91, 0x39, 0xd7, 0x78, 0xe6, 0x5c, 0xa5, 0xe1, 0x2f, 0x01, 0xa9, 0x0d, - 0xbf, 0x51, 0xa5, 0x1f, 0x48, 0x93, 0x1d, 0x38, 0xf6, 0xd0, 0x4e, 0x35, 0x3b, 0xfe, 0x73, 0x58, - 0x8a, 0xf0, 0x7d, 0xa3, 0x6a, 0x2e, 0xc0, 0xfc, 0x16, 0x91, 0x1b, 0x1a, 0xe9, 0xf6, 0x3e, 0x06, - 0xa4, 0x12, 0xa7, 0x8a, 0x6c, 0x2d, 0x98, 0x7f, 0x6e, 0x4f, 0xa8, 0x8b, 0xa4, 0xd4, 0xc0, 0x37, - 0xf0, 0x3c, 0x84, 0x6f, 0x0a, 0xbf, 0x4c, 0xc1, 0xd5, 0x06, 0x53, 0x81, 0xff, 0xbb, 0x06, 0x95, - 0xf6, 0xc0, 0x70, 0x86, 0x12, 0xf8, 0x7b, 0x90, 0xe7, 0xa7, 0x6b, 0x91, 0xd0, 0x7a, 0x10, 0x16, - 0xa3, 0xf2, 0xf2, 0x42, 0x9b, 0x9f, 0xc5, 0x45, 0x2b, 0xaa, 0xb8, 0xb8, 0xf3, 0xda, 0x8a, 0xdc, - 0x81, 0x6d, 0xa1, 0xf7, 0x21, 0x67, 0xd0, 0x26, 0x2c, 0x14, 0xd5, 0xa2, 0x79, 0x0d, 0x26, 0x8d, - 0x9d, 0x01, 0x38, 0x17, 0xfe, 0x0e, 0x94, 0x15, 0x04, 0x54, 0x80, 0xec, 0xd3, 0x8e, 0xd8, 0xb0, - 0xb7, 0x37, 0xbb, 0xdb, 0x2f, 0x79, 0x42, 0xa7, 0x06, 0xb0, 0xd5, 0xf1, 0xcb, 0x19, 0xfc, 0x99, - 0x68, 0x25, 0xdc, 0xbe, 0xaa, 0x8f, 0x96, 0xa6, 0x4f, 0xe6, 0xb5, 0xf4, 0xb9, 0x80, 0xaa, 0xe8, - 0xfe, 0xb4, 0x61, 0x8c, 0xc9, 0x4b, 0x09, 0x63, 0x8a, 0xf2, 0xba, 0x60, 0xc4, 0xbf, 0xd2, 0xa0, - 0xbe, 0x65, 0xbf, 0xb2, 0x4e, 0x1d, 0xa3, 0xef, 0xaf, 0x93, 0x8f, 0x22, 0x23, 0xb5, 0x1e, 0x49, - 0x8e, 0x46, 0xf8, 0x03, 0x42, 0x64, 0xc4, 0x1a, 0x41, 0xda, 0x90, 0xc7, 0x42, 0x59, 0xc4, 0x1f, - 0xc2, 0x5c, 0xa4, 0x11, 0xb5, 0xfd, 0xcb, 0xf6, 0xee, 0xf6, 0x16, 0xb5, 0x35, 0x4b, 0xac, 0x75, - 0xf6, 0xda, 0x4f, 0x76, 0x3b, 0xe2, 0x02, 0xa9, 0xbd, 0xb7, 0xd9, 0xd9, 0xad, 0x67, 0x70, 0x0f, - 0xe6, 0x15, 0xf8, 0x69, 0x6f, 0x06, 0x52, 0xb4, 0x9b, 0x83, 0xaa, 0x88, 0xf6, 0x62, 0x51, 0xfe, - 0x5b, 0x06, 0x6a, 0x92, 0xf2, 0x66, 0x30, 0xd1, 0x32, 0xe4, 0xfb, 0xc7, 0x87, 0xe6, 0x97, 0xf2, - 0xe6, 0x48, 0x94, 0x28, 0x7d, 0xc0, 0x71, 0xf8, 0xf5, 0xad, 0x28, 0xd1, 0x30, 0xee, 0x18, 0x27, - 0xde, 0xb6, 0xd5, 0x27, 0x17, 0x6c, 0x53, 0x30, 0xab, 0x07, 0x04, 0x96, 0x61, 0x12, 0xd7, 0xbc, - 0xec, 0x64, 0xa5, 0x5c, 0xfb, 0xa2, 0x87, 0x50, 0xa7, 0xdf, 0xed, 0xd1, 0x68, 0x60, 0x92, 0x3e, - 0x17, 0x50, 0x60, 0x3c, 0x31, 0x3a, 0x45, 0x67, 0x67, 0x11, 0xb7, 0x51, 0x64, 0x61, 0x49, 0x94, - 0xd0, 0x2a, 0x94, 0xb9, 0x7e, 0xdb, 0xd6, 0x0b, 0x97, 0xb0, 0xbb, 0xcf, 0xac, 0xae, 0x92, 0xc2, - 0xdb, 0x0c, 0x88, 0x6e, 0x33, 0x16, 0x60, 0xbe, 0x3d, 0xf6, 0xce, 0x3a, 0x16, 0x8d, 0x15, 0xd2, - 0xca, 0x8b, 0x80, 0x28, 0x71, 0xcb, 0x74, 0x55, 0xaa, 0x60, 0x0d, 0x0f, 0x48, 0x07, 0x16, 0x28, - 0x91, 0x58, 0x9e, 0xd9, 0x53, 0xe2, 0xaa, 0xdc, 0x79, 0x69, 0x91, 0x9d, 0x97, 0xe1, 0xba, 0xaf, - 0x6c, 0xa7, 0x2f, 0x6c, 0xee, 0x97, 0xf1, 0x3f, 0x6a, 0x1c, 0xf2, 0x85, 0x1b, 0xda, 0x3e, 0xfd, - 0x96, 0x62, 0xd0, 0x07, 0x50, 0xb0, 0x47, 0xec, 0x86, 0x5f, 0xa4, 0x61, 0x96, 0xd7, 0xf9, 0x9b, - 0x80, 0x75, 0x21, 0x78, 0x9f, 0xd7, 0xea, 0x92, 0x0d, 0x3d, 0x80, 0xda, 0x99, 0xe1, 0x9e, 0x91, - 0xfe, 0x81, 0x94, 0xc9, 0x4f, 0x7e, 0x11, 0x2a, 0x5e, 0x0b, 0xf4, 0x7b, 0x4a, 0xbc, 0x2b, 0xf4, - 0xc3, 0x8f, 0x60, 0x49, 0x72, 0x8a, 0xdb, 0x89, 0x2b, 0x98, 0x5f, 0xc1, 0x1d, 0xc9, 0xbc, 0x79, - 0x66, 0x58, 0xa7, 0x44, 0x02, 0xfe, 0xae, 0x16, 0x88, 0xf7, 0x27, 0x9b, 0xd8, 0x9f, 0x27, 0xd0, - 0xf0, 0xfb, 0xc3, 0x4e, 0xd6, 0xf6, 0x40, 0x55, 0x74, 0xec, 0x8a, 0xf5, 0x54, 0xd2, 0xd9, 0x37, - 0xa5, 0x39, 0xf6, 0xc0, 0xdf, 0x4a, 0xd3, 0x6f, 0xbc, 0x09, 0x37, 0xa5, 0x0c, 0x71, 0xe6, 0x0d, - 0x0b, 0x89, 0x29, 0x9e, 0x24, 0x44, 0x18, 0x96, 0x36, 0xbd, 0x7a, 0xe0, 0x55, 0xce, 0xf0, 0x10, - 0x30, 0x99, 0x9a, 0x22, 0x73, 0x89, 0x4f, 0x4a, 0xaa, 0x98, 0xb2, 0x5b, 0x92, 0x64, 0x2a, 0x40, - 0x25, 0x8b, 0x01, 0xa3, 0xe4, 0xd8, 0x80, 0xc5, 0x44, 0xff, 0x00, 0x56, 0x7c, 0x25, 0xa8, 0xdd, - 0x0e, 0x88, 0x33, 0x34, 0x5d, 0x57, 0xc9, 0x7b, 0x27, 0x75, 0xfc, 0x01, 0xcc, 0x8e, 0x88, 0x08, - 0x42, 0xe5, 0x0d, 0x24, 0x27, 0xa5, 0xd2, 0x98, 0xd5, 0xe3, 0x3e, 0xdc, 0x95, 0xd2, 0xb9, 0x45, - 0x13, 0xc5, 0x47, 0x95, 0x92, 0xd9, 0xc0, 0x4c, 0x4a, 0x36, 0x30, 0x1b, 0xb9, 0x8b, 0xf9, 0x98, - 0x1b, 0x52, 0xae, 0xf9, 0xa9, 0x36, 0x17, 0x3b, 0xdc, 0xa6, 0xbe, 0xab, 0x98, 0x4a, 0xd8, 0x5f, - 0x0b, 0x2f, 0xf0, 0x75, 0x79, 0x78, 0xc2, 0x7a, 0x28, 0x2f, 0x3a, 0x64, 0x91, 0xee, 0x9a, 0xe9, - 0x00, 0xe8, 0x6a, 0x2e, 0x74, 0x56, 0x0f, 0xd1, 0xf0, 0x31, 0x2c, 0x86, 0xfd, 0xda, 0x54, 0xba, - 0x2c, 0x42, 0xce, 0xb3, 0xcf, 0x89, 0x8c, 0x35, 0xbc, 0x20, 0x6d, 0xe7, 0xfb, 0xbc, 0xa9, 0x6c, - 0x67, 0x04, 0xc2, 0xd8, 0xea, 0x98, 0x56, 0x5f, 0x3a, 0xb1, 0xe4, 0x19, 0x88, 0x17, 0xf0, 0x1e, - 0x2c, 0x47, 0x3d, 0xdb, 0x54, 0x2a, 0xbf, 0xe4, 0x6b, 0x29, 0xc9, 0xf9, 0x4d, 0x25, 0xf7, 0x93, - 0xc0, 0x2f, 0x29, 0xbe, 0x6d, 0x2a, 0x91, 0x3a, 0x34, 0x93, 0x5c, 0xdd, 0xd7, 0xb1, 0x74, 0x7c, - 0xcf, 0x37, 0x95, 0x30, 0x37, 0x10, 0x36, 0xfd, 0xf0, 0x07, 0xee, 0x2a, 0x7b, 0xa5, 0xbb, 0x12, - 0x8b, 0x24, 0x70, 0xa8, 0x6f, 0x60, 0xd2, 0x09, 0x8c, 0xc0, 0x97, 0x4f, 0x8b, 0x41, 0xc3, 0x99, - 0x8f, 0xc1, 0x0a, 0x72, 0x62, 0xab, 0x11, 0x60, 0xaa, 0xc1, 0xf8, 0x34, 0x70, 0xe3, 0xb1, 0x20, - 0x31, 0x95, 0xe0, 0xcf, 0x60, 0x35, 0x3d, 0x3e, 0x4c, 0x23, 0xf9, 0x61, 0x0b, 0x4a, 0xfe, 0x61, - 0x48, 0x79, 0x6f, 0x56, 0x86, 0xc2, 0xde, 0xfe, 0xe1, 0x41, 0x7b, 0xb3, 0xc3, 0x1f, 0x9c, 0x6d, - 0xee, 0xeb, 0xfa, 0x8b, 0x83, 0x6e, 0x3d, 0xb3, 0xf1, 0xeb, 0x2c, 0x64, 0x76, 0x5e, 0xa2, 0xcf, - 0x21, 0xc7, 0x5f, 0x5f, 0x5c, 0xf1, 0xe4, 0xa6, 0x79, 0xd5, 0x03, 0x13, 0x7c, 0xe3, 0xc7, 0xff, - 0xf5, 0xeb, 0x9f, 0x67, 0xe6, 0x71, 0xa5, 0x35, 0xf9, 0x76, 0xeb, 0x7c, 0xd2, 0x62, 0x61, 0xea, - 0xb1, 0xf6, 0x10, 0x7d, 0x02, 0xd9, 0x83, 0xb1, 0x87, 0x52, 0x9f, 0xe2, 0x34, 0xd3, 0xdf, 0x9c, - 0xe0, 0x25, 0x26, 0x74, 0x0e, 0x83, 0x10, 0x3a, 0x1a, 0x7b, 0x54, 0xe4, 0x0f, 0xa1, 0xac, 0xbe, - 0x18, 0xb9, 0xf6, 0x7d, 0x4e, 0xf3, 0xfa, 0xd7, 0x28, 0xf8, 0x0e, 0x83, 0xba, 0x81, 0x91, 0x80, - 0xe2, 0x6f, 0x5a, 0xd4, 0x5e, 0x74, 0x2f, 0x2c, 0x94, 0xfa, 0x7a, 0xa7, 0x99, 0xfe, 0x40, 0x25, - 0xd6, 0x0b, 0xef, 0xc2, 0xa2, 0x22, 0xff, 0x44, 0xbc, 0x4d, 0xe9, 0x79, 0xe8, 0x6e, 0xc2, 0xdb, - 0x04, 0xf5, 0x16, 0xbe, 0xb9, 0x9a, 0xce, 0x20, 0x40, 0x6e, 0x33, 0x90, 0x65, 0x3c, 0x2f, 0x40, - 0x7a, 0x3e, 0xcb, 0x63, 0xed, 0xe1, 0x46, 0x0f, 0x72, 0xec, 0x86, 0x0b, 0x7d, 0x21, 0x3f, 0x9a, - 0x09, 0x57, 0x7d, 0x29, 0x03, 0x1d, 0xba, 0x1b, 0xc3, 0x8b, 0x0c, 0xa8, 0x86, 0x4b, 0x14, 0x88, - 0xdd, 0x6f, 0x3d, 0xd6, 0x1e, 0xae, 0x69, 0x1f, 0x68, 0x1b, 0xbf, 0xca, 0x41, 0x8e, 0xa5, 0x76, - 0xd1, 0x39, 0x40, 0x70, 0xdb, 0x13, 0xed, 0x5d, 0xec, 0xfe, 0x28, 0xda, 0xbb, 0xf8, 0x45, 0x11, - 0x6e, 0x32, 0xd0, 0x45, 0x3c, 0x47, 0x41, 0x59, 0xc6, 0xb8, 0xc5, 0x92, 0xe0, 0xd4, 0x8e, 0x7f, - 0xa3, 0x89, 0xcc, 0x36, 0x5f, 0x4b, 0x28, 0x49, 0x5a, 0xe8, 0xca, 0x27, 0x3a, 0x1d, 0x12, 0xae, - 0x7b, 0xf0, 0x77, 0x19, 0x60, 0x0b, 0xd7, 0x03, 0x40, 0x87, 0x71, 0x3c, 0xd6, 0x1e, 0x7e, 0xd1, - 0xc0, 0x0b, 0xc2, 0xca, 0x91, 0x1a, 0xf4, 0x23, 0xa8, 0x85, 0xaf, 0x34, 0xd0, 0xbd, 0x04, 0xac, - 0xe8, 0xcd, 0x48, 0xf3, 0xed, 0xab, 0x99, 0x84, 0x4e, 0x2b, 0x4c, 0x27, 0x01, 0xce, 0x91, 0xcf, - 0x09, 0x19, 0x19, 0x94, 0x49, 0x8c, 0x01, 0xfa, 0x07, 0x4d, 0xdc, 0x38, 0x05, 0x77, 0x14, 0x28, - 0x49, 0x7a, 0xec, 0x06, 0xa4, 0x79, 0xff, 0x1a, 0x2e, 0xa1, 0xc4, 0x1f, 0x32, 0x25, 0x3e, 0xc4, - 0x8b, 0x81, 0x12, 0x9e, 0x39, 0x24, 0x9e, 0x2d, 0xb4, 0xf8, 0xe2, 0x36, 0xbe, 0x11, 0x32, 0x4e, - 0xa8, 0x36, 0x18, 0x2c, 0x7e, 0xcf, 0x90, 0x38, 0x58, 0xa1, 0x7b, 0x8b, 0xc4, 0xc1, 0x0a, 0x5f, - 0x52, 0x24, 0x0d, 0x16, 0xbf, 0x55, 0x48, 0x1a, 0x2c, 0xbf, 0x66, 0xe3, 0xff, 0x66, 0xa1, 0xb0, - 0xc9, 0xdf, 0x84, 0x23, 0x1b, 0x4a, 0x7e, 0x9a, 0x1e, 0xad, 0x24, 0xe5, 0x19, 0x83, 0x63, 0x4d, - 0xf3, 0x6e, 0x6a, 0xbd, 0x50, 0xe8, 0x2d, 0xa6, 0xd0, 0x2d, 0xbc, 0x4c, 0x91, 0xc5, 0xb3, 0xf3, - 0x16, 0x4f, 0x66, 0xb5, 0x8c, 0x7e, 0x9f, 0x1a, 0xe2, 0x4f, 0xa1, 0xa2, 0xe6, 0xd1, 0xd1, 0x5b, - 0x89, 0xb9, 0x4d, 0x35, 0x15, 0xdf, 0xc4, 0x57, 0xb1, 0x08, 0xe4, 0xb7, 0x19, 0xf2, 0x0a, 0xbe, - 0x99, 0x80, 0xec, 0x30, 0xd6, 0x10, 0x38, 0xcf, 0x81, 0x27, 0x83, 0x87, 0x52, 0xec, 0xc9, 0xe0, - 0xe1, 0x14, 0xfa, 0x95, 0xe0, 0x63, 0xc6, 0x4a, 0xc1, 0x5d, 0x80, 0x20, 0x93, 0x8d, 0x12, 0x6d, - 0xa9, 0x9c, 0xeb, 0xa2, 0xce, 0x21, 0x9e, 0x04, 0xc7, 0x98, 0xc1, 0x8a, 0x79, 0x17, 0x81, 0x1d, - 0x98, 0xae, 0xc7, 0x17, 0x66, 0x35, 0x94, 0x9a, 0x46, 0x89, 0xfd, 0x09, 0xe7, 0xb7, 0x9b, 0xf7, - 0xae, 0xe4, 0x11, 0xe8, 0xf7, 0x19, 0xfa, 0x5d, 0xdc, 0x4c, 0x40, 0x1f, 0x71, 0x5e, 0x3a, 0xd9, - 0xfe, 0x3f, 0x0f, 0xe5, 0xe7, 0x86, 0x69, 0x79, 0xc4, 0x32, 0xac, 0x1e, 0x41, 0xc7, 0x90, 0x63, - 0x91, 0x3a, 0xea, 0x88, 0xd5, 0xb4, 0x6d, 0xd4, 0x11, 0x87, 0x72, 0x9a, 0x78, 0x95, 0x01, 0x37, - 0xf1, 0x12, 0x05, 0x1e, 0x06, 0xa2, 0x5b, 0x2c, 0x15, 0x49, 0x3b, 0x7d, 0x02, 0x79, 0x71, 0xdb, - 0x17, 0x11, 0x14, 0x4a, 0xfe, 0x34, 0x6f, 0x27, 0x57, 0x26, 0xcd, 0x65, 0x15, 0xc6, 0x65, 0x7c, - 0x14, 0x67, 0x02, 0x10, 0xe4, 0xd8, 0xa3, 0x23, 0x1a, 0x4b, 0xc9, 0x37, 0x57, 0xd3, 0x19, 0x92, - 0x6c, 0xaa, 0x62, 0xf6, 0x7d, 0x5e, 0x8a, 0xfb, 0xc7, 0x30, 0xfb, 0xcc, 0x70, 0xcf, 0x50, 0x24, - 0xf6, 0x2a, 0x6f, 0xc5, 0x9a, 0xcd, 0xa4, 0x2a, 0x81, 0x72, 0x97, 0xa1, 0xdc, 0xe4, 0xae, 0x4c, - 0x45, 0x39, 0x33, 0x5c, 0x1a, 0xd4, 0x50, 0x1f, 0xf2, 0xfc, 0xe9, 0x58, 0xd4, 0x7e, 0xa1, 0xe7, - 0x67, 0x51, 0xfb, 0x85, 0x5f, 0x9b, 0x5d, 0x8f, 0x32, 0x82, 0xa2, 0x7c, 0xab, 0x85, 0x22, 0x17, - 0xf7, 0x91, 0x77, 0x5d, 0xcd, 0x95, 0xb4, 0x6a, 0x81, 0x75, 0x8f, 0x61, 0xdd, 0xc1, 0x8d, 0xd8, - 0x58, 0x09, 0xce, 0xc7, 0xda, 0xc3, 0x0f, 0x34, 0xf4, 0x23, 0x80, 0xe0, 0x5a, 0x22, 0xb6, 0x02, - 0xa3, 0x37, 0x1c, 0xb1, 0x15, 0x18, 0xbb, 0xd1, 0xc0, 0xeb, 0x0c, 0x77, 0x0d, 0xdf, 0x8b, 0xe2, - 0x7a, 0x8e, 0x61, 0xb9, 0x27, 0xc4, 0x79, 0x9f, 0x67, 0x59, 0xdd, 0x33, 0x73, 0x44, 0xbb, 0xec, - 0x40, 0xc9, 0xcf, 0x3a, 0x47, 0xbd, 0x6d, 0x34, 0x1b, 0x1e, 0xf5, 0xb6, 0xb1, 0x74, 0x75, 0xd8, - 0xed, 0x84, 0x66, 0x8b, 0x64, 0xa5, 0x0b, 0xf0, 0x17, 0x75, 0x98, 0xa5, 0xbb, 0x6e, 0xba, 0x39, - 0x09, 0xf2, 0x26, 0xd1, 0xde, 0xc7, 0xb2, 0xa8, 0xd1, 0xde, 0xc7, 0x53, 0x2e, 0xe1, 0xcd, 0x09, - 0xfb, 0x05, 0x13, 0x4f, 0x51, 0xd0, 0x9e, 0xda, 0x50, 0x56, 0x12, 0x2b, 0x28, 0x41, 0x58, 0x38, - 0x3d, 0x1b, 0x0d, 0x77, 0x09, 0x59, 0x19, 0x7c, 0x8b, 0xe1, 0x2d, 0xf1, 0x70, 0xc7, 0xf0, 0xfa, - 0x9c, 0x83, 0x02, 0x8a, 0xde, 0x89, 0x75, 0x9f, 0xd0, 0xbb, 0xf0, 0xda, 0x5f, 0x4d, 0x67, 0x48, - 0xed, 0x5d, 0xb0, 0xf0, 0x5f, 0x41, 0x45, 0x4d, 0xaf, 0xa0, 0x04, 0xe5, 0x23, 0x29, 0xe5, 0x68, - 0x1c, 0x49, 0xca, 0xce, 0x84, 0x3d, 0x9b, 0xff, 0x93, 0x30, 0xc9, 0x46, 0x81, 0x07, 0x50, 0x10, - 0xf9, 0x96, 0x24, 0x93, 0x86, 0xd3, 0xcf, 0x49, 0x26, 0x8d, 0x24, 0x6b, 0xc2, 0xbb, 0x67, 0x86, - 0x48, 0x8f, 0x94, 0x32, 0x56, 0x0b, 0xb4, 0xa7, 0xc4, 0x4b, 0x43, 0x0b, 0x32, 0x99, 0x69, 0x68, - 0xca, 0x71, 0x3e, 0x0d, 0xed, 0x94, 0x78, 0xc2, 0x1f, 0xc8, 0x63, 0x32, 0x4a, 0x11, 0xa6, 0xc6, - 0x47, 0x7c, 0x15, 0x4b, 0xd2, 0xe1, 0x26, 0x00, 0x94, 0xc1, 0xf1, 0x02, 0x20, 0xc8, 0x06, 0x45, - 0x77, 0xac, 0x89, 0x59, 0xf0, 0xe8, 0x8e, 0x35, 0x39, 0xa1, 0x14, 0xf6, 0x7d, 0x01, 0x2e, 0x3f, - 0x5b, 0x51, 0xe4, 0x9f, 0x69, 0x80, 0xe2, 0x89, 0x23, 0xf4, 0x28, 0x59, 0x7a, 0x62, 0x6e, 0xbd, - 0xf9, 0xde, 0xeb, 0x31, 0x27, 0x85, 0xb3, 0x40, 0xa5, 0x1e, 0xe3, 0x1e, 0xbd, 0xa2, 0x4a, 0xfd, - 0xa5, 0x06, 0xd5, 0x50, 0xd6, 0x09, 0x3d, 0x48, 0x19, 0xd3, 0x48, 0xca, 0xbd, 0xf9, 0xce, 0xb5, - 0x7c, 0x49, 0x5b, 0x79, 0x65, 0x06, 0xc8, 0x33, 0xcd, 0x4f, 0x34, 0xa8, 0x85, 0xb3, 0x54, 0x28, - 0x45, 0x76, 0x2c, 0x65, 0xdf, 0x5c, 0xbb, 0x9e, 0xf1, 0xea, 0xe1, 0x09, 0x8e, 0x33, 0x03, 0x28, - 0x88, 0xbc, 0x56, 0xd2, 0xc4, 0x0f, 0x27, 0xfb, 0x93, 0x26, 0x7e, 0x24, 0x29, 0x96, 0x30, 0xf1, - 0x1d, 0x7b, 0x40, 0x94, 0x65, 0x26, 0x12, 0x5f, 0x69, 0x68, 0x57, 0x2f, 0xb3, 0x48, 0xd6, 0x2c, - 0x0d, 0x2d, 0x58, 0x66, 0x32, 0xe3, 0x85, 0x52, 0x84, 0x5d, 0xb3, 0xcc, 0xa2, 0x09, 0xb3, 0x84, - 0x65, 0xc6, 0x00, 0x95, 0x65, 0x16, 0xe4, 0xa6, 0x92, 0x96, 0x59, 0xec, 0xee, 0x22, 0x69, 0x99, - 0xc5, 0xd3, 0x5b, 0x09, 0xe3, 0xc8, 0x70, 0x43, 0xcb, 0x6c, 0x21, 0x21, 0x8d, 0x85, 0xde, 0x4b, - 0x31, 0x62, 0xe2, 0x95, 0x48, 0xf3, 0xfd, 0xd7, 0xe4, 0x4e, 0x9d, 0xe3, 0xdc, 0xfc, 0x72, 0x8e, - 0xff, 0xad, 0x06, 0x8b, 0x49, 0x29, 0x30, 0x94, 0x82, 0x93, 0x72, 0x95, 0xd2, 0x5c, 0x7f, 0x5d, - 0xf6, 0xab, 0xad, 0xe5, 0xcf, 0xfa, 0x27, 0xf5, 0x7f, 0xfd, 0x6a, 0x45, 0xfb, 0x8f, 0xaf, 0x56, - 0xb4, 0xff, 0xfe, 0x6a, 0x45, 0xfb, 0xbb, 0xff, 0x59, 0x99, 0x39, 0xce, 0xb3, 0x1f, 0x1a, 0x7f, - 0xfb, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xd4, 0x63, 0xa4, 0xef, 0x3c, 0x00, 0x00, + 0x75, 0xe6, 0x00, 0xc4, 0xed, 0xe0, 0x42, 0xb0, 0x79, 0x11, 0x84, 0x95, 0x28, 0x6e, 0x6b, 0xa5, + 0xe5, 0x4a, 0xbb, 0xc4, 0x9a, 0xb6, 0xb3, 0x55, 0x4a, 0xe2, 0x18, 0x22, 0xb1, 0x12, 0x97, 0x14, + 0xc9, 0x1d, 0x42, 0xda, 0x4b, 0xb9, 0xc2, 0x1a, 0x02, 0x2d, 0x72, 0x42, 0x60, 0x06, 0x9e, 0x19, + 0x40, 0xe4, 0xe6, 0xe2, 0x94, 0xcb, 0x71, 0x25, 0xaf, 0x76, 0x55, 0x2a, 0x79, 0x48, 0x5e, 0x52, + 0x29, 0x97, 0x1f, 0xfc, 0x9c, 0xbf, 0x90, 0xa7, 0x5c, 0x2a, 0x7f, 0x20, 0xb5, 0xf1, 0x4b, 0xf2, + 0x23, 0x52, 0xae, 0xbe, 0xcd, 0xf4, 0xdc, 0x40, 0xd9, 0xd8, 0xdd, 0x17, 0x11, 0x7d, 0xfa, 0xf4, + 0xf9, 0x4e, 0x9f, 0xee, 0x3e, 0xe7, 0xf4, 0xe9, 0x11, 0x94, 0x9c, 0x51, 0x6f, 0x73, 0xe4, 0xd8, + 0x9e, 0x8d, 0x2a, 0xc4, 0xeb, 0xf5, 0x5d, 0xe2, 0x4c, 0x88, 0x33, 0x3a, 0x6d, 0x2e, 0x9f, 0xd9, + 0x67, 0x36, 0xeb, 0x68, 0xd1, 0x5f, 0x9c, 0xa7, 0xd9, 0xa0, 0x3c, 0x2d, 0x63, 0x64, 0xb6, 0x86, + 0x93, 0x5e, 0x6f, 0x74, 0xda, 0xba, 0x98, 0x88, 0x9e, 0xa6, 0xdf, 0x63, 0x8c, 0xbd, 0xf3, 0xd1, + 0x29, 0xfb, 0x23, 0xfa, 0x6e, 0x9d, 0xd9, 0xf6, 0xd9, 0x80, 0xf0, 0x5e, 0xcb, 0xb2, 0x3d, 0xc3, + 0x33, 0x6d, 0xcb, 0xe5, 0xbd, 0xf8, 0xaf, 0x34, 0xa8, 0xe9, 0xc4, 0x1d, 0xd9, 0x96, 0x4b, 0x9e, + 0x12, 0xa3, 0x4f, 0x1c, 0x74, 0x1b, 0xa0, 0x37, 0x18, 0xbb, 0x1e, 0x71, 0x4e, 0xcc, 0x7e, 0x43, + 0x5b, 0xd7, 0x36, 0xe6, 0xf5, 0x92, 0xa0, 0xec, 0xf6, 0xd1, 0x1b, 0x50, 0x1a, 0x92, 0xe1, 0x29, + 0xef, 0xcd, 0xb0, 0xde, 0x22, 0x27, 0xec, 0xf6, 0x51, 0x13, 0x8a, 0x0e, 0x99, 0x98, 0xae, 0x69, + 0x5b, 0x8d, 0xec, 0xba, 0xb6, 0x91, 0xd5, 0xfd, 0x36, 0x1d, 0xe8, 0x18, 0x2f, 0xbd, 0x13, 0x8f, + 0x38, 0xc3, 0xc6, 0x3c, 0x1f, 0x48, 0x09, 0x5d, 0xe2, 0x0c, 0xf1, 0x4f, 0x72, 0x50, 0xd1, 0x0d, + 0xeb, 0x8c, 0xe8, 0xe4, 0x87, 0x63, 0xe2, 0x7a, 0xa8, 0x0e, 0xd9, 0x0b, 0x72, 0xc5, 0xe0, 0x2b, + 0x3a, 0xfd, 0xc9, 0xc7, 0x5b, 0x67, 0xe4, 0x84, 0x58, 0x1c, 0xb8, 0x42, 0xc7, 0x5b, 0x67, 0xa4, + 0x63, 0xf5, 0xd1, 0x32, 0xe4, 0x06, 0xe6, 0xd0, 0xf4, 0x04, 0x2a, 0x6f, 0x84, 0xd4, 0x99, 0x8f, + 0xa8, 0xb3, 0x0d, 0xe0, 0xda, 0x8e, 0x77, 0x62, 0x3b, 0x7d, 0xe2, 0x34, 0x72, 0xeb, 0xda, 0x46, + 0x6d, 0xeb, 0xad, 0x4d, 0x75, 0x19, 0x36, 0x55, 0x85, 0x36, 0x8f, 0x6d, 0xc7, 0x3b, 0xa4, 0xbc, + 0x7a, 0xc9, 0x95, 0x3f, 0xd1, 0x87, 0x50, 0x66, 0x42, 0x3c, 0xc3, 0x39, 0x23, 0x5e, 0x23, 0xcf, + 0xa4, 0xdc, 0xbb, 0x46, 0x4a, 0x97, 0x31, 0xeb, 0x0c, 0x9e, 0xff, 0x46, 0x18, 0x2a, 0x2e, 0x71, + 0x4c, 0x63, 0x60, 0x7e, 0x61, 0x9c, 0x0e, 0x48, 0xa3, 0xb0, 0xae, 0x6d, 0x14, 0xf5, 0x10, 0x8d, + 0xce, 0xff, 0x82, 0x5c, 0xb9, 0x27, 0xb6, 0x35, 0xb8, 0x6a, 0x14, 0x19, 0x43, 0x91, 0x12, 0x0e, + 0xad, 0xc1, 0x15, 0x5b, 0x34, 0x7b, 0x6c, 0x79, 0xbc, 0xb7, 0xc4, 0x7a, 0x4b, 0x8c, 0xc2, 0xba, + 0x37, 0xa0, 0x3e, 0x34, 0xad, 0x93, 0xa1, 0xdd, 0x3f, 0xf1, 0x0d, 0x02, 0xcc, 0x20, 0xb5, 0xa1, + 0x69, 0x3d, 0xb3, 0xfb, 0xba, 0x34, 0x0b, 0xe5, 0x34, 0x2e, 0xc3, 0x9c, 0x65, 0xc1, 0x69, 0x5c, + 0xaa, 0x9c, 0x9b, 0xb0, 0x44, 0x65, 0xf6, 0x1c, 0x62, 0x78, 0x24, 0x60, 0xae, 0x30, 0xe6, 0xc5, + 0xa1, 0x69, 0x6d, 0xb3, 0x9e, 0x10, 0xbf, 0x71, 0x19, 0xe3, 0xaf, 0x0a, 0x7e, 0xe3, 0x32, 0xcc, + 0x8f, 0x37, 0xa1, 0xe4, 0xdb, 0x1c, 0x15, 0x61, 0xfe, 0xe0, 0xf0, 0xa0, 0x53, 0x9f, 0x43, 0x00, + 0xf9, 0xf6, 0xf1, 0x76, 0xe7, 0x60, 0xa7, 0xae, 0xa1, 0x32, 0x14, 0x76, 0x3a, 0xbc, 0x91, 0xc1, + 0x8f, 0x01, 0x02, 0xeb, 0xa2, 0x02, 0x64, 0xf7, 0x3a, 0x9f, 0xd5, 0xe7, 0x28, 0xcf, 0x8b, 0x8e, + 0x7e, 0xbc, 0x7b, 0x78, 0x50, 0xd7, 0xe8, 0xe0, 0x6d, 0xbd, 0xd3, 0xee, 0x76, 0xea, 0x19, 0xca, + 0xf1, 0xec, 0x70, 0xa7, 0x9e, 0x45, 0x25, 0xc8, 0xbd, 0x68, 0xef, 0x3f, 0xef, 0xd4, 0xe7, 0xf1, + 0xcf, 0x35, 0xa8, 0x8a, 0xf5, 0xe2, 0x67, 0x02, 0x7d, 0x07, 0xf2, 0xe7, 0xec, 0x5c, 0xb0, 0xad, + 0x58, 0xde, 0xba, 0x15, 0x59, 0xdc, 0xd0, 0xd9, 0xd1, 0x05, 0x2f, 0xc2, 0x90, 0xbd, 0x98, 0xb8, + 0x8d, 0xcc, 0x7a, 0x76, 0xa3, 0xbc, 0x55, 0xdf, 0xe4, 0xe7, 0x75, 0x73, 0x8f, 0x5c, 0xbd, 0x30, + 0x06, 0x63, 0xa2, 0xd3, 0x4e, 0x84, 0x60, 0x7e, 0x68, 0x3b, 0x84, 0xed, 0xd8, 0xa2, 0xce, 0x7e, + 0xd3, 0x6d, 0xcc, 0x16, 0x4d, 0xec, 0x56, 0xde, 0xc0, 0xbf, 0xd4, 0x00, 0x8e, 0xc6, 0x5e, 0xfa, + 0xd1, 0x58, 0x86, 0xdc, 0x84, 0x0a, 0x16, 0xc7, 0x82, 0x37, 0xd8, 0x99, 0x20, 0x86, 0x4b, 0xfc, + 0x33, 0x41, 0x1b, 0xe8, 0x06, 0x14, 0x46, 0x0e, 0x99, 0x9c, 0x5c, 0x4c, 0x18, 0x48, 0x51, 0xcf, + 0xd3, 0xe6, 0xde, 0x04, 0xbd, 0x09, 0x15, 0xf3, 0xcc, 0xb2, 0x1d, 0x72, 0xc2, 0x65, 0xe5, 0x58, + 0x6f, 0x99, 0xd3, 0x98, 0xde, 0x0a, 0x0b, 0x17, 0x9c, 0x57, 0x59, 0xf6, 0x29, 0x09, 0x5b, 0x50, + 0x66, 0xaa, 0xce, 0x64, 0xbe, 0x77, 0x02, 0x1d, 0x33, 0x6c, 0x58, 0xdc, 0x84, 0x42, 0x6b, 0xfc, + 0x03, 0x40, 0x3b, 0x64, 0x40, 0x3c, 0x32, 0x8b, 0xf7, 0x50, 0x6c, 0x92, 0x55, 0x6d, 0x82, 0x7f, + 0xa6, 0xc1, 0x52, 0x48, 0xfc, 0x4c, 0xd3, 0x6a, 0x40, 0xa1, 0xcf, 0x84, 0x71, 0x0d, 0xb2, 0xba, + 0x6c, 0xa2, 0x87, 0x50, 0x14, 0x0a, 0xb8, 0x8d, 0x6c, 0xca, 0xa6, 0x29, 0x70, 0x9d, 0x5c, 0xfc, + 0xcb, 0x0c, 0x94, 0xc4, 0x44, 0x0f, 0x47, 0xa8, 0x0d, 0x55, 0x87, 0x37, 0x4e, 0xd8, 0x7c, 0x84, + 0x46, 0xcd, 0x74, 0x27, 0xf4, 0x74, 0x4e, 0xaf, 0x88, 0x21, 0x8c, 0x8c, 0x7e, 0x1f, 0xca, 0x52, + 0xc4, 0x68, 0xec, 0x09, 0x93, 0x37, 0xc2, 0x02, 0x82, 0xfd, 0xf7, 0x74, 0x4e, 0x07, 0xc1, 0x7e, + 0x34, 0xf6, 0x50, 0x17, 0x96, 0xe5, 0x60, 0x3e, 0x1b, 0xa1, 0x46, 0x96, 0x49, 0x59, 0x0f, 0x4b, + 0x89, 0x2f, 0xd5, 0xd3, 0x39, 0x1d, 0x89, 0xf1, 0x4a, 0xa7, 0xaa, 0x92, 0x77, 0xc9, 0x9d, 0x77, + 0x4c, 0xa5, 0xee, 0xa5, 0x15, 0x57, 0xa9, 0x7b, 0x69, 0x3d, 0x2e, 0x41, 0x41, 0xb4, 0xf0, 0xbf, + 0x64, 0x00, 0xe4, 0x6a, 0x1c, 0x8e, 0xd0, 0x0e, 0xd4, 0x1c, 0xd1, 0x0a, 0x59, 0xeb, 0x8d, 0x44, + 0x6b, 0x89, 0x45, 0x9c, 0xd3, 0xab, 0x72, 0x10, 0x57, 0xee, 0x7b, 0x50, 0xf1, 0xa5, 0x04, 0x06, + 0xbb, 0x99, 0x60, 0x30, 0x5f, 0x42, 0x59, 0x0e, 0xa0, 0x26, 0xfb, 0x04, 0x56, 0xfc, 0xf1, 0x09, + 0x36, 0x7b, 0x73, 0x8a, 0xcd, 0x7c, 0x81, 0x4b, 0x52, 0x82, 0x6a, 0x35, 0x55, 0xb1, 0xc0, 0x6c, + 0x37, 0x13, 0xcc, 0x16, 0x57, 0x8c, 0x1a, 0x0e, 0x68, 0xbc, 0xe4, 0x4d, 0xfc, 0xbf, 0x59, 0x28, + 0x6c, 0xdb, 0xc3, 0x91, 0xe1, 0xd0, 0xd5, 0xc8, 0x3b, 0xc4, 0x1d, 0x0f, 0x3c, 0x66, 0xae, 0xda, + 0xd6, 0xdd, 0xb0, 0x44, 0xc1, 0x26, 0xff, 0xea, 0x8c, 0x55, 0x17, 0x43, 0xe8, 0x60, 0x11, 0x1e, + 0x33, 0xaf, 0x31, 0x58, 0x04, 0x47, 0x31, 0x44, 0x1e, 0xe4, 0x6c, 0x70, 0x90, 0x9b, 0x50, 0x98, + 0x10, 0x27, 0x08, 0xe9, 0x4f, 0xe7, 0x74, 0x49, 0x40, 0xef, 0xc0, 0x42, 0x34, 0xbc, 0xe4, 0x04, + 0x4f, 0xad, 0x17, 0x8e, 0x46, 0x77, 0xa1, 0x12, 0x8a, 0x71, 0x79, 0xc1, 0x57, 0x1e, 0x2a, 0x21, + 0x6e, 0x55, 0xfa, 0x55, 0x1a, 0x8f, 0x2b, 0x4f, 0xe7, 0xa4, 0x67, 0x5d, 0x95, 0x9e, 0xb5, 0x28, + 0x46, 0x09, 0xdf, 0x1a, 0x72, 0x32, 0xdf, 0x0f, 0x3b, 0x19, 0xfc, 0x7d, 0xa8, 0x86, 0x0c, 0x44, + 0xe3, 0x4e, 0xe7, 0xe3, 0xe7, 0xed, 0x7d, 0x1e, 0xa4, 0x9e, 0xb0, 0xb8, 0xa4, 0xd7, 0x35, 0x1a, + 0xeb, 0xf6, 0x3b, 0xc7, 0xc7, 0xf5, 0x0c, 0xaa, 0x42, 0xe9, 0xe0, 0xb0, 0x7b, 0xc2, 0xb9, 0xb2, + 0xf8, 0x89, 0x2f, 0x41, 0x04, 0x39, 0x25, 0xb6, 0xcd, 0x29, 0xb1, 0x4d, 0x93, 0xb1, 0x2d, 0x13, + 0xc4, 0x36, 0x16, 0xe6, 0xf6, 0x3b, 0xed, 0xe3, 0x4e, 0x7d, 0xfe, 0x71, 0x0d, 0x2a, 0xdc, 0xbe, + 0x27, 0x63, 0x8b, 0x86, 0xda, 0x7f, 0xd2, 0x00, 0x82, 0xd3, 0x84, 0x5a, 0x50, 0xe8, 0x71, 0x9c, + 0x86, 0xc6, 0x9c, 0xd1, 0x4a, 0xe2, 0x92, 0xe9, 0x92, 0x0b, 0x7d, 0x0b, 0x0a, 0xee, 0xb8, 0xd7, + 0x23, 0xae, 0x0c, 0x79, 0x37, 0xa2, 0xfe, 0x50, 0x78, 0x2b, 0x5d, 0xf2, 0xd1, 0x21, 0x2f, 0x0d, + 0x73, 0x30, 0x66, 0x01, 0x70, 0xfa, 0x10, 0xc1, 0x87, 0xff, 0x5e, 0x83, 0xb2, 0xb2, 0x79, 0x7f, + 0x47, 0x27, 0x7c, 0x0b, 0x4a, 0x4c, 0x07, 0xd2, 0x17, 0x6e, 0xb8, 0xa8, 0x07, 0x04, 0xf4, 0x7b, + 0x50, 0x92, 0x27, 0x40, 0x7a, 0xe2, 0x46, 0xb2, 0xd8, 0xc3, 0x91, 0x1e, 0xb0, 0xe2, 0x3d, 0x58, + 0x64, 0x56, 0xe9, 0xd1, 0xe4, 0x5a, 0xda, 0x51, 0x4d, 0x3f, 0xb5, 0x48, 0xfa, 0xd9, 0x84, 0xe2, + 0xe8, 0xfc, 0xca, 0x35, 0x7b, 0xc6, 0x40, 0x68, 0xe1, 0xb7, 0xf1, 0x47, 0x80, 0x54, 0x61, 0xb3, + 0x4c, 0x17, 0x57, 0xa1, 0xfc, 0xd4, 0x70, 0xcf, 0x85, 0x4a, 0xf8, 0x21, 0x54, 0x69, 0x73, 0xef, + 0xc5, 0x6b, 0xe8, 0xc8, 0x2e, 0x07, 0x92, 0x7b, 0x26, 0x9b, 0x23, 0x98, 0x3f, 0x37, 0xdc, 0x73, + 0x36, 0xd1, 0xaa, 0xce, 0x7e, 0xa3, 0x77, 0xa0, 0xde, 0xe3, 0x93, 0x3c, 0x89, 0x5c, 0x19, 0x16, + 0x04, 0xdd, 0xcf, 0x04, 0x3f, 0x85, 0x0a, 0x9f, 0xc3, 0x57, 0xad, 0x04, 0x5e, 0x84, 0x85, 0x63, + 0xcb, 0x18, 0xb9, 0xe7, 0xb6, 0x8c, 0x6e, 0x74, 0xd2, 0xf5, 0x80, 0x36, 0x13, 0xe2, 0xdb, 0xb0, + 0xe0, 0x90, 0xa1, 0x61, 0x5a, 0xa6, 0x75, 0x76, 0x72, 0x7a, 0xe5, 0x11, 0x57, 0x5c, 0x98, 0x6a, + 0x3e, 0xf9, 0x31, 0xa5, 0x52, 0xd5, 0x4e, 0x07, 0xf6, 0xa9, 0x70, 0x73, 0xec, 0x37, 0xfe, 0x69, + 0x06, 0x2a, 0x9f, 0x18, 0x5e, 0x4f, 0x2e, 0x1d, 0xda, 0x85, 0x9a, 0xef, 0xdc, 0x18, 0x45, 0xe8, + 0x12, 0x09, 0xb1, 0x6c, 0x8c, 0x4c, 0xa5, 0x65, 0x74, 0xac, 0xf6, 0x54, 0x02, 0x13, 0x65, 0x58, + 0x3d, 0x32, 0xf0, 0x45, 0x65, 0xd2, 0x45, 0x31, 0x46, 0x55, 0x94, 0x4a, 0x40, 0x87, 0x50, 0x1f, + 0x39, 0xf6, 0x99, 0x43, 0x5c, 0xd7, 0x17, 0xc6, 0xc3, 0x18, 0x4e, 0x10, 0x76, 0x24, 0x58, 0x03, + 0x71, 0x0b, 0xa3, 0x30, 0xe9, 0xf1, 0x42, 0x90, 0xcf, 0x70, 0xe7, 0xf4, 0x9f, 0x19, 0x40, 0xf1, + 0x49, 0xfd, 0xb6, 0x29, 0xde, 0x3d, 0xa8, 0xb9, 0x9e, 0xe1, 0xc4, 0x36, 0x5b, 0x95, 0x51, 0x7d, + 0x8f, 0xff, 0x36, 0xf8, 0x0a, 0x9d, 0x58, 0xb6, 0x67, 0xbe, 0xbc, 0x12, 0x59, 0x72, 0x4d, 0x92, + 0x0f, 0x18, 0x15, 0x75, 0xa0, 0xf0, 0xd2, 0x1c, 0x78, 0xc4, 0x71, 0x1b, 0xb9, 0xf5, 0xec, 0x46, + 0x6d, 0xeb, 0xe1, 0x75, 0xcb, 0xb0, 0xf9, 0x21, 0xe3, 0xef, 0x5e, 0x8d, 0x88, 0x2e, 0xc7, 0xaa, + 0x99, 0x67, 0x3e, 0x94, 0x8d, 0xdf, 0x84, 0xe2, 0x2b, 0x2a, 0x82, 0xde, 0xb2, 0x0b, 0x3c, 0x59, + 0x64, 0x6d, 0x7e, 0xc9, 0x7e, 0xe9, 0x18, 0x67, 0x43, 0x62, 0x79, 0xf2, 0x1e, 0x28, 0xdb, 0xf8, + 0x1e, 0x40, 0x00, 0x43, 0x5d, 0xfe, 0xc1, 0xe1, 0xd1, 0xf3, 0x6e, 0x7d, 0x0e, 0x55, 0xa0, 0x78, + 0x70, 0xb8, 0xd3, 0xd9, 0xef, 0xd0, 0xf8, 0x80, 0x5b, 0xd2, 0xa4, 0xa1, 0xb5, 0x54, 0x31, 0xb5, + 0x10, 0x26, 0x5e, 0x85, 0xe5, 0xa4, 0x05, 0xa4, 0xb9, 0x68, 0x55, 0xec, 0xd2, 0x99, 0x8e, 0x8a, + 0x0a, 0x9d, 0x09, 0x4f, 0xb7, 0x01, 0x05, 0xbe, 0x7b, 0xfb, 0x22, 0x39, 0x97, 0x4d, 0x6a, 0x08, + 0xbe, 0x19, 0x49, 0x5f, 0xac, 0x92, 0xdf, 0x4e, 0x74, 0x2f, 0xb9, 0x44, 0xf7, 0x82, 0xee, 0x42, + 0xd5, 0x3f, 0x0d, 0x86, 0x2b, 0x72, 0x81, 0x92, 0x5e, 0x91, 0x1b, 0x9d, 0xd2, 0x42, 0x46, 0x2f, + 0x84, 0x8d, 0x8e, 0xee, 0x41, 0x9e, 0x4c, 0x88, 0xe5, 0xb9, 0x8d, 0x32, 0x8b, 0x18, 0x55, 0x99, + 0xbb, 0x77, 0x28, 0x55, 0x17, 0x9d, 0xf8, 0xbb, 0xb0, 0xc8, 0xee, 0x48, 0x4f, 0x1c, 0xc3, 0x52, + 0x2f, 0x73, 0xdd, 0xee, 0xbe, 0x30, 0x37, 0xfd, 0x89, 0x6a, 0x90, 0xd9, 0xdd, 0x11, 0x46, 0xc8, + 0xec, 0xee, 0xe0, 0x1f, 0x6b, 0x80, 0xd4, 0x71, 0x33, 0xd9, 0x39, 0x22, 0x5c, 0xc2, 0x67, 0x03, + 0xf8, 0x65, 0xc8, 0x11, 0xc7, 0xb1, 0x1d, 0x66, 0xd1, 0x92, 0xce, 0x1b, 0xf8, 0x2d, 0xa1, 0x83, + 0x4e, 0x26, 0xf6, 0x85, 0x7f, 0x06, 0xb9, 0x34, 0xcd, 0x57, 0x75, 0x0f, 0x96, 0x42, 0x5c, 0x33, + 0x45, 0xae, 0x0f, 0x61, 0x81, 0x09, 0xdb, 0x3e, 0x27, 0xbd, 0x8b, 0x91, 0x6d, 0x5a, 0x31, 0x3c, + 0xba, 0x72, 0x81, 0x83, 0xa5, 0xf3, 0xe0, 0x13, 0xab, 0xf8, 0xc4, 0x6e, 0x77, 0x1f, 0x7f, 0x06, + 0xab, 0x11, 0x39, 0x52, 0xfd, 0x3f, 0x82, 0x72, 0xcf, 0x27, 0xba, 0x22, 0xd7, 0xb9, 0x1d, 0x56, + 0x2e, 0x3a, 0x54, 0x1d, 0x81, 0x0f, 0xe1, 0x46, 0x4c, 0xf4, 0x4c, 0x73, 0x7e, 0x1b, 0x56, 0x98, + 0xc0, 0x3d, 0x42, 0x46, 0xed, 0x81, 0x39, 0x49, 0xb5, 0xf4, 0x48, 0x4c, 0x4a, 0x61, 0xfc, 0x7a, + 0xf7, 0x05, 0xfe, 0x03, 0x81, 0xd8, 0x35, 0x87, 0xa4, 0x6b, 0xef, 0xa7, 0xeb, 0x46, 0xa3, 0xd9, + 0x05, 0xb9, 0x72, 0x45, 0x5a, 0xc3, 0x7e, 0xe3, 0x7f, 0xd6, 0x84, 0xa9, 0xd4, 0xe1, 0x5f, 0xf3, + 0x4e, 0x5e, 0x03, 0x38, 0xa3, 0x47, 0x86, 0xf4, 0x69, 0x07, 0xaf, 0xa8, 0x28, 0x14, 0x5f, 0x4f, + 0xea, 0xbf, 0x2b, 0x42, 0xcf, 0x65, 0xb1, 0xcf, 0xd9, 0x3f, 0xbe, 0x97, 0xbb, 0x0d, 0x65, 0x46, + 0x38, 0xf6, 0x0c, 0x6f, 0xec, 0xc6, 0x16, 0xe3, 0x2f, 0xc4, 0xb6, 0x97, 0x83, 0x66, 0x9a, 0xd7, + 0xb7, 0x20, 0xcf, 0x2e, 0x13, 0x32, 0x95, 0xbe, 0x99, 0xb0, 0x1f, 0xb9, 0x1e, 0xba, 0x60, 0xc4, + 0x3f, 0xd5, 0x20, 0xff, 0x8c, 0x95, 0x60, 0x15, 0xd5, 0xe6, 0xe5, 0x5a, 0x58, 0xc6, 0x90, 0x17, + 0x86, 0x4a, 0x3a, 0xfb, 0xcd, 0x52, 0x4f, 0x42, 0x9c, 0xe7, 0xfa, 0x3e, 0x4f, 0x71, 0x4b, 0xba, + 0xdf, 0xa6, 0x36, 0xeb, 0x0d, 0x4c, 0x62, 0x79, 0xac, 0x77, 0x9e, 0xf5, 0x2a, 0x14, 0x9a, 0x3d, + 0x9b, 0xee, 0x3e, 0x31, 0x1c, 0x4b, 0x14, 0x4d, 0x8b, 0x7a, 0x40, 0xc0, 0xfb, 0x50, 0xe7, 0x7a, + 0xb4, 0xfb, 0x7d, 0x25, 0xc1, 0xf4, 0xd1, 0xb4, 0x08, 0x5a, 0x48, 0x5a, 0x26, 0x2a, 0xed, 0x17, + 0x1a, 0x2c, 0x2a, 0xe2, 0x66, 0xb2, 0xea, 0xbb, 0x90, 0xe7, 0x45, 0x6a, 0x91, 0xe9, 0x2c, 0x87, + 0x47, 0x71, 0x18, 0x5d, 0xf0, 0xa0, 0x4d, 0x28, 0xf0, 0x5f, 0xf2, 0x0e, 0x90, 0xcc, 0x2e, 0x99, + 0xf0, 0x3d, 0x58, 0x12, 0x24, 0x32, 0xb4, 0x93, 0x0e, 0x06, 0x5b, 0x0c, 0xfc, 0x67, 0xb0, 0x1c, + 0x66, 0x9b, 0x69, 0x4a, 0x8a, 0x92, 0x99, 0xd7, 0x51, 0xb2, 0x2d, 0x95, 0x7c, 0x3e, 0xea, 0x2b, + 0x79, 0x54, 0x74, 0xc7, 0xa8, 0xeb, 0x95, 0x09, 0xaf, 0x57, 0x30, 0x01, 0x29, 0xe2, 0x1b, 0x9d, + 0xc0, 0x07, 0x72, 0x3b, 0xec, 0x9b, 0xae, 0xef, 0xc3, 0x31, 0x54, 0x06, 0xa6, 0x45, 0x0c, 0x47, + 0x54, 0xce, 0x35, 0x5e, 0x39, 0x57, 0x69, 0xf8, 0x0b, 0x40, 0xea, 0xc0, 0x6f, 0x54, 0xe9, 0xfb, + 0xd2, 0x64, 0x47, 0x8e, 0x3d, 0xb4, 0x53, 0xcd, 0x8e, 0xff, 0x1c, 0x56, 0x22, 0x7c, 0xdf, 0xa8, + 0x9a, 0x4b, 0xb0, 0xb8, 0x43, 0x64, 0x42, 0x23, 0xdd, 0xde, 0x47, 0x80, 0x54, 0xe2, 0x4c, 0x91, + 0xad, 0x05, 0x8b, 0xcf, 0xec, 0x09, 0x75, 0x91, 0x94, 0x1a, 0xf8, 0x06, 0x5e, 0x87, 0xf0, 0x4d, + 0xe1, 0xb7, 0x29, 0xb8, 0x3a, 0x60, 0x26, 0xf0, 0x7f, 0xd7, 0xa0, 0xd2, 0x1e, 0x18, 0xce, 0x50, + 0x02, 0x7f, 0x0f, 0xf2, 0xfc, 0x76, 0x2d, 0x0a, 0x5a, 0xf7, 0xc3, 0x62, 0x54, 0x5e, 0xde, 0x68, + 0xf3, 0xbb, 0xb8, 0x18, 0x45, 0x15, 0x17, 0x6f, 0x5e, 0x3b, 0x91, 0x37, 0xb0, 0x1d, 0xf4, 0x1e, + 0xe4, 0x0c, 0x3a, 0x84, 0x85, 0xa2, 0x5a, 0xb4, 0xae, 0xc1, 0xa4, 0xb1, 0x3b, 0x00, 0xe7, 0xc2, + 0xdf, 0x81, 0xb2, 0x82, 0x80, 0x0a, 0x90, 0x7d, 0xd2, 0x11, 0x09, 0x7b, 0x7b, 0xbb, 0xbb, 0xfb, + 0x82, 0x17, 0x74, 0x6a, 0x00, 0x3b, 0x1d, 0xbf, 0x9d, 0xc1, 0x9f, 0x8a, 0x51, 0xc2, 0xed, 0xab, + 0xfa, 0x68, 0x69, 0xfa, 0x64, 0x5e, 0x4b, 0x9f, 0x4b, 0xa8, 0x8a, 0xe9, 0xcf, 0x1a, 0xc6, 0x98, + 0xbc, 0x94, 0x30, 0xa6, 0x28, 0xaf, 0x0b, 0x46, 0xfc, 0x2b, 0x0d, 0xea, 0x3b, 0xf6, 0x2b, 0xeb, + 0xcc, 0x31, 0xfa, 0xfe, 0x39, 0xf9, 0x30, 0xb2, 0x52, 0x9b, 0x91, 0xe2, 0x68, 0x84, 0x3f, 0x20, + 0x44, 0x56, 0xac, 0x11, 0x94, 0x0d, 0x79, 0x2c, 0x94, 0x4d, 0xfc, 0x01, 0x2c, 0x44, 0x06, 0x51, + 0xdb, 0xbf, 0x68, 0xef, 0xef, 0xee, 0x50, 0x5b, 0xb3, 0xc2, 0x5a, 0xe7, 0xa0, 0xfd, 0x78, 0xbf, + 0x23, 0x1e, 0x90, 0xda, 0x07, 0xdb, 0x9d, 0xfd, 0x7a, 0x06, 0xf7, 0x60, 0x51, 0x81, 0x9f, 0xf5, + 0x65, 0x20, 0x45, 0xbb, 0x05, 0xa8, 0x8a, 0x68, 0x2f, 0x0e, 0xe5, 0xbf, 0x65, 0xa0, 0x26, 0x29, + 0x5f, 0x0f, 0x26, 0x5a, 0x85, 0x7c, 0xff, 0xf4, 0xd8, 0xfc, 0x42, 0xbe, 0x1c, 0x89, 0x16, 0xa5, + 0x0f, 0x38, 0x0e, 0x7f, 0xbe, 0x15, 0x2d, 0x1a, 0xc6, 0x1d, 0xe3, 0xa5, 0xb7, 0x6b, 0xf5, 0xc9, + 0x25, 0x4b, 0x0a, 0xe6, 0xf5, 0x80, 0xc0, 0x2a, 0x4c, 0xe2, 0x99, 0x97, 0xdd, 0xac, 0x94, 0x67, + 0x5f, 0xf4, 0x00, 0xea, 0xf4, 0x77, 0x7b, 0x34, 0x1a, 0x98, 0xa4, 0xcf, 0x05, 0x14, 0x18, 0x4f, + 0x8c, 0x4e, 0xd1, 0xd9, 0x5d, 0xc4, 0x6d, 0x14, 0x59, 0x58, 0x12, 0x2d, 0xb4, 0x0e, 0x65, 0xae, + 0xdf, 0xae, 0xf5, 0xdc, 0x25, 0xec, 0xed, 0x33, 0xab, 0xab, 0xa4, 0x70, 0x9a, 0x01, 0xd1, 0x34, + 0x63, 0x09, 0x16, 0xdb, 0x63, 0xef, 0xbc, 0x63, 0xd1, 0x58, 0x21, 0xad, 0xbc, 0x0c, 0x88, 0x12, + 0x77, 0x4c, 0x57, 0xa5, 0x0a, 0xd6, 0xf0, 0x82, 0x74, 0x60, 0x89, 0x12, 0x89, 0xe5, 0x99, 0x3d, + 0x25, 0xae, 0xca, 0xcc, 0x4b, 0x8b, 0x64, 0x5e, 0x86, 0xeb, 0xbe, 0xb2, 0x9d, 0xbe, 0xb0, 0xb9, + 0xdf, 0xc6, 0xff, 0xa8, 0x71, 0xc8, 0xe7, 0x6e, 0x28, 0x7d, 0xfa, 0x2d, 0xc5, 0xa0, 0xf7, 0xa1, + 0x60, 0x8f, 0xd8, 0x0b, 0xbf, 0x28, 0xc3, 0xac, 0x6e, 0xf2, 0x6f, 0x02, 0x36, 0x85, 0xe0, 0x43, + 0xde, 0xab, 0x4b, 0x36, 0x74, 0x1f, 0x6a, 0xe7, 0x86, 0x7b, 0x4e, 0xfa, 0x47, 0x52, 0x26, 0xbf, + 0xf9, 0x45, 0xa8, 0x78, 0x23, 0xd0, 0xef, 0x09, 0xf1, 0xa6, 0xe8, 0x87, 0x1f, 0xc2, 0x8a, 0xe4, + 0x14, 0xaf, 0x13, 0x53, 0x98, 0x5f, 0xc1, 0x6d, 0xc9, 0xbc, 0x7d, 0x6e, 0x58, 0x67, 0x44, 0x02, + 0xfe, 0xae, 0x16, 0x88, 0xcf, 0x27, 0x9b, 0x38, 0x9f, 0xc7, 0xd0, 0xf0, 0xe7, 0xc3, 0x6e, 0xd6, + 0xf6, 0x40, 0x55, 0x74, 0xec, 0x8a, 0xf3, 0x54, 0xd2, 0xd9, 0x6f, 0x4a, 0x73, 0xec, 0x81, 0x9f, + 0x4a, 0xd3, 0xdf, 0x78, 0x1b, 0x6e, 0x4a, 0x19, 0xe2, 0xce, 0x1b, 0x16, 0x12, 0x53, 0x3c, 0x49, + 0x88, 0x30, 0x2c, 0x1d, 0x3a, 0x7d, 0xe1, 0x55, 0xce, 0xf0, 0x12, 0x30, 0x99, 0x9a, 0x22, 0x73, + 0x85, 0x6f, 0x4a, 0xaa, 0x98, 0x92, 0x2d, 0x49, 0x32, 0x15, 0xa0, 0x92, 0xc5, 0x82, 0x51, 0x72, + 0x6c, 0xc1, 0x62, 0xa2, 0x7f, 0x00, 0x6b, 0xbe, 0x12, 0xd4, 0x6e, 0x47, 0xc4, 0x19, 0x9a, 0xae, + 0xab, 0xd4, 0xbd, 0x93, 0x26, 0x7e, 0x1f, 0xe6, 0x47, 0x44, 0x04, 0xa1, 0xf2, 0x16, 0x92, 0x9b, + 0x52, 0x19, 0xcc, 0xfa, 0x71, 0x1f, 0xee, 0x48, 0xe9, 0xdc, 0xa2, 0x89, 0xe2, 0xa3, 0x4a, 0xc9, + 0x6a, 0x60, 0x26, 0xa5, 0x1a, 0x98, 0x8d, 0xbc, 0xc5, 0x7c, 0xc4, 0x0d, 0x29, 0xcf, 0xfc, 0x4c, + 0xc9, 0xc5, 0x1e, 0xb7, 0xa9, 0xef, 0x2a, 0x66, 0x12, 0xf6, 0xd7, 0xc2, 0x0b, 0x7c, 0x55, 0x1e, + 0x9e, 0xb0, 0x19, 0xca, 0x87, 0x0e, 0xd9, 0xa4, 0x59, 0x33, 0x5d, 0x00, 0x5d, 0xad, 0x85, 0xce, + 0xeb, 0x21, 0x1a, 0x3e, 0x85, 0xe5, 0xb0, 0x5f, 0x9b, 0x49, 0x97, 0x65, 0xc8, 0x79, 0xf6, 0x05, + 0x91, 0xb1, 0x86, 0x37, 0xa4, 0xed, 0x7c, 0x9f, 0x37, 0x93, 0xed, 0x8c, 0x40, 0x18, 0x3b, 0x1d, + 0xb3, 0xea, 0x4b, 0x37, 0x96, 0xbc, 0x03, 0xf1, 0x06, 0x3e, 0x80, 0xd5, 0xa8, 0x67, 0x9b, 0x49, + 0xe5, 0x17, 0xfc, 0x2c, 0x25, 0x39, 0xbf, 0x99, 0xe4, 0x7e, 0x1c, 0xf8, 0x25, 0xc5, 0xb7, 0xcd, + 0x24, 0x52, 0x87, 0x66, 0x92, 0xab, 0xfb, 0x2a, 0x8e, 0x8e, 0xef, 0xf9, 0x66, 0x12, 0xe6, 0x06, + 0xc2, 0x66, 0x5f, 0xfe, 0xc0, 0x5d, 0x65, 0xa7, 0xba, 0x2b, 0x71, 0x48, 0x02, 0x87, 0xfa, 0x35, + 0x6c, 0x3a, 0x81, 0x11, 0xf8, 0xf2, 0x59, 0x31, 0x68, 0x38, 0xf3, 0x31, 0x58, 0x43, 0x6e, 0x6c, + 0x35, 0x02, 0xcc, 0xb4, 0x18, 0x9f, 0x04, 0x6e, 0x3c, 0x16, 0x24, 0x66, 0x12, 0xfc, 0x29, 0xac, + 0xa7, 0xc7, 0x87, 0x59, 0x24, 0x3f, 0x68, 0x41, 0xc9, 0xbf, 0x0c, 0x29, 0xdf, 0x9b, 0x95, 0xa1, + 0x70, 0x70, 0x78, 0x7c, 0xd4, 0xde, 0xee, 0xf0, 0x0f, 0xce, 0xb6, 0x0f, 0x75, 0xfd, 0xf9, 0x51, + 0xb7, 0x9e, 0xd9, 0xfa, 0x75, 0x16, 0x32, 0x7b, 0x2f, 0xd0, 0x67, 0x90, 0xe3, 0x5f, 0x5f, 0x4c, + 0xf9, 0xe4, 0xa6, 0x39, 0xed, 0x03, 0x13, 0x7c, 0xe3, 0xc7, 0xff, 0xf5, 0xeb, 0x9f, 0x67, 0x16, + 0x71, 0xa5, 0x35, 0xf9, 0x76, 0xeb, 0x62, 0xd2, 0x62, 0x61, 0xea, 0x91, 0xf6, 0x00, 0x7d, 0x0c, + 0xd9, 0xa3, 0xb1, 0x87, 0x52, 0x3f, 0xc5, 0x69, 0xa6, 0x7f, 0x73, 0x82, 0x57, 0x98, 0xd0, 0x05, + 0x0c, 0x42, 0xe8, 0x68, 0xec, 0x51, 0x91, 0x3f, 0x84, 0xb2, 0xfa, 0xc5, 0xc8, 0xb5, 0xdf, 0xe7, + 0x34, 0xaf, 0xff, 0x1a, 0x05, 0xdf, 0x66, 0x50, 0x37, 0x30, 0x12, 0x50, 0xfc, 0x9b, 0x16, 0x75, + 0x16, 0xdd, 0x4b, 0x0b, 0xa5, 0x7e, 0xbd, 0xd3, 0x4c, 0xff, 0x40, 0x25, 0x36, 0x0b, 0xef, 0xd2, + 0xa2, 0x22, 0xff, 0x44, 0x7c, 0x9b, 0xd2, 0xf3, 0xd0, 0x9d, 0x84, 0x6f, 0x13, 0xd4, 0x57, 0xf8, + 0xe6, 0x7a, 0x3a, 0x83, 0x00, 0xb9, 0xc5, 0x40, 0x56, 0xf1, 0xa2, 0x00, 0xe9, 0xf9, 0x2c, 0x8f, + 0xb4, 0x07, 0x5b, 0x3d, 0xc8, 0xb1, 0x17, 0x2e, 0xf4, 0xb9, 0xfc, 0xd1, 0x4c, 0x78, 0xea, 0x4b, + 0x59, 0xe8, 0xd0, 0xdb, 0x18, 0x5e, 0x66, 0x40, 0x35, 0x5c, 0xa2, 0x40, 0xec, 0x7d, 0xeb, 0x91, + 0xf6, 0x60, 0x43, 0x7b, 0x5f, 0xdb, 0xfa, 0x55, 0x0e, 0x72, 0xac, 0xb4, 0x8b, 0x2e, 0x00, 0x82, + 0xd7, 0x9e, 0xe8, 0xec, 0x62, 0xef, 0x47, 0xd1, 0xd9, 0xc5, 0x1f, 0x8a, 0x70, 0x93, 0x81, 0x2e, + 0xe3, 0x05, 0x0a, 0xca, 0x2a, 0xc6, 0x2d, 0x56, 0x04, 0xa7, 0x76, 0xfc, 0x1b, 0x4d, 0x54, 0xb6, + 0xf9, 0x59, 0x42, 0x49, 0xd2, 0x42, 0x4f, 0x3e, 0xd1, 0xed, 0x90, 0xf0, 0xdc, 0x83, 0xbf, 0xcb, + 0x00, 0x5b, 0xb8, 0x1e, 0x00, 0x3a, 0x8c, 0xe3, 0x91, 0xf6, 0xe0, 0xf3, 0x06, 0x5e, 0x12, 0x56, + 0x8e, 0xf4, 0xa0, 0x1f, 0x41, 0x2d, 0xfc, 0xa4, 0x81, 0xee, 0x26, 0x60, 0x45, 0x5f, 0x46, 0x9a, + 0x6f, 0x4d, 0x67, 0x12, 0x3a, 0xad, 0x31, 0x9d, 0x04, 0x38, 0x47, 0xbe, 0x20, 0x64, 0x64, 0x50, + 0x26, 0xb1, 0x06, 0xe8, 0x1f, 0x34, 0xf1, 0xe2, 0x14, 0xbc, 0x51, 0xa0, 0x24, 0xe9, 0xb1, 0x17, + 0x90, 0xe6, 0xbd, 0x6b, 0xb8, 0x84, 0x12, 0x7f, 0xc8, 0x94, 0xf8, 0x00, 0x2f, 0x07, 0x4a, 0x78, + 0xe6, 0x90, 0x78, 0xb6, 0xd0, 0xe2, 0xf3, 0x5b, 0xf8, 0x46, 0xc8, 0x38, 0xa1, 0xde, 0x60, 0xb1, + 0xf8, 0x3b, 0x43, 0xe2, 0x62, 0x85, 0xde, 0x2d, 0x12, 0x17, 0x2b, 0xfc, 0x48, 0x91, 0xb4, 0x58, + 0xfc, 0x55, 0x21, 0x69, 0xb1, 0xfc, 0x9e, 0xad, 0xff, 0x9b, 0x87, 0xc2, 0x36, 0xff, 0x26, 0x1c, + 0xd9, 0x50, 0xf2, 0xcb, 0xf4, 0x68, 0x2d, 0xa9, 0xce, 0x18, 0x5c, 0x6b, 0x9a, 0x77, 0x52, 0xfb, + 0x85, 0x42, 0x6f, 0x32, 0x85, 0xde, 0xc0, 0xab, 0x14, 0x59, 0x7c, 0x76, 0xde, 0xe2, 0xc5, 0xac, + 0x96, 0xd1, 0xef, 0x53, 0x43, 0xfc, 0x29, 0x54, 0xd4, 0x3a, 0x3a, 0x7a, 0x33, 0xb1, 0xb6, 0xa9, + 0x96, 0xe2, 0x9b, 0x78, 0x1a, 0x8b, 0x40, 0x7e, 0x8b, 0x21, 0xaf, 0xe1, 0x9b, 0x09, 0xc8, 0x0e, + 0x63, 0x0d, 0x81, 0xf3, 0x1a, 0x78, 0x32, 0x78, 0xa8, 0xc4, 0x9e, 0x0c, 0x1e, 0x2e, 0xa1, 0x4f, + 0x05, 0x1f, 0x33, 0x56, 0x0a, 0xee, 0x02, 0x04, 0x95, 0x6c, 0x94, 0x68, 0x4b, 0xe5, 0x5e, 0x17, + 0x75, 0x0e, 0xf1, 0x22, 0x38, 0xc6, 0x0c, 0x56, 0xec, 0xbb, 0x08, 0xec, 0xc0, 0x74, 0x3d, 0x7e, + 0x30, 0xab, 0xa1, 0xd2, 0x34, 0x4a, 0x9c, 0x4f, 0xb8, 0xbe, 0xdd, 0xbc, 0x3b, 0x95, 0x47, 0xa0, + 0xdf, 0x63, 0xe8, 0x77, 0x70, 0x33, 0x01, 0x7d, 0xc4, 0x79, 0xe9, 0x66, 0xfb, 0xff, 0x3c, 0x94, + 0x9f, 0x19, 0xa6, 0xe5, 0x11, 0xcb, 0xb0, 0x7a, 0x04, 0x9d, 0x42, 0x8e, 0x45, 0xea, 0xa8, 0x23, + 0x56, 0xcb, 0xb6, 0x51, 0x47, 0x1c, 0xaa, 0x69, 0xe2, 0x75, 0x06, 0xdc, 0xc4, 0x2b, 0x14, 0x78, + 0x18, 0x88, 0x6e, 0xb1, 0x52, 0x24, 0x9d, 0xf4, 0x4b, 0xc8, 0x8b, 0xd7, 0xbe, 0x88, 0xa0, 0x50, + 0xf1, 0xa7, 0x79, 0x2b, 0xb9, 0x33, 0x69, 0x2f, 0xab, 0x30, 0x2e, 0xe3, 0xa3, 0x38, 0x13, 0x80, + 0xa0, 0xc6, 0x1e, 0x5d, 0xd1, 0x58, 0x49, 0xbe, 0xb9, 0x9e, 0xce, 0x90, 0x64, 0x53, 0x15, 0xb3, + 0xef, 0xf3, 0x52, 0xdc, 0x3f, 0x86, 0xf9, 0xa7, 0x86, 0x7b, 0x8e, 0x22, 0xb1, 0x57, 0xf9, 0x56, + 0xac, 0xd9, 0x4c, 0xea, 0x12, 0x28, 0x77, 0x18, 0xca, 0x4d, 0xee, 0xca, 0x54, 0x94, 0x73, 0xc3, + 0xa5, 0x41, 0x0d, 0xf5, 0x21, 0xcf, 0x3f, 0x1d, 0x8b, 0xda, 0x2f, 0xf4, 0xf9, 0x59, 0xd4, 0x7e, + 0xe1, 0xaf, 0xcd, 0xae, 0x47, 0x19, 0x41, 0x51, 0x7e, 0xab, 0x85, 0x22, 0x0f, 0xf7, 0x91, 0xef, + 0xba, 0x9a, 0x6b, 0x69, 0xdd, 0x02, 0xeb, 0x2e, 0xc3, 0xba, 0x8d, 0x1b, 0xb1, 0xb5, 0x12, 0x9c, + 0x8f, 0xb4, 0x07, 0xef, 0x6b, 0xe8, 0x47, 0x00, 0xc1, 0xb3, 0x44, 0xec, 0x04, 0x46, 0x5f, 0x38, + 0x62, 0x27, 0x30, 0xf6, 0xa2, 0x81, 0x37, 0x19, 0xee, 0x06, 0xbe, 0x1b, 0xc5, 0xf5, 0x1c, 0xc3, + 0x72, 0x5f, 0x12, 0xe7, 0x3d, 0x5e, 0x65, 0x75, 0xcf, 0xcd, 0x11, 0x9d, 0xb2, 0x03, 0x25, 0xbf, + 0xea, 0x1c, 0xf5, 0xb6, 0xd1, 0x6a, 0x78, 0xd4, 0xdb, 0xc6, 0xca, 0xd5, 0x61, 0xb7, 0x13, 0xda, + 0x2d, 0x92, 0x95, 0x1e, 0xc0, 0x5f, 0xd4, 0x61, 0x9e, 0x66, 0xdd, 0x34, 0x39, 0x09, 0xea, 0x26, + 0xd1, 0xd9, 0xc7, 0xaa, 0xa8, 0xd1, 0xd9, 0xc7, 0x4b, 0x2e, 0xe1, 0xe4, 0x84, 0x5e, 0xb2, 0x5a, + 0xbc, 0x44, 0x41, 0x67, 0x6a, 0x43, 0x59, 0x29, 0xac, 0xa0, 0x04, 0x61, 0xe1, 0xf2, 0x6c, 0x34, + 0xdc, 0x25, 0x54, 0x65, 0xf0, 0x1b, 0x0c, 0x6f, 0x85, 0x87, 0x3b, 0x86, 0xd7, 0xe7, 0x1c, 0x14, + 0x50, 0xcc, 0x4e, 0x9c, 0xfb, 0x84, 0xd9, 0x85, 0xcf, 0xfe, 0x7a, 0x3a, 0x43, 0xea, 0xec, 0x82, + 0x83, 0xff, 0x0a, 0x2a, 0x6a, 0x79, 0x05, 0x25, 0x28, 0x1f, 0x29, 0x29, 0x47, 0xe3, 0x48, 0x52, + 0x75, 0x26, 0xec, 0xd9, 0x18, 0xa4, 0xa1, 0xb0, 0x51, 0xe0, 0x01, 0x14, 0x44, 0xbd, 0x25, 0xc9, + 0xa4, 0xe1, 0xf2, 0x73, 0x92, 0x49, 0x23, 0xc5, 0x9a, 0x70, 0xf6, 0xcc, 0x10, 0xe9, 0x95, 0x52, + 0xc6, 0x6a, 0x81, 0xf6, 0x84, 0x78, 0x69, 0x68, 0x41, 0x25, 0x33, 0x0d, 0x4d, 0xb9, 0xce, 0xa7, + 0xa1, 0x9d, 0x11, 0x4f, 0xf8, 0x03, 0x79, 0x4d, 0x46, 0x29, 0xc2, 0xd4, 0xf8, 0x88, 0xa7, 0xb1, + 0x24, 0x5d, 0x6e, 0x02, 0x40, 0x19, 0x1c, 0x2f, 0x01, 0x82, 0x6a, 0x50, 0x34, 0x63, 0x4d, 0xac, + 0x82, 0x47, 0x33, 0xd6, 0xe4, 0x82, 0x52, 0xd8, 0xf7, 0x05, 0xb8, 0xfc, 0x6e, 0x45, 0x91, 0x7f, + 0xa6, 0x01, 0x8a, 0x17, 0x8e, 0xd0, 0xc3, 0x64, 0xe9, 0x89, 0xb5, 0xf5, 0xe6, 0xbb, 0xaf, 0xc7, + 0x9c, 0x14, 0xce, 0x02, 0x95, 0x7a, 0x8c, 0x7b, 0xf4, 0x8a, 0x2a, 0xf5, 0x97, 0x1a, 0x54, 0x43, + 0x55, 0x27, 0x74, 0x3f, 0x65, 0x4d, 0x23, 0x25, 0xf7, 0xe6, 0xdb, 0xd7, 0xf2, 0x25, 0xa5, 0xf2, + 0xca, 0x0e, 0x90, 0x77, 0x9a, 0x9f, 0x68, 0x50, 0x0b, 0x57, 0xa9, 0x50, 0x8a, 0xec, 0x58, 0xc9, + 0xbe, 0xb9, 0x71, 0x3d, 0xe3, 0xf4, 0xe5, 0x09, 0xae, 0x33, 0x03, 0x28, 0x88, 0xba, 0x56, 0xd2, + 0xc6, 0x0f, 0x17, 0xfb, 0x93, 0x36, 0x7e, 0xa4, 0x28, 0x96, 0xb0, 0xf1, 0x1d, 0x7b, 0x40, 0x94, + 0x63, 0x26, 0x0a, 0x5f, 0x69, 0x68, 0xd3, 0x8f, 0x59, 0xa4, 0x6a, 0x96, 0x86, 0x16, 0x1c, 0x33, + 0x59, 0xf1, 0x42, 0x29, 0xc2, 0xae, 0x39, 0x66, 0xd1, 0x82, 0x59, 0xc2, 0x31, 0x63, 0x80, 0xca, + 0x31, 0x0b, 0x6a, 0x53, 0x49, 0xc7, 0x2c, 0xf6, 0x76, 0x91, 0x74, 0xcc, 0xe2, 0xe5, 0xad, 0x84, + 0x75, 0x64, 0xb8, 0xa1, 0x63, 0xb6, 0x94, 0x50, 0xc6, 0x42, 0xef, 0xa6, 0x18, 0x31, 0xf1, 0x49, + 0xa4, 0xf9, 0xde, 0x6b, 0x72, 0xa7, 0xee, 0x71, 0x6e, 0x7e, 0xb9, 0xc7, 0xff, 0x56, 0x83, 0xe5, + 0xa4, 0x12, 0x18, 0x4a, 0xc1, 0x49, 0x79, 0x4a, 0x69, 0x6e, 0xbe, 0x2e, 0xfb, 0x74, 0x6b, 0xf9, + 0xbb, 0xfe, 0x71, 0xfd, 0x5f, 0xbf, 0x5c, 0xd3, 0xfe, 0xe3, 0xcb, 0x35, 0xed, 0xbf, 0xbf, 0x5c, + 0xd3, 0xfe, 0xee, 0x7f, 0xd6, 0xe6, 0x4e, 0xf3, 0xec, 0x3f, 0x1a, 0x7f, 0xfb, 0x37, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xee, 0x4f, 0x63, 0x90, 0xed, 0x3c, 0x00, 0x00, } diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 05e62fc50..0b3148d38 100644 --- a/etcdserver/api/v3election/v3electionpb/v3election.pb.go +++ b/etcdserver/api/v3election/v3electionpb/v3election.pb.go @@ -29,9 +29,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/api/v3/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/api/v3/mvccpb" context "golang.org/x/net/context" @@ -2041,39 +2041,39 @@ var ( func init() { proto.RegisterFile("v3election.proto", fileDescriptorV3Election) } var fileDescriptorV3Election = []byte{ - // 535 bytes of a gzipped FileDescriptorProto + // 531 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x59, 0x27, 0x84, 0x32, 0xa4, 0xad, 0x65, 0x82, 0x48, 0x43, 0x30, 0xd1, 0x22, 0xa1, - 0x2a, 0x07, 0x2f, 0x6a, 0x38, 0xe5, 0x84, 0x40, 0xa0, 0x4a, 0x45, 0x02, 0x7c, 0x40, 0x70, 0xdc, - 0xb8, 0x23, 0x37, 0x8a, 0xe3, 0x35, 0xb6, 0x6b, 0x29, 0x57, 0x5e, 0x81, 0x03, 0x3c, 0x12, 0x47, - 0x24, 0x5e, 0x00, 0x05, 0x1e, 0x04, 0xed, 0xae, 0x8d, 0xff, 0x28, 0x41, 0xa8, 0xb9, 0x58, 0xe3, - 0x9d, 0xcf, 0xf3, 0x9b, 0x6f, 0x76, 0x12, 0x30, 0xb3, 0x09, 0x06, 0xe8, 0xa5, 0x73, 0x11, 0x3a, - 0x51, 0x2c, 0x52, 0x61, 0x75, 0xcb, 0x93, 0x68, 0x36, 0xe8, 0xf9, 0xc2, 0x17, 0x2a, 0xc1, 0x64, - 0xa4, 0x35, 0x83, 0x47, 0x98, 0x7a, 0xe7, 0x4c, 0x3e, 0x12, 0x8c, 0x33, 0x8c, 0x2b, 0x61, 0x34, - 0x63, 0x71, 0xe4, 0xe5, 0xba, 0x23, 0xa5, 0x5b, 0x66, 0x9e, 0xa7, 0x1e, 0xd1, 0x8c, 0x2d, 0xb2, - 0x3c, 0x35, 0xf4, 0x85, 0xf0, 0x03, 0x64, 0x3c, 0x9a, 0x33, 0x1e, 0x86, 0x22, 0xe5, 0x92, 0x98, - 0xe8, 0x2c, 0x7d, 0x0b, 0x87, 0xcf, 0xf9, 0x32, 0xe2, 0x73, 0x3f, 0x74, 0xf1, 0xe3, 0x25, 0x26, - 0xa9, 0x65, 0x41, 0x3b, 0xe4, 0x4b, 0xec, 0x93, 0x11, 0x39, 0xee, 0xba, 0x2a, 0xb6, 0x7a, 0x70, - 0x3d, 0x40, 0x9e, 0x60, 0xdf, 0x18, 0x91, 0xe3, 0x96, 0xab, 0x5f, 0xe4, 0x69, 0xc6, 0x83, 0x4b, - 0xec, 0xb7, 0x94, 0x54, 0xbf, 0xd0, 0x15, 0x98, 0x65, 0xc9, 0x24, 0x12, 0x61, 0x82, 0xd6, 0x13, - 0xe8, 0x5c, 0x20, 0x3f, 0xc7, 0x58, 0x55, 0xbd, 0x75, 0x32, 0x74, 0xaa, 0x46, 0x9c, 0x42, 0x77, - 0xaa, 0x34, 0x6e, 0xae, 0xb5, 0x18, 0x74, 0x02, 0xfd, 0x95, 0xa1, 0xbe, 0xba, 0xeb, 0x54, 0x47, - 0xe6, 0xbc, 0x52, 0xb9, 0x33, 0x5c, 0xb9, 0xb9, 0x8c, 0x7e, 0x80, 0x9b, 0x7f, 0x0f, 0x37, 0xfa, - 0x30, 0xa1, 0xb5, 0xc0, 0x95, 0x2a, 0xd7, 0x75, 0x65, 0x28, 0x4f, 0x62, 0xcc, 0x94, 0x83, 0x96, - 0x2b, 0xc3, 0xd2, 0x6b, 0xbb, 0xe2, 0x95, 0x3e, 0x84, 0x7d, 0x5d, 0xfa, 0x1f, 0x63, 0xa2, 0x17, - 0x70, 0x50, 0x88, 0x76, 0x32, 0x3e, 0x02, 0x63, 0x91, 0xe5, 0xa6, 0x4d, 0x47, 0xdf, 0xa8, 0x73, - 0x86, 0xab, 0x77, 0x72, 0xc0, 0xae, 0xb1, 0xc8, 0xe8, 0x53, 0xd8, 0x77, 0x31, 0xa9, 0xdc, 0x5a, - 0x39, 0x2b, 0xf2, 0x7f, 0xb3, 0x7a, 0x09, 0x07, 0x45, 0x85, 0x5d, 0x7a, 0xa5, 0xef, 0xe1, 0xf0, - 0x4d, 0x2c, 0xbc, 0x80, 0xcf, 0x97, 0x57, 0xed, 0xa5, 0x5c, 0x24, 0xa3, 0xba, 0x48, 0xa7, 0x60, - 0x96, 0x95, 0x77, 0xe9, 0xf1, 0xe4, 0x4b, 0x1b, 0xf6, 0x5e, 0xe4, 0x0d, 0x58, 0x0b, 0xd8, 0x2b, - 0xf6, 0xd3, 0xba, 0x5f, 0xef, 0xac, 0xf1, 0x53, 0x18, 0xd8, 0xdb, 0xd2, 0x9a, 0x42, 0x47, 0x9f, - 0x7e, 0xfc, 0xfe, 0x6c, 0x0c, 0xe8, 0x1d, 0x96, 0x4d, 0x58, 0x21, 0x64, 0x5e, 0x2e, 0x9b, 0x92, - 0xb1, 0x84, 0x15, 0x1e, 0x9a, 0xb0, 0xc6, 0xd4, 0x9a, 0xb0, 0xa6, 0xf5, 0x2d, 0xb0, 0x28, 0x97, - 0x49, 0x98, 0x07, 0x1d, 0x3d, 0x5b, 0xeb, 0xde, 0xa6, 0x89, 0x17, 0xa0, 0xe1, 0xe6, 0x64, 0x8e, - 0xb1, 0x15, 0xa6, 0x4f, 0x6f, 0xd7, 0x30, 0xfa, 0xa2, 0x24, 0xc4, 0x87, 0x1b, 0xaf, 0x67, 0x6a, - 0xe0, 0xbb, 0x50, 0x1e, 0x28, 0xca, 0x11, 0xed, 0xd5, 0x28, 0x42, 0x17, 0x9e, 0x92, 0xf1, 0x63, - 0x22, 0xdd, 0xe8, 0x05, 0x6d, 0x72, 0x6a, 0x8b, 0xdf, 0xe4, 0xd4, 0x77, 0x7a, 0x8b, 0x9b, 0x58, - 0x89, 0xa6, 0x64, 0xfc, 0xcc, 0xfc, 0xb6, 0xb6, 0xc9, 0xf7, 0xb5, 0x4d, 0x7e, 0xae, 0x6d, 0xf2, - 0xf5, 0x97, 0x7d, 0x6d, 0xd6, 0x51, 0x7f, 0x8c, 0x93, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2f, - 0x1d, 0xfa, 0x11, 0xb1, 0x05, 0x00, 0x00, + 0x10, 0xc6, 0x59, 0x27, 0x84, 0x32, 0xa4, 0xad, 0x65, 0x82, 0x08, 0x21, 0xb8, 0xd1, 0x72, 0xa9, + 0x72, 0xb0, 0x51, 0xc3, 0x29, 0x27, 0x04, 0x02, 0x55, 0x2a, 0x12, 0xe0, 0x03, 0x82, 0xe3, 0xda, + 0x1d, 0xb9, 0x91, 0x1d, 0xaf, 0xb1, 0x5d, 0x4b, 0xb9, 0xf2, 0x0a, 0x1c, 0xe0, 0x91, 0x38, 0x22, + 0xf1, 0x02, 0x28, 0xf0, 0x20, 0x68, 0x77, 0xed, 0xfa, 0x8f, 0x12, 0x84, 0x9a, 0xdb, 0x78, 0xe7, + 0xdb, 0xf9, 0xcd, 0x37, 0x3b, 0x09, 0xe8, 0xf9, 0x0c, 0x43, 0xf4, 0xb2, 0x05, 0x8f, 0xac, 0x38, + 0xe1, 0x19, 0x37, 0xfa, 0xd5, 0x49, 0xec, 0x8e, 0x06, 0x3e, 0xf7, 0xb9, 0x4c, 0xd8, 0x22, 0x52, + 0x9a, 0xd1, 0x11, 0x66, 0xde, 0xb9, 0xcd, 0xe2, 0x85, 0x2d, 0x82, 0x14, 0x93, 0x1c, 0x93, 0xd8, + 0xb5, 0x93, 0xd8, 0x2b, 0x04, 0xc3, 0x2b, 0xc1, 0x32, 0xf7, 0xbc, 0xd8, 0xb5, 0x83, 0xbc, 0xc8, + 0x8c, 0x7d, 0xce, 0xfd, 0x10, 0x65, 0x8e, 0x45, 0x11, 0xcf, 0x98, 0x20, 0xa5, 0x2a, 0x4b, 0xdf, + 0xc1, 0xe1, 0x0b, 0xb6, 0x8c, 0xd9, 0xc2, 0x8f, 0x1c, 0xfc, 0x74, 0x89, 0x69, 0x66, 0x18, 0xd0, + 0x8d, 0xd8, 0x12, 0x87, 0x64, 0x42, 0x8e, 0xfb, 0x8e, 0x8c, 0x8d, 0x01, 0xdc, 0x0c, 0x91, 0xa5, + 0x38, 0xd4, 0x26, 0xe4, 0xb8, 0xe3, 0xa8, 0x0f, 0x71, 0x9a, 0xb3, 0xf0, 0x12, 0x87, 0x1d, 0x29, + 0x55, 0x1f, 0x74, 0x05, 0x7a, 0x55, 0x32, 0x8d, 0x79, 0x94, 0xa2, 0xf1, 0x14, 0x7a, 0x17, 0xc8, + 0xce, 0x31, 0x91, 0x55, 0xef, 0x9c, 0x8c, 0xad, 0xba, 0x0f, 0xab, 0xd4, 0x9d, 0x4a, 0x8d, 0x53, + 0x68, 0x0d, 0x1b, 0x7a, 0xa1, 0xba, 0xa5, 0xc9, 0x5b, 0xf7, 0xad, 0xfa, 0xa8, 0xac, 0xd7, 0x32, + 0x77, 0x86, 0x2b, 0xa7, 0x90, 0xd1, 0x8f, 0x70, 0xfb, 0xea, 0x70, 0xa3, 0x0f, 0x1d, 0x3a, 0x01, + 0xae, 0x64, 0xb9, 0xbe, 0x23, 0x42, 0x71, 0x92, 0x60, 0x2e, 0x1d, 0x74, 0x1c, 0x11, 0x56, 0x5e, + 0xbb, 0x35, 0xaf, 0xf4, 0x31, 0xec, 0xab, 0xd2, 0xff, 0x18, 0x13, 0xbd, 0x80, 0x83, 0x52, 0xb4, + 0x93, 0xf1, 0x09, 0x68, 0x41, 0x5e, 0x98, 0xd6, 0x2d, 0xf5, 0xa2, 0xd6, 0x19, 0xae, 0xde, 0x8b, + 0x01, 0x3b, 0x5a, 0x90, 0xd3, 0x67, 0xb0, 0xef, 0x60, 0x5a, 0x7b, 0xb5, 0x6a, 0x56, 0xe4, 0xff, + 0x66, 0xf5, 0x0a, 0x0e, 0xca, 0x0a, 0xbb, 0xf4, 0x4a, 0x3f, 0xc0, 0xe1, 0xdb, 0x84, 0x7b, 0x21, + 0x5b, 0x2c, 0xaf, 0xdb, 0x4b, 0xb5, 0x48, 0x5a, 0x7d, 0x91, 0x4e, 0x41, 0xaf, 0x2a, 0xef, 0xd2, + 0xe3, 0xc9, 0xd7, 0x2e, 0xec, 0xbd, 0x2c, 0x1a, 0x30, 0x02, 0xd8, 0x2b, 0xf7, 0xd3, 0x78, 0xd4, + 0xec, 0xac, 0xf5, 0x53, 0x18, 0x99, 0xdb, 0xd2, 0x8a, 0x42, 0x27, 0x9f, 0x7f, 0xfe, 0xf9, 0xa2, + 0x8d, 0xe8, 0x3d, 0x3b, 0x9f, 0xd9, 0xa5, 0xd0, 0xf6, 0x0a, 0xd9, 0x9c, 0x4c, 0x05, 0xac, 0xf4, + 0xd0, 0x86, 0xb5, 0xa6, 0xd6, 0x86, 0xb5, 0xad, 0x6f, 0x81, 0xc5, 0x85, 0x4c, 0xc0, 0x3c, 0xe8, + 0xa9, 0xd9, 0x1a, 0x0f, 0x37, 0x4d, 0xbc, 0x04, 0x8d, 0x37, 0x27, 0x0b, 0x8c, 0x29, 0x31, 0x43, + 0x7a, 0xb7, 0x81, 0x51, 0x0f, 0x25, 0x20, 0x3e, 0xdc, 0x7a, 0xe3, 0xca, 0x81, 0xef, 0x42, 0x39, + 0x92, 0x94, 0x07, 0x74, 0xd0, 0xa0, 0x70, 0x55, 0x78, 0x4e, 0xa6, 0x4f, 0x88, 0x70, 0xa3, 0x16, + 0xb4, 0xcd, 0x69, 0x2c, 0x7e, 0x9b, 0xd3, 0xdc, 0xe9, 0x2d, 0x6e, 0x12, 0x29, 0x9a, 0x93, 0xe9, + 0x73, 0xfd, 0xfb, 0xda, 0x24, 0x3f, 0xd6, 0x26, 0xf9, 0xb5, 0x36, 0xc9, 0xb7, 0xdf, 0xe6, 0x0d, + 0xb7, 0x27, 0xff, 0x18, 0x67, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xe6, 0x7c, 0x66, 0xa9, + 0x05, 0x00, 0x00, } diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index ad139c1c8..b0e6ab172 100644 --- a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go +++ b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go @@ -24,7 +24,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/api/v3/etcdserverpb" context "golang.org/x/net/context" @@ -934,26 +934,26 @@ var ( func init() { proto.RegisterFile("v3lock.proto", fileDescriptorV3Lock) } var fileDescriptorV3Lock = []byte{ - // 331 bytes of a gzipped FileDescriptorProto + // 330 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x33, 0xce, 0xc9, 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf0, 0x0a, 0x92, 0xa4, 0x44, - 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x82, 0xfa, 0x20, 0x16, 0x44, 0x5e, 0x4a, 0x2d, 0xb5, 0x24, 0x39, - 0x45, 0x1f, 0x44, 0x14, 0xa7, 0x16, 0x95, 0xa5, 0x16, 0x21, 0x31, 0x0b, 0x92, 0xf4, 0x8b, 0x0a, - 0x92, 0xa1, 0xea, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, 0x13, - 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0x21, 0xb2, 0x4a, 0xe6, 0x5c, 0xdc, - 0x3e, 0xf9, 0xc9, 0xd9, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x42, 0x42, 0x5c, 0x2c, 0x79, - 0x89, 0xb9, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x60, 0xb6, 0x90, 0x08, 0x17, 0x6b, - 0x4e, 0x6a, 0x62, 0x71, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x73, 0x10, 0x84, 0xa3, 0x14, 0xc6, - 0xc5, 0x03, 0xd1, 0x58, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x2a, 0x64, 0xc2, 0xc5, 0x96, 0x91, 0x9a, - 0x98, 0x92, 0x5a, 0x04, 0xd6, 0xcb, 0x6d, 0x24, 0xa3, 0x87, 0xec, 0x1e, 0x3d, 0x98, 0x3a, 0x0f, - 0xb0, 0x9a, 0x20, 0xa8, 0x5a, 0x21, 0x01, 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0xb0, 0xc9, 0x3c, 0x41, - 0x20, 0xa6, 0x92, 0x22, 0x17, 0x6f, 0x68, 0x5e, 0x0e, 0x92, 0x93, 0xa0, 0x4a, 0x18, 0x11, 0x4a, - 0xdc, 0xb8, 0xf8, 0x60, 0x4a, 0x28, 0xb1, 0xdc, 0x68, 0x03, 0x23, 0x17, 0x0b, 0xc8, 0x0f, 0x42, - 0xfe, 0x50, 0x5a, 0x54, 0x0f, 0x16, 0xe6, 0x7a, 0x48, 0x81, 0x22, 0x25, 0x86, 0x2e, 0x0c, 0x31, - 0x4d, 0x49, 0xa2, 0xe9, 0xf2, 0x93, 0xc9, 0x4c, 0x42, 0x4a, 0xbc, 0xfa, 0x65, 0xc6, 0xfa, 0x20, - 0x05, 0x60, 0xc2, 0x8a, 0x51, 0x4b, 0x28, 0x9c, 0x8b, 0x0d, 0xe2, 0x42, 0x21, 0x71, 0x84, 0x5e, - 0x14, 0x6f, 0x49, 0x49, 0x60, 0x4a, 0x40, 0x8d, 0x95, 0x02, 0x1b, 0x2b, 0xa2, 0xc4, 0x0f, 0x37, - 0xb6, 0x34, 0x0f, 0x6a, 0xb0, 0x93, 0xc0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, - 0x78, 0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x43, 0x12, 0x1b, 0x38, 0x1e, 0x8d, 0x01, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x65, 0xa8, 0x61, 0xb1, 0x3d, 0x02, 0x00, 0x00, + 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x82, 0xfa, 0x20, 0x16, 0x44, 0x5e, 0x4a, 0x3e, 0xb5, 0x24, 0x39, + 0x45, 0x3f, 0xb1, 0x20, 0x53, 0x1f, 0xc4, 0x28, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x2a, 0x48, 0xd2, + 0x2f, 0x2a, 0x48, 0x86, 0x2a, 0x90, 0x49, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0x05, 0x2b, 0x49, 0xcc, + 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x86, 0xc8, 0x2a, 0x99, 0x73, 0x71, 0xfb, + 0xe4, 0x27, 0x67, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08, 0x09, 0x71, 0xb1, 0xe4, 0x25, + 0xe6, 0xa6, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x42, 0x22, 0x5c, 0xac, 0x39, + 0xa9, 0x89, 0xc5, 0xa9, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x10, 0x8e, 0x52, 0x18, 0x17, + 0x0f, 0x44, 0x63, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x90, 0x09, 0x17, 0x5b, 0x46, 0x6a, 0x62, + 0x4a, 0x6a, 0x11, 0x58, 0x2f, 0xb7, 0x91, 0x8c, 0x1e, 0xb2, 0x7b, 0xf4, 0x60, 0xea, 0x3c, 0xc0, + 0x6a, 0x82, 0xa0, 0x6a, 0x85, 0x04, 0xb8, 0x98, 0xb3, 0x53, 0x2b, 0xc1, 0x26, 0xf3, 0x04, 0x81, + 0x98, 0x4a, 0x8a, 0x5c, 0xbc, 0xa1, 0x79, 0x39, 0x48, 0x4e, 0x82, 0x2a, 0x61, 0x44, 0x28, 0x71, + 0xe3, 0xe2, 0x83, 0x29, 0xa1, 0xc4, 0x72, 0xa3, 0x0d, 0x8c, 0x5c, 0x2c, 0x20, 0x3f, 0x08, 0xf9, + 0x43, 0x69, 0x51, 0x3d, 0x58, 0x60, 0xeb, 0x21, 0x05, 0x8a, 0x94, 0x18, 0xba, 0x30, 0xc4, 0x34, + 0x25, 0x89, 0xa6, 0xcb, 0x4f, 0x26, 0x33, 0x09, 0x29, 0xf1, 0xea, 0x97, 0x19, 0xeb, 0x83, 0x14, + 0x80, 0x09, 0x2b, 0x46, 0x2d, 0xa1, 0x70, 0x2e, 0x36, 0x88, 0x0b, 0x85, 0xc4, 0x11, 0x7a, 0x51, + 0xbc, 0x25, 0x25, 0x81, 0x29, 0x01, 0x35, 0x56, 0x0a, 0x6c, 0xac, 0x88, 0x12, 0x3f, 0xdc, 0xd8, + 0xd2, 0x3c, 0xa8, 0xc1, 0x4e, 0x02, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, + 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x49, 0x6c, 0xe0, 0x78, 0x34, 0x06, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x4a, 0x4d, 0xca, 0xbb, 0x36, 0x02, 0x00, 0x00, } diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index 5253d1f0d..e35aec38d 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -23,7 +23,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" - etcdserverpb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb" + etcdserverpb "go.etcd.io/etcd/api/v3/etcdserverpb" io "io" ) @@ -600,21 +600,21 @@ var ( func init() { proto.RegisterFile("lease.proto", fileDescriptorLease) } var fileDescriptorLease = []byte{ - // 253 bytes of a gzipped FileDescriptorProto + // 256 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xce, 0x49, 0x4d, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x07, 0x73, 0x0a, 0x92, 0xa4, 0x44, 0xd2, - 0xf3, 0xd3, 0xf3, 0xc1, 0x62, 0xfa, 0x20, 0x16, 0x44, 0x5a, 0x4a, 0x2d, 0xb5, 0x24, 0x39, 0x45, - 0x1f, 0x44, 0x14, 0xa7, 0x16, 0x95, 0xa5, 0x16, 0x21, 0x31, 0x0b, 0x92, 0xf4, 0x8b, 0x0a, 0x92, - 0x21, 0xea, 0x94, 0x7c, 0xb9, 0x58, 0x7d, 0x40, 0x06, 0x09, 0xf1, 0x71, 0x31, 0x79, 0xba, 0x48, - 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x31, 0x79, 0xba, 0x08, 0x09, 0x70, 0x31, 0x87, 0x84, 0xf8, - 0x48, 0x30, 0x81, 0x05, 0x40, 0x4c, 0x21, 0x25, 0x2e, 0x9e, 0xa0, 0xd4, 0xdc, 0xc4, 0xcc, 0xbc, - 0xcc, 0xbc, 0x74, 0x90, 0x14, 0x33, 0x58, 0x0a, 0x45, 0x4c, 0xa9, 0x84, 0x4b, 0x04, 0x6c, 0x9c, - 0x67, 0x5e, 0x49, 0x6a, 0x51, 0x5e, 0x62, 0x4e, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x50, - 0x0c, 0x97, 0x18, 0x58, 0x3c, 0x24, 0x33, 0x37, 0x35, 0x24, 0xdf, 0x27, 0xb3, 0x2c, 0x15, 0x2a, - 0x03, 0xb6, 0x91, 0xdb, 0x48, 0x45, 0x0f, 0xd9, 0x7d, 0x7a, 0xd8, 0xd5, 0x06, 0xe1, 0x30, 0x43, - 0xa9, 0x82, 0x4b, 0x14, 0xcd, 0xd6, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xa1, 0x78, 0x2e, 0x71, - 0x0c, 0x2d, 0x10, 0x29, 0xa8, 0xbd, 0xaa, 0x04, 0xec, 0x85, 0x28, 0x0e, 0xc2, 0x65, 0x8a, 0x93, - 0xc4, 0x89, 0x87, 0x72, 0x0c, 0x17, 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, - 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81, 0xc3, 0xd7, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x9f, 0x8b, 0x6c, 0xb5, 0x01, 0x00, 0x00, + 0xf3, 0xd3, 0xf3, 0xc1, 0x62, 0xfa, 0x20, 0x16, 0x44, 0x5a, 0x4a, 0x3e, 0xb5, 0x24, 0x39, 0x45, + 0x3f, 0xb1, 0x20, 0x53, 0x1f, 0xc4, 0x28, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x2a, 0x48, 0xd2, 0x2f, + 0x2a, 0x48, 0x86, 0x28, 0x50, 0xf2, 0xe5, 0x62, 0xf5, 0x01, 0x99, 0x20, 0xc4, 0xc7, 0xc5, 0xe4, + 0xe9, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x1c, 0xc4, 0xe4, 0xe9, 0x22, 0x24, 0xc0, 0xc5, 0x1c, + 0x12, 0xe2, 0x23, 0xc1, 0x04, 0x16, 0x00, 0x31, 0x85, 0x94, 0xb8, 0x78, 0x82, 0x52, 0x73, 0x13, + 0x33, 0xf3, 0x32, 0xf3, 0xd2, 0x41, 0x52, 0xcc, 0x60, 0x29, 0x14, 0x31, 0xa5, 0x12, 0x2e, 0x11, + 0xb0, 0x71, 0x9e, 0x79, 0x25, 0xa9, 0x45, 0x79, 0x89, 0x39, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, + 0x25, 0x42, 0x31, 0x5c, 0x62, 0x60, 0xf1, 0x90, 0xcc, 0xdc, 0xd4, 0x90, 0x7c, 0x9f, 0xcc, 0xb2, + 0x54, 0xa8, 0x0c, 0xd8, 0x46, 0x6e, 0x23, 0x15, 0x3d, 0x64, 0xf7, 0xe9, 0x61, 0x57, 0x1b, 0x84, + 0xc3, 0x0c, 0xa5, 0x0a, 0x2e, 0x51, 0x34, 0x5b, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0xe2, + 0xb9, 0xc4, 0x31, 0xb4, 0x40, 0xa4, 0xa0, 0xf6, 0xaa, 0x12, 0xb0, 0x17, 0xa2, 0x38, 0x08, 0x97, + 0x29, 0x4e, 0x12, 0x27, 0x1e, 0xca, 0x31, 0x5c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, + 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xce, 0x78, 0x2c, 0xc7, 0x90, 0xc4, 0x06, 0x0e, + 0x5f, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x8a, 0x94, 0xb9, 0xae, 0x01, 0x00, 0x00, } From 997961ebfdef38fb892c0c73bbad37b6eabb8cd2 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Tue, 6 Oct 2020 12:28:40 +0200 Subject: [PATCH 5/5] bom: Update bill of materials to reflect the new module. --- api/LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++ bill-of-materials.json | 9 ++ test | 2 +- 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 api/LICENSE diff --git a/api/LICENSE b/api/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/api/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bill-of-materials.json b/bill-of-materials.json index 6eaa854c3..7379f19cf 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -314,6 +314,15 @@ } ] }, + { + "project": "go.etcd.io/etcd/api/v3", + "licenses": [ + { + "type": "Apache License 2.0", + "confidence": 1 + } + ] + }, { "project": "go.etcd.io/etcd/v3", "licenses": [ diff --git a/test b/test index 6fbe2bf76..d8e685c16 100755 --- a/test +++ b/test @@ -484,7 +484,7 @@ function bom_pass { # https://github.com/golang/go/commit/7c388cc89c76bc7167287fb488afcaf5a4aa12bf run license-bill-of-materials \ --override-file bill-of-materials.override.json \ - go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl >bom-now.json || true + go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl go.etcd.io/etcd/api/v3/... >bom-now.json || true if ! diff bill-of-materials.json bom-now.json; then log_error "modularized licenses do not match given bill of materials" return 255