vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refresh proto generation script after moving modules files. 

With modulatiozation server protos get moved into ./server directory,
but it was not reflected in scripts/genproto.sh.
release-3.5
Piotr Tabor 2021-01-07 17:07:06 +01:00
parent a4570a60e7
commit 23340bb62a
7 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Documentation/dev-guide/api_concurrency_reference_v3.md
View File

@ -4,7 +4,7 @@
This is a generated documentation. Please read the proto files for more.
##### service `Lock` (etcdserver/api/v3lock/v3lockpb/v3lock.proto)
##### service `Lock` (server/etcdserver/api/v3lock/v3lockpb/v3lock.proto)
The lock service exposes client-side locking facilities as a gRPC interface.
@ -15,7 +15,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
##### message `LockRequest` (etcdserver/api/v3lock/v3lockpb/v3lock.proto)
##### message `LockRequest` (server/etcdserver/api/v3lock/v3lockpb/v3lock.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -24,7 +24,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
##### message `LockResponse` (etcdserver/api/v3lock/v3lockpb/v3lock.proto)
##### message `LockResponse` (server/etcdserver/api/v3lock/v3lockpb/v3lock.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -33,7 +33,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
##### message `UnlockRequest` (etcdserver/api/v3lock/v3lockpb/v3lock.proto)
##### message `UnlockRequest` (server/etcdserver/api/v3lock/v3lockpb/v3lock.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -41,7 +41,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
##### message `UnlockResponse` (etcdserver/api/v3lock/v3lockpb/v3lock.proto)
##### message `UnlockResponse` (server/etcdserver/api/v3lock/v3lockpb/v3lock.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -49,7 +49,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
##### service `Election` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### service `Election` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
The election service exposes client-side election facilities as a gRPC interface.
@ -63,7 +63,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `CampaignRequest` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `CampaignRequest` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -73,7 +73,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `CampaignResponse` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `CampaignResponse` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -82,7 +82,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `LeaderKey` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `LeaderKey` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -93,7 +93,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `LeaderRequest` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `LeaderRequest` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -101,7 +101,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `LeaderResponse` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `LeaderResponse` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -110,7 +110,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `ProclaimRequest` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `ProclaimRequest` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -119,7 +119,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `ProclaimResponse` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `ProclaimResponse` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -127,7 +127,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `ResignRequest` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `ResignRequest` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -135,7 +135,7 @@ The election service exposes client-side election facilities as a gRPC interface
##### message `ResignResponse` (etcdserver/api/v3election/v3electionpb/v3election.proto)
##### message `ResignResponse` (server/etcdserver/api/v3election/v3electionpb/v3election.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |

6
Documentation/dev-guide/api_reference_v3.md
View File

@ -984,7 +984,7 @@ Empty field.
##### message `Lease` (lease/leasepb/lease.proto)
##### message `Lease` (server/lease/leasepb/lease.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -994,7 +994,7 @@ Empty field.
##### message `LeaseInternalRequest` (lease/leasepb/lease.proto)
##### message `LeaseInternalRequest` (server/lease/leasepb/lease.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |
@ -1002,7 +1002,7 @@ Empty field.
##### message `LeaseInternalResponse` (lease/leasepb/lease.proto)
##### message `LeaseInternalResponse` (server/lease/leasepb/lease.proto)
| Field | Description | Type |
| ----- | ----------- | ---- |

2
Documentation/dev-guide/apispec/swagger/v3election.swagger.json
View File

