From 9a999dc1e3675f73dfdd40e412683517242ed3b1 Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Sat, 18 May 2019 01:58:23 +0900 Subject: [PATCH] *: fix broken import paths in proto files It seems that 9150bf52d6 of https://github.com/etcd-io/etcd/pull/10640 broke import paths of proto files. Because of this scripts/genproto.sh causes errors on the latest master branch. This commit fixes the broken paths. --- Documentation/dev-guide/api_concurrency_reference_v3.md | 4 +--- Documentation/dev-guide/api_reference_v3.md | 4 +--- etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go | 2 +- etcdserver/api/v3election/v3electionpb/v3election.pb.go | 4 ++-- etcdserver/api/v3election/v3electionpb/v3election.proto | 4 ++-- etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.pb.go | 2 +- etcdserver/api/v3lock/v3lockpb/v3lock.proto | 2 +- etcdserver/etcdserverpb/gw/rpc.pb.gw.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 4 ++-- etcdserver/etcdserverpb/rpc.proto | 4 ++-- lease/leasepb/lease.pb.go | 2 +- lease/leasepb/lease.proto | 2 +- 13 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Documentation/dev-guide/api_concurrency_reference_v3.md b/Documentation/dev-guide/api_concurrency_reference_v3.md index 01059c7c1d8..a5ae7624c24 100644 --- a/Documentation/dev-guide/api_concurrency_reference_v3.md +++ b/Documentation/dev-guide/api_concurrency_reference_v3.md @@ -1,6 +1,4 @@ ---- -title: etcd concurrency API Reference ---- +### etcd concurrency API Reference This is a generated documentation. Please read the proto files for more. diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index e88906b0edc..207800f06ae 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -1,6 +1,4 @@ ---- -title: etcd API Reference ---- +### etcd API Reference This is a generated documentation. Please read the proto files for more. diff --git a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go index b66a1cfbf70..23551b54b60 100644 --- a/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go +++ b/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/api/v3election/v3electionpb" + "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "io" "net/http" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.pb.go b/etcdserver/api/v3election/v3electionpb/v3election.pb.go index 05e62fc5008..1fc1bce442f 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/etcdserver/etcdserverpb" - mvccpb "go.etcd.io/etcd/v3/mvcc/mvccpb" + mvccpb "go.etcd.io/etcd/mvcc/mvccpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3election/v3electionpb/v3election.proto b/etcdserver/api/v3election/v3electionpb/v3election.proto index 3f87db4eeaf..918f39fa853 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/v3/etcdserver/etcdserverpb/rpc.proto"; -import "etcd/v3/mvcc/mvccpb/kv.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/mvcc/mvccpb/kv.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go index 09405e1cd3f..1eeeff1853f 100644 --- a/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go +++ b/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go @@ -9,7 +9,7 @@ It translates gRPC into RESTful JSON APIs. package gw import ( - "go.etcd.io/etcd/v3/etcdserver/api/v3lock/v3lockpb" + "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" "io" "net/http" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go b/etcdserver/api/v3lock/v3lockpb/v3lock.pb.go index ad139c1c8aa..36ebdd90f4a 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/etcdserver/etcdserverpb" context "golang.org/x/net/context" diff --git a/etcdserver/api/v3lock/v3lockpb/v3lock.proto b/etcdserver/api/v3lock/v3lockpb/v3lock.proto index 14a79ddbf24..7220c7f0a19 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/v3/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go index a6a4768b25f..904c32187fb 100644 --- a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go +++ b/etcdserver/etcdserverpb/gw/rpc.pb.gw.go @@ -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/etcdserver/etcdserverpb" "io" "net/http" diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 9f6fac9e5ad..6d728a59c81 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/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/mvcc/mvccpb" - authpb "go.etcd.io/etcd/v3/auth/authpb" + authpb "go.etcd.io/etcd/auth/authpb" context "golang.org/x/net/context" diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 78ecd48ade5..6fbf08d3cb1 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package etcdserverpb; import "gogoproto/gogo.proto"; -import "etcd/v3/mvcc/mvccpb/kv.proto"; -import "etcd/v3/auth/authpb/auth.proto"; +import "etcd/mvcc/mvccpb/kv.proto"; +import "etcd/auth/authpb/auth.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index 5253d1f0d0d..16637ee7e95 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/etcdserver/etcdserverpb" io "io" ) diff --git a/lease/leasepb/lease.proto b/lease/leasepb/lease.proto index 698a88eb860..1169d9f10a9 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/v3/etcdserver/etcdserverpb/rpc.proto"; +import "etcd/etcdserver/etcdserverpb/rpc.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.sizer_all) = true;