Commit 72935b9d authored by Vitaly Arbuzov's avatar Vitaly Arbuzov
Browse files

Merge branch 'unstable' into dict-split-by-slot

parents 6baf20af 6948daca
...@@ -29,6 +29,63 @@ ...@@ -29,6 +29,63 @@
"name": "username", "name": "username",
"type": "string" "type": "string"
} }
],
"reply_schema": {
"oneOf": [
{
"description": "a set of ACL rule definitions for the user",
"type": "object",
"additionalProperties": false,
"properties": {
"flags": {
"type": "array",
"items": {
"type": "string"
}
},
"passwords": {
"type": "array",
"items": {
"type": "string"
}
},
"commands": {
"description": "root selector's commands",
"type": "string"
},
"keys": {
"description": "root selector's keys",
"type": "string"
},
"channels": {
"description": "root selector's channels",
"type": "string"
},
"selectors": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"commands": {
"type": "string"
},
"keys": {
"type": "string"
},
"channels": {
"type": "string"
}
}
}
}
}
},
{
"description": "If user does not exist",
"type": "null"
}
] ]
} }
}
} }
...@@ -11,6 +11,13 @@ ...@@ -11,6 +11,13 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"type": "array",
"description": "A list of subcommands and their description",
"items": {
"type": "string"
}
}
} }
} }
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"type": "array",
"description": "A list of currently active ACL rules",
"items": {
"type": "string"
}
}
} }
} }
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"const": "OK"
}
} }
} }
...@@ -20,6 +20,54 @@ ...@@ -20,6 +20,54 @@
"STALE", "STALE",
"SENTINEL" "SENTINEL"
], ],
"reply_schema": {
"oneOf": [
{
"description": "In case `RESET` was not given, a list of recent ACL security events.",
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"count": {
"type": "integer"
},
"reason": {
"type": "string"
},
"context": {
"type": "string"
},
"object": {
"type": "string"
},
"username": {
"type": "string"
},
"age-seconds": {
"type": "number"
},
"client-info": {
"type": "string"
},
"entry-id": {
"type": "integer"
},
"timestamp-created": {
"type": "integer"
},
"timestamp-last-updated": {
"type": "integer"
}
}
}
},
{
"const": "OK",
"description": "In case `RESET` was given, OK indicates ACL log was cleared."
}
]
},
"arguments": [ "arguments": [
{ {
"name": "operation", "name": "operation",
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"const": "OK"
}
} }
} }
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
"STALE", "STALE",
"SENTINEL" "SENTINEL"
], ],
"reply_schema": {
"const": "OK"
},
"arguments": [ "arguments": [
{ {
"name": "username", "name": "username",
......
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"type": "array",
"description": "List of existing ACL users",
"items": {
"type": "string"
}
}
} }
} }
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
"LOADING", "LOADING",
"STALE", "STALE",
"SENTINEL" "SENTINEL"
] ],
"reply_schema": {
"type": "string",
"description": "The username of the current connection."
}
} }
} }
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
} }
} }
], ],
"reply_schema": {
"type": "integer",
"description": "The the length of the string after the append operation."
},
"arguments": [ "arguments": [
{ {
"name": "key", "name": "key",
......
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
], ],
"acl_categories": [ "acl_categories": [
"CONNECTION" "CONNECTION"
] ],
"reply_schema": {
"const": "OK"
}
} }
} }
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
"acl_categories": [ "acl_categories": [
"CONNECTION" "CONNECTION"
], ],
"reply_schema": {
"const": "OK"
},
"arguments": [ "arguments": [
{ {
"name": "username", "name": "username",
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
"NO_ASYNC_LOADING", "NO_ASYNC_LOADING",
"ADMIN", "ADMIN",
"NOSCRIPT" "NOSCRIPT"
] ],
"reply_schema": {
"description": "A simple string reply indicating that the rewriting started or is about to start ASAP",
"type": "string"
}
} }
} }
...@@ -25,6 +25,16 @@ ...@@ -25,6 +25,16 @@
"optional": true, "optional": true,
"since": "3.2.2" "since": "3.2.2"
} }
],
"reply_schema": {
"oneOf": [
{
"const": "Background saving started"
},
{
"const": "Background saving scheduled"
}
] ]
} }
}
} }
...@@ -77,6 +77,11 @@ ...@@ -77,6 +77,11 @@
} }
] ]
} }
] ],
"reply_schema": {
"description": "The number of bits set to 1.",
"type": "integer",
"minimum": 0
}
} }
} }
...@@ -139,6 +139,21 @@ ...@@ -139,6 +139,21 @@
} }
] ]
} }
],
"reply_schema": {
"type": "array",
"items": {
"oneOf": [
{
"description": "The result of the subcommand at the same position",
"type": "integer"
},
{
"description": "In case OVERFLOW FAIL was given and overflows or underflows detected",
"type": "null"
}
] ]
} }
}
}
} }
...@@ -57,6 +57,13 @@ ...@@ -57,6 +57,13 @@
} }
] ]
} }
] ],
"reply_schema": {
"type": "array",
"items": {
"description": "The result of the subcommand at the same position",
"type": "integer"
}
}
} }
} }
...@@ -89,6 +89,11 @@ ...@@ -89,6 +89,11 @@
"key_spec_index": 1, "key_spec_index": 1,
"multiple": true "multiple": true
} }
] ],
"reply_schema": {
"description": "the size of the string stored in the destination key, that is equal to the size of the longest input string",
"type": "integer",
"minimum": 0
}
} }
} }
...@@ -88,6 +88,19 @@ ...@@ -88,6 +88,19 @@
} }
] ]
} }
],
"reply_schema": {
"oneOf": [
{
"description": "the position of the first bit set to 1 or 0 according to the request",
"type": "integer",
"minimum": 0
},
{
"description": "In case the `bit` argument is 1 and the string is empty or composed of just zero bytes",
"const": -1
}
] ]
} }
}
} }
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
"command_flags": [ "command_flags": [
"WRITE", "WRITE",
"DENYOOM", "DENYOOM",
"NOSCRIPT",
"BLOCKING" "BLOCKING"
], ],
"acl_categories": [ "acl_categories": [
...@@ -54,6 +53,18 @@ ...@@ -54,6 +53,18 @@
} }
} }
], ],
"reply_schema": {
"oneOf": [
{
"description": "The popped element.",
"type": "string"
},
{
"description": "Operation timed-out",
"type": "null"
}
]
},
"arguments": [ "arguments": [
{ {
"name": "source", "name": "source",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment