From a011b2c4c40c26cab0a21b7e6ea8957364798ca5 Mon Sep 17 00:00:00 2001 From: Sam Batschelet Date: Tue, 22 Jan 2019 16:55:01 +0000 Subject: [PATCH 1/2] scripts: disable go mod and bump protoc to 3.6.1 Signed-off-by: Sam Batschelet --- scripts/genproto.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 1f4e732a5..3ec9c77c2 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -10,14 +10,17 @@ if ! [[ "$0" =~ scripts/genproto.sh ]]; then exit 255 fi -if [[ $(protoc --version | cut -f2 -d' ') != "3.6.0" ]]; then - echo "could not find protoc 3.6.0, is it installed + in PATH?" +if [[ $(protoc --version | cut -f2 -d' ') != "3.6.1" ]]; then + echo "could not find protoc 3.6.1, 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" +# disable go mod +export GO111MODULE=off + # exact version of packages to build GOGO_PROTO_SHA="1adfc126b41513cc696b209667c8656ea7aac67c" GRPC_GATEWAY_SHA="92583770e3f01b09a0d3e9bdf64321d8bebd48f2" From cbdb36295ee5be737906027ba799f7bd05b44fc8 Mon Sep 17 00:00:00 2001 From: Sam Batschelet Date: Tue, 22 Jan 2019 16:57:07 +0000 Subject: [PATCH 2/2] Documentation: regenerate proto Signed-off-by: Sam Batschelet --- .../apispec/swagger/rpc.swagger.json | 84 +++++++++---------- .../apispec/swagger/v3election.swagger.json | 10 +-- .../apispec/swagger/v3lock.swagger.json | 4 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index 12bf376f0..a76c9d3a8 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -34,7 +34,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthenticateResponse" } @@ -61,7 +61,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthDisableResponse" } @@ -88,7 +88,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthEnableResponse" } @@ -115,7 +115,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleAddResponse" } @@ -142,7 +142,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleDeleteResponse" } @@ -169,7 +169,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleGetResponse" } @@ -196,7 +196,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleGrantPermissionResponse" } @@ -223,7 +223,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleListResponse" } @@ -250,7 +250,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthRoleRevokePermissionResponse" } @@ -277,7 +277,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserAddResponse" } @@ -304,7 +304,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserChangePasswordResponse" } @@ -331,7 +331,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserDeleteResponse" } @@ -358,7 +358,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserGetResponse" } @@ -385,7 +385,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserGrantRoleResponse" } @@ -412,7 +412,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserListResponse" } @@ -439,7 +439,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAuthUserRevokeRoleResponse" } @@ -466,7 +466,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbMemberAddResponse" } @@ -493,7 +493,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbMemberListResponse" } @@ -520,7 +520,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbMemberRemoveResponse" } @@ -547,7 +547,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbMemberUpdateResponse" } @@ -574,7 +574,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbCompactionResponse" } @@ -601,7 +601,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbDeleteRangeResponse" } @@ -628,7 +628,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseLeasesResponse" } @@ -655,7 +655,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseRevokeResponse" } @@ -682,7 +682,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseTimeToLiveResponse" } @@ -709,7 +709,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbPutResponse" } @@ -736,7 +736,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbRangeResponse" } @@ -763,7 +763,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbTxnResponse" } @@ -790,7 +790,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseGrantResponse" } @@ -807,7 +807,7 @@ "operationId": "LeaseKeepAlive", "parameters": [ { - "description": "(streaming inputs)", + "description": " (streaming inputs)", "name": "body", "in": "body", "required": true, @@ -818,7 +818,7 @@ ], "responses": { "200": { - "description": "(streaming responses)", + "description": "A successful response.(streaming responses)", "schema": { "$ref": "#/definitions/etcdserverpbLeaseKeepAliveResponse" } @@ -845,7 +845,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseLeasesResponse" } @@ -872,7 +872,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseRevokeResponse" } @@ -899,7 +899,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbLeaseTimeToLiveResponse" } @@ -926,7 +926,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbAlarmResponse" } @@ -953,7 +953,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbDefragmentResponse" } @@ -980,7 +980,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbHashKVResponse" } @@ -1007,7 +1007,7 @@ ], "responses": { "200": { - "description": "(streaming responses)", + "description": "A successful response.(streaming responses)", "schema": { "$ref": "#/definitions/etcdserverpbSnapshotResponse" } @@ -1034,7 +1034,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbStatusResponse" } @@ -1061,7 +1061,7 @@ ], "responses": { "200": { - "description": "(empty)", + "description": "A successful response.", "schema": { "$ref": "#/definitions/etcdserverpbMoveLeaderResponse" } @@ -1078,7 +1078,7 @@ "operationId": "Watch", "parameters": [ { - "description": "(streaming inputs)", + "description": " (streaming inputs)", "name": "body", "in": "body", "required": true, @@ -1089,7 +1089,7 @@ ], "responses": { "200": { - "description": "(streaming responses)", + "description": "A successful response.(streaming responses)", "schema": { "$ref": "#/definitions/etcdserverpbWatchResponse" } diff --git a/Documentation/dev-guide/apispec/swagger/v3election.swagger.json b/Documentation/dev-guide/apispec/swagger/v3election.swagger.json index 1ba015eb6..b0d33ad08 100644 --- a/Documentation/dev-guide/apispec/swagger/v3election.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/v3election.swagger.json @@ -21,7 +21,7 @@ "operationId": "Campaign", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3electionpbCampaignResponse" } @@ -48,7 +48,7 @@ "operationId": "Leader", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3electionpbLeaderResponse" } @@ -75,7 +75,7 @@ "operationId": "Observe", "responses": { "200": { - "description": "(streaming responses)", + "description": "A successful response.(streaming responses)", "schema": { "$ref": "#/definitions/v3electionpbLeaderResponse" } @@ -102,7 +102,7 @@ "operationId": "Proclaim", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3electionpbProclaimResponse" } @@ -129,7 +129,7 @@ "operationId": "Resign", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3electionpbResignResponse" } diff --git a/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json b/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json index 79212db0c..45a826150 100644 --- a/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/v3lock.swagger.json @@ -21,7 +21,7 @@ "operationId": "Lock", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3lockpbLockResponse" } @@ -48,7 +48,7 @@ "operationId": "Unlock", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v3lockpbUnlockResponse" }