@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "etcdserver/api/v3election/v3electionpb/v3election.proto",
"title": "server/etcdserver/api/v3election/v3electionpb/v3election.proto",
"version": "version not set"
},
"consumes": [

2
Documentation/dev-guide/apispec/swagger/v3lock.swagger.json
View File

@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "etcdserver/api/v3lock/v3lockpb/v3lock.proto",
"title": "server/etcdserver/api/v3lock/v3lockpb/v3lock.proto",
"version": "version not set"
},
"consumes": [

17
scripts/genproto.sh
View File

@ -30,13 +30,12 @@ echo " - protoc-gen-grpc-gateway: ${GRPC_GATEWAY_BIN}"
echo " - swagger: ${SWAGGER_BIN}"
echo " - gogoproto-root: ${GOGOPROTO_ROOT}"
echo " - grpc-gateway-root: ${GRPC_GATEWAY_ROOT}"
# directories containing protos to be built
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"
GOGOPROTO_PATH="${GOGOPROTO_ROOT}:${GOGOPROTO_ROOT}/protobuf"
log_callout -e "\nRunning gofast proto generation..."
# directories containing protos to be built
DIRS="./server/wal/walpb ./api/etcdserverpb ./server/etcdserver/api/snap/snappb ./raft/raftpb ./api/mvccpb ./server/lease/leasepb ./api/authpb ./server/etcdserver/api/v3lock/v3lockpb ./server/etcdserver/api/v3election/v3electionpb ./api/membershippb"
log_callout -e "\nRunning gofast (gogo) proto generation..."
for dir in ${DIRS}; do
run pushd "${dir}"
@ -51,12 +50,11 @@ for dir in ${DIRS}; do
run popd
done
#return
log_callout -e "\nRunning swagger & grpc_gateway proto generation..."
# 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 api/etcdserverpb/rpc etcdserver/api/v3lock/v3lockpb/v3lock etcdserver/api/v3election/v3electionpb/v3election; do
for pb in api/etcdserverpb/rpc server/etcdserver/api/v3lock/v3lockpb/v3lock server/etcdserver/api/v3election/v3electionpb/v3election; do
log_callout "grpc & swagger for: ${pb}.proto"
run protoc -I. \
-I"${GRPC_GATEWAY_ROOT}"/third_party/googleapis \
@ -77,6 +75,7 @@ for pb in api/etcdserverpb/rpc etcdserver/api/v3lock/v3lockpb/v3lock etcdserver/
sed -i -E "s# (New[a-zA-Z0-9_]*Client\()# ${pkg}.\1#g" "${gwfile}"
sed -i -E "s|go.etcd.io/etcd|go.etcd.io/etcd/v3|g" "${gwfile}"
sed -i -E "s|go.etcd.io/etcd/v3/api|go.etcd.io/etcd/api/v3|g" "${gwfile}"
sed -i -E "s|go.etcd.io/etcd/v3/server|go.etcd.io/etcd/server/v3|g" "${gwfile}"
run go fmt "${gwfile}"
@ -96,14 +95,14 @@ if [ "$1" != "--skip-protodoc" ]; then
log_callout "protodoc is auto-generating grpc API reference documentation..."
run rm -rf Documentation/dev-guide/api_reference_v3.md
run_go_tool go.etcd.io/protodoc --directories="api/etcdserverpb=service_message,api/mvccpb=service_message,lease/leasepb=service_message,api/authpb=service_message" \
run_go_tool go.etcd.io/protodoc --directories="api/etcdserverpb=service_message,api/mvccpb=service_message,server/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="api/etcdserverpb/rpc.proto" \
--disclaimer="This is a generated documentation. Please read the proto files for more." || exit 2
run rm -rf Documentation/dev-guide/api_concurrency_reference_v3.md
run_go_tool go.etcd.io/protodoc --directories="etcdserver/api/v3lock/v3lockpb=service_message,etcdserver/api/v3election/v3electionpb=service_message,api/mvccpb=service_message" \
run_go_tool go.etcd.io/protodoc --directories="server/etcdserver/api/v3lock/v3lockpb=service_message,server/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." || exit 2

2
server/etcdserver/api/v3election/v3electionpb/gw/v3election.pb.gw.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
// source: etcdserver/api/v3election/v3electionpb/v3election.proto
// source: server/etcdserver/api/v3election/v3electionpb/v3election.proto
/*
Package v3electionpb is a reverse proxy.

2
server/etcdserver/api/v3lock/v3lockpb/gw/v3lock.pb.gw.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
// source: etcdserver/api/v3lock/v3lockpb/v3lock.proto
// source: server/etcdserver/api/v3lock/v3lockpb/v3lock.proto
/*
Package v3lockpb is a reverse proxy.