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

*: use protoc 3.2.0 

Fixes #7631
release-3.2
Anthony Romano 2017-03-30 13:38:09 -07:00
parent a0c97282c3
commit 1ff0b71b30
3 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
Documentation/dev-guide/apispec/swagger/rpc.swagger.json
View File

@ -1028,7 +1028,7 @@
"NODELETE" "NODELETE"
], ],
"default": "NOPUT", "default": "NOPUT",
"description": "- NOPUT: filter out put event.\n - NODELETE: filter out delete event." "description": " - NOPUT: filter out put event.\n - NODELETE: filter out delete event."
}, },
"authpbPermission": { "authpbPermission": {
"type": "object", "type": "object",
@ -1138,7 +1138,6 @@
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"format": "string",
"description": "name is the name of the role to add to the authentication system." "description": "name is the name of the role to add to the authentication system."
} }
} }
@ -1155,8 +1154,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"role": { "role": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1172,8 +1170,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"role": { "role": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1196,7 +1193,6 @@
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"format": "string",
"description": "name is the name of the role which will be granted the permission." "description": "name is the name of the role which will be granted the permission."
}, },
"perm": { "perm": {
@ -1225,8 +1221,7 @@
"roles": { "roles": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
} }
} }
} }
@ -1235,16 +1230,13 @@
"type": "object", "type": "object",
"properties": { "properties": {
"role": { "role": {
"type": "string", "type": "string"
"format": "string"
}, },
"key": { "key": {
"type": "string", "type": "string"
"format": "string"
}, },
"range_end": { "range_end": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1260,12 +1252,10 @@
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string"
"format": "string"
}, },
"password": { "password": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1282,12 +1272,10 @@
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"format": "string",
"description": "name is the name of the user whose password is being changed." "description": "name is the name of the user whose password is being changed."
}, },
"password": { "password": {
"type": "string", "type": "string",
"format": "string",
"description": "password is the new password for the user." "description": "password is the new password for the user."
} }
} }
@ -1305,7 +1293,6 @@
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"format": "string",
"description": "name is the name of the user to delete." "description": "name is the name of the user to delete."
} }
} }
@ -1322,8 +1309,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1336,8 +1322,7 @@
"roles": { "roles": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
} }
} }
} }
@ -1347,12 +1332,10 @@
"properties": { "properties": {
"user": { "user": {
"type": "string", "type": "string",
"format": "string",
"description": "user is the name of the user which should be granted a given role." "description": "user is the name of the user which should be granted a given role."
}, },
"role": { "role": {
"type": "string", "type": "string",
"format": "string",
"description": "role is the name of the role to grant to the user." "description": "role is the name of the role to grant to the user."
} }
} }
@ -1377,8 +1360,7 @@
"users": { "users": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
} }
} }
} }
@ -1387,12 +1369,10 @@
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string"
"format": "string"
}, },
"role": { "role": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1408,12 +1388,10 @@
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string"
"format": "string"
}, },
"password": { "password": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1425,7 +1403,6 @@
}, },
"token": { "token": {
"type": "string", "type": "string",
"format": "string",
"title": "token is an authorized token that can be used in succeeding RPCs" "title": "token is an authorized token that can be used in succeeding RPCs"
} }
} }
@ -1514,12 +1491,12 @@
"range_end": { "range_end": {
"type": "string", "type": "string",
"format": "byte", "format": "byte",
"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\nthe all keys with the prefix (the given key).\nIf range_end is '\\0', the range is all keys greater than or equal to the key argument." "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."
}, },
"prev_kv": { "prev_kv": {
"type": "boolean", "type": "boolean",
"format": "boolean", "format": "boolean",
"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 delte response." "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."
} }
} }
}, },
@ -1591,8 +1568,7 @@
"description": "TTL is the server chosen lease time-to-live in seconds." "description": "TTL is the server chosen lease time-to-live in seconds."
}, },
"error": { "error": {
"type": "string", "type": "string"
"format": "string"
} }
} }
}, },
@ -1698,22 +1674,19 @@
}, },
"name": { "name": {
"type": "string", "type": "string",
"format": "string",
"description": "name is the human-readable name of the member. If the member is not started, the name will be an empty string." "description": "name is the human-readable name of the member. If the member is not started, the name will be an empty string."
}, },
"peerURLs": { "peerURLs": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
}, },
"description": "peerURLs is the list of URLs the member exposes to the cluster for communication." "description": "peerURLs is the list of URLs the member exposes to the cluster for communication."
}, },
"clientURLs": { "clientURLs": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
}, },
"description": "clientURLs is the list of URLs the member exposes to clients for communication. If the member is not started, clientURLs will be empty." "description": "clientURLs is the list of URLs the member exposes to clients for communication. If the member is not started, clientURLs will be empty."
} }
@ -1725,8 +1698,7 @@
"peerURLs": { "peerURLs": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
}, },
"description": "peerURLs is the list of URLs the added member will use to communicate with the cluster." "description": "peerURLs is the list of URLs the added member will use to communicate with the cluster."
} }
@ -1791,8 +1763,7 @@
"peerURLs": { "peerURLs": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string", "type": "string"
"format": "string"
}, },
"description": "peerURLs is the new list of URLs the member will use to communicate with the cluster." "description": "peerURLs is the new list of URLs the member will use to communicate with the cluster."
} }
@ -1869,7 +1840,7 @@
"limit": { "limit": {
"type": "string", "type": "string",
"format": "int64", "format": "int64",
"description": "limit is a limit on the number of keys returned for the request." "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."
}, },
"revision": { "revision": {
"type": "string", "type": "string",
@ -2032,7 +2003,6 @@
}, },
"version": { "version": {
"type": "string", "type": "string",
"format": "string",
"description": "version is the cluster protocol version used by the responding member." "description": "version is the cluster protocol version used by the responding member."
}, },
"dbSize": { "dbSize": {

4
etcdserver/etcdserverpb/rpc.pb.go
View File

@ -357,8 +357,8 @@ type DeleteRangeRequest struct {
Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
// range_end is the key following the last key to delete for the range [key, range_end). // range_end is the key following the last key to delete for the range [key, range_end).
// If range_end is not given, the range is defined to contain only the key argument. // If range_end is not given, the range is defined to contain only the key argument.
// If range_end is one bit larger than the given key, then the range is all // If range_end is one bit larger than the given key, then the range is all the keys
// the all keys with the prefix (the given key). // with the prefix (the given key).
// If range_end is '\0', the range is all keys greater than or equal to the key argument. // If range_end is '\0', the range is all keys greater than or equal to the key argument.
RangeEnd []byte `protobuf:"bytes,2,opt,name=range_end,json=rangeEnd,proto3" json:"range_end,omitempty"` RangeEnd []byte `protobuf:"bytes,2,opt,name=range_end,json=rangeEnd,proto3" json:"range_end,omitempty"`
// If prev_kv is set, etcd gets the previous key-value pairs before deleting it. // If prev_kv is set, etcd gets the previous key-value pairs before deleting it.

4
scripts/genproto.sh
View File

@ -11,8 +11,8 @@ if ! [[ "$0" =~ "scripts/genproto.sh" ]]; then
fi fi
# for now, be conservative about what version of protoc we expect # for now, be conservative about what version of protoc we expect
if ! [[ $(protoc --version) =~ "3.1.0" ]]; then if ! [[ $(protoc --version) =~ "3.2.0" ]]; then
echo "could not find protoc 3.1.0, is it installed + in PATH?" echo "could not find protoc 3.2.0, is it installed + in PATH?"
exit 255 exit 255
fi fi