Skip to content

Commit

Permalink
Merge pull request #33 from aerospike/develop
Browse files Browse the repository at this point in the history 
v1.8.0
  • Loading branch information
@reugn
reugn authored May 9, 2021
2 parents ed7a2fc + 9419438 commit 0ebd65f
Show file tree
Hide file tree
Showing 21 changed files with 583 additions and 281 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
buildscript {
ext {
springBootVersion = '2.4.2'
springBootVersion = '2.4.5'
springfoxVersion = '2.9.2'
httpclientVersion = '4.5.12'
aerospikeClientVersion = findProperty('aerospikeClientVersion') ?:'5.0.2'
aerospikeClientVersion = findProperty('aerospikeClientVersion') ?:'5.1.0'
}
if (findProperty("aerospikeUseLocal")) {
print("using Local repo")
Expand Down
175 changes: 135 additions & 40 deletions demos/sample-rest-stockapp/swagger/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"description": "REST Interface for Aerospike Database.",
"version": "1.7.0",
"version": "1.8.0",
"title": "Aerospike REST Client",
"contact": {
"name": "Aerospike, Inc.",
Expand Down Expand Up @@ -420,6 +420,78 @@
"deprecated": false
}
},
"/v1/admin/role/{name}/quota": {
"post": {
"tags": [
"Admin Operations"
],
"summary": "Set maximum reads/writes per second limits for a role.",
"operationId": "setRoleQuotas",
"consumes": [
"application/json",
"application/msgpack"
],
"produces": [
"application/json",
"application/msgpack"
],
"parameters": [
{
"name": "Authorization",
"in": "header",
"description": "Authorization",
"required": false,
"type": "string"
},
{
"name": "name",
"in": "path",
"description": "The name of the role to which quotas will be set.",
"required": true,
"type": "string"
},
{
"in": "body",
"name": "roleQuota",
"description": "roleQuota",
"required": true,
"schema": {
"$ref": "#/definitions/RestClientRoleQuota"
}
}
],
"responses": {
"202": {
"description": "Accepted"
},
"400": {
"description": "Invalid role creation parameters",
"schema": {
"$ref": "#/definitions/RestClientError"
}
},
"403": {
"description": "Not authorized to create roles.",
"schema": {
"$ref": "#/definitions/RestClientError"
}
},
"409": {
"description": "Role already exists.",
"schema": {
"$ref": "#/definitions/RestClientError"
}
},
"500": {
"description": "The REST Client encountered an error processing the request",
"schema": {
"$ref": "#/definitions/RestClientError"
}
}
},
"deprecated": false
}
},
"/v1/admin/user": {
"get": {
"tags": [
Expand Down Expand Up @@ -5394,13 +5466,6 @@
"required": false,
"type": "boolean"
},
{
"name": "failOnClusterChange",
"in": "query",
"description": "Terminate scan if cluster in migration state. Only used for server versions < 4.9.",
"required": false,
"type": "boolean"
},
{
"name": "filterexp",
"in": "query",
Expand Down Expand Up @@ -5529,14 +5594,6 @@
"RANDOM"
]
},
{
"name": "scanPercent",
"in": "query",
"description": "Percent of data to scan. Valid integer range is 1 to 100.\nThis field is supported on server versions < 4.9.\nFor server versions >= 4.9, use maxRecords.",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "sendKey",
"in": "query",
Expand Down Expand Up @@ -5637,13 +5694,6 @@
"required": false,
"type": "boolean"
},
{
"name": "failOnClusterChange",
"in": "query",
"description": "Terminate scan if cluster in migration state. Only used for server versions < 4.9.",
"required": false,
"type": "boolean"
},
{
"name": "filterexp",
"in": "query",
Expand Down Expand Up @@ -5772,14 +5822,6 @@
"RANDOM"
]
},
{
"name": "scanPercent",
"in": "query",
"description": "Percent of data to scan. Valid integer range is 1 to 100.\nThis field is supported on server versions < 4.9.\nFor server versions >= 4.9, use maxRecords.",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "sendKey",
"in": "query",
Expand Down Expand Up @@ -6026,27 +6068,23 @@
}
},
"key": {
"description": "Key to retrieve a record",
"description": "Key to retrieve a record.",
"$ref": "#/definitions/Key"
},
"readAllBins": {
"type": "boolean",
"description": "Whether all bins should be returned with this record"
"description": "Whether all bins should be returned with this record."
}
},
"title": "BatchReadRequest"
},
"Key": {
"type": "object",
"required": [
"namespace"
"namespace",
"userKey"
],
"properties": {
"digest": {
"type": "string",
"example": "AAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"description": "URL safe base64 encoded key digest. Returned by the server on batch responses. May be provided by client."
},
"keytype": {
"type": "string",
"example": "STRING",
Expand Down Expand Up @@ -6398,20 +6436,59 @@
},
"RestClientRole": {
"type": "object",
"required": [
"name",
"privileges"
],
"properties": {
"name": {
"type": "string",
"example": "customRole"
"example": "customRole",
"description": "Role name."
},
"privileges": {
"type": "array",
"description": "List of assigned privileges.",
"items": {
"$ref": "#/definitions/Privilege"
}
},
"readQuota": {
"type": "integer",
"format": "int32",
"description": "Maximum reads per second limit."
},
"whitelist": {
"type": "array",
"description": "List of allowable IP addresses.",
"items": {
"type": "string"
}
},
"writeQuota": {
"type": "integer",
"format": "int32",
"description": "Maximum writes per second limit."
}
},
"title": "RestClientRole"
},
"RestClientRoleQuota": {
"type": "object",
"properties": {
"readQuota": {
"type": "integer",
"format": "int32",
"description": "Maximum reads per second limit."
},
"writeQuota": {
"type": "integer",
"format": "int32",
"description": "Maximum writes per second limit."
}
},
"title": "RestClientRoleQuota"
},
"RestClientScanResponse": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6465,14 +6542,32 @@
"User": {
"type": "object",
"properties": {
"connsInUse": {
"type": "integer",
"format": "int32"
},
"name": {
"type": "string"
},
"readInfo": {
"type": "array",
"items": {
"type": "integer",
"format": "int32"
}
},
"roles": {
"type": "array",
"items": {
"type": "string"
}
},
"writeInfo": {
"type": "array",
"items": {
"type": "integer",
"format": "int32"
}
}
},
"title": "User"
Expand Down
Loading

0 comments on commit 0ebd65f

Please sign in to comment.