This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 5348579 chore: sync JSON Schema from APISIX version 2.3 (#1445)
5348579 is described below
commit 5348579f0c5e1de2e0e664dfb6984ab35ca02329
Author: nic-chen <[email protected]>
AuthorDate: Sun Feb 7 14:44:20 2021 +0800
chore: sync JSON Schema from APISIX version 2.3 (#1445)
Co-authored-by: litesun <[email protected]>
---
api/conf/schema.json | 162 +++++++++++++++++++++++--------
web/cypress/fixtures/plugin-dataset.json | 71 +++++++++++---
2 files changed, 183 insertions(+), 50 deletions(-)
diff --git a/api/conf/schema.json b/api/conf/schema.json
index 7e1befd..345e9a0 100644
--- a/api/conf/schema.json
+++ b/api/conf/schema.json
@@ -29,7 +29,7 @@
"description": "value
of label",
"maxLength": 64,
"minLength": 1,
- "pattern":
"^[a-zA-Z0-9-_.]+$",
+ "pattern": "^\\S+$",
"type": "string"
}
},
@@ -219,7 +219,7 @@
"description": "value
of label",
"maxLength": 64,
"minLength": 1,
- "pattern":
"^[a-zA-Z0-9-_.]+$",
+ "pattern": "^\\S+$",
"type": "string"
}
},
@@ -569,7 +569,7 @@
"description": "value of label",
"maxLength": 64,
"minLength": 1,
-
"pattern": "^[a-zA-Z0-9-_.]+$",
+
"pattern": "^\\S+$",
"type":
"string"
}
},
@@ -628,6 +628,10 @@
"minimum": 0,
"type": "integer"
},
+ "scheme": {
+ "default": "http",
+ "enum": ["grpc",
"grpcs", "http", "https"]
+ },
"service_name": {
"maxLength": 100,
"minLength": 1,
@@ -636,15 +640,15 @@
"timeout": {
"properties": {
"connect": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"read": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"send": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
}
},
@@ -653,7 +657,7 @@
},
"type": {
"description":
"algorithms of load balancing",
- "enum": ["chash",
"ewma", "roundrobin"],
+ "enum": ["chash",
"ewma", "least_conn", "roundrobin"],
"type": "string"
},
"update_time": {
@@ -736,7 +740,7 @@
"description": "value
of label",
"maxLength": 64,
"minLength": 1,
- "pattern":
"^[a-zA-Z0-9-_.]+$",
+ "pattern": "^\\S+$",
"type": "string"
}
},
@@ -995,7 +999,7 @@
"description": "value of label",
"maxLength": 64,
"minLength": 1,
-
"pattern": "^[a-zA-Z0-9-_.]+$",
+
"pattern": "^\\S+$",
"type":
"string"
}
},
@@ -1054,6 +1058,10 @@
"minimum": 0,
"type": "integer"
},
+ "scheme": {
+ "default": "http",
+ "enum": ["grpc",
"grpcs", "http", "https"]
+ },
"service_name": {
"maxLength": 100,
"minLength": 1,
@@ -1062,15 +1070,15 @@
"timeout": {
"properties": {
"connect": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"read": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"send": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
}
},
@@ -1079,7 +1087,7 @@
},
"type": {
"description":
"algorithms of load balancing",
- "enum": ["chash",
"ewma", "roundrobin"],
+ "enum": ["chash",
"ewma", "least_conn", "roundrobin"],
"type": "string"
},
"update_time": {
@@ -1166,7 +1174,7 @@
"description": "value
of label",
"maxLength": 64,
"minLength": 1,
- "pattern":
"^[a-zA-Z0-9-_.]+$",
+ "pattern": "^\\S+$",
"type": "string"
}
},
@@ -1501,7 +1509,7 @@
"description": "value of label",
"maxLength": 64,
"minLength": 1,
-
"pattern": "^[a-zA-Z0-9-_.]+$",
+
"pattern": "^\\S+$",
"type":
"string"
}
},
@@ -1560,6 +1568,10 @@
"minimum": 0,
"type": "integer"
},
+ "scheme": {
+ "default": "http",
+ "enum": ["grpc",
"grpcs", "http", "https"]
+ },
"service_name": {
"maxLength": 100,
"minLength": 1,
@@ -1568,15 +1580,15 @@
"timeout": {
"properties": {
"connect": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"read": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
},
"send": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type":
"number"
}
},
@@ -1585,7 +1597,7 @@
},
"type": {
"description":
"algorithms of load balancing",
- "enum": ["chash",
"ewma", "roundrobin"],
+ "enum": ["chash",
"ewma", "least_conn", "roundrobin"],
"type": "string"
},
"update_time": {
@@ -1849,7 +1861,7 @@
"description": "value
of label",
"maxLength": 64,
"minLength": 1,
- "pattern":
"^[a-zA-Z0-9-_.]+$",
+ "pattern": "^\\S+$",
"type": "string"
}
},
@@ -1908,6 +1920,10 @@
"minimum": 0,
"type": "integer"
},
+ "scheme": {
+ "default": "http",
+ "enum": ["grpc", "grpcs", "http",
"https"]
+ },
"service_name": {
"maxLength": 100,
"minLength": 1,
@@ -1916,15 +1932,15 @@
"timeout": {
"properties": {
"connect": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "number"
},
"read": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "number"
},
"send": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "number"
}
},
@@ -1933,7 +1949,7 @@
},
"type": {
"description": "algorithms of load
balancing",
- "enum": ["chash", "ewma", "roundrobin"],
+ "enum": ["chash", "ewma", "least_conn",
"roundrobin"],
"type": "string"
},
"update_time": {
@@ -2034,13 +2050,56 @@
"priority": 2000,
"schema": {
"$comment": "this is a mark for our injected
plugin schema",
- "anyOf": [{
- "required": ["discovery"]
+ "allOf": [{
+ "anyOf": [{
+ "required": ["discovery"]
+ }, {
+ "required": ["token_endpoint"]
+ }]
}, {
- "required": ["token_endpoint"]
+ "anyOf": [{
+ "required": ["client_id"]
+ }, {
+ "required": ["audience"]
+ }]
+ }, {
+ "anyOf": [{
+ "properties": {
+ "lazy_load_paths": {
+ "enum": [false]
+ }
+ }
+ }, {
+ "anyOf": [{
+ "required":
["discovery"]
+ }, {
+ "required":
["resource_registration_endpoint"]
+ }],
+ "properties": {
+ "lazy_load_paths": {
+ "enum": [true]
+ }
+ }
+ }]
}],
"properties": {
"audience": {
+ "description": "Deprecated, use
`client_id` instead.",
+ "maxLength": 100,
+ "minLength": 1,
+ "type": "string"
+ },
+ "cache_ttl_seconds": {
+ "default": 86400,
+ "minimum": 1,
+ "type": "integer"
+ },
+ "client_id": {
+ "maxLength": 100,
+ "minLength": 1,
+ "type": "string"
+ },
+ "client_secret": {
"maxLength": 100,
"minLength": 1,
"type": "string"
@@ -2060,6 +2119,10 @@
"minLength": 1,
"type": "string"
},
+ "http_method_as_scope": {
+ "default": false,
+ "type": "boolean"
+ },
"keepalive": {
"default": true,
"type": "boolean"
@@ -2074,6 +2137,10 @@
"minimum": 1000,
"type": "integer"
},
+ "lazy_load_paths": {
+ "default": false,
+ "type": "boolean"
+ },
"permissions": {
"items": {
"maxLength": 100,
@@ -2088,6 +2155,11 @@
"enum": ["ENFORCING",
"PERMISSIVE"],
"type": "string"
},
+ "resource_registration_endpoint": {
+ "maxLength": 4096,
+ "minLength": 1,
+ "type": "string"
+ },
"ssl_verify": {
"default": true,
"type": "boolean"
@@ -2327,6 +2399,10 @@
"maximum": 100,
"minimum": 0,
"type":
"integer"
+ },
+ "vars": {
+ "maxItems": 20,
+ "type": "array"
}
},
"required": ["http_status"],
@@ -2342,6 +2418,10 @@
"maximum": 100,
"minimum": 0,
"type":
"integer"
+ },
+ "vars": {
+ "maxItems": 20,
+ "type": "array"
}
},
"required": ["duration"],
@@ -2381,7 +2461,7 @@
"type": "string"
}, {
"description":
"int64 as result",
- "enum":
["enum_as_value", "ienum_as_name"],
+ "enum":
["enum_as_name", "enum_as_value"],
"type": "string"
}, {
"description":
"default values option",
@@ -2813,6 +2893,7 @@
},
"rejected_code": {
"default": 503,
+ "maximum": 599,
"minimum": 200,
"type": "integer"
}
@@ -2889,7 +2970,7 @@
},
"properties": {
"count": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "integer"
},
"disable": {
@@ -2907,12 +2988,12 @@
},
"rejected_code": {
"default": 503,
- "maximum": 600,
+ "maximum": 599,
"minimum": 200,
"type": "integer"
},
"time_window": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "integer"
}
},
@@ -2938,11 +3019,12 @@
"type": "string"
},
"rate": {
- "minimum": 0,
+ "exclusiveMinimum": 0,
"type": "number"
},
"rejected_code": {
"default": 503,
+ "maximum": 599,
"minimum": 200,
"type": "integer"
}
@@ -3191,7 +3273,7 @@
},
"host": {
"description": "new host for
upstream",
- "pattern": "^[0-9a-zA-Z-.]+$",
+ "pattern":
"^[0-9a-zA-Z-.]+(:\\d{1,5})?$",
"type": "string"
},
"regex_uri": {
@@ -3953,7 +4035,7 @@
"description": "value of label",
"maxLength": 64,
"minLength": 1,
-
"pattern": "^[a-zA-Z0-9-_.]+$",
+
"pattern": "^\\S+$",
"type": "string"
}
},
@@ -4012,6 +4094,10 @@
"minimum": 0,
"type": "integer"
},
+
"scheme": {
+
"default": "http",
+
"enum": ["grpc", "grpcs", "http", "https"]
+
},
"service_name": {
"maxLength": 100,
"minLength": 1,
@@ -4020,15 +4106,15 @@
"timeout": {
"properties": {
"connect": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type": "number"
},
"read": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type": "number"
},
"send": {
-
"minimum": 0,
+
"exclusiveMinimum": 0,
"type": "number"
}
},
@@ -4037,7 +4123,7 @@
},
"type": {
"description": "algorithms of load balancing",
-
"enum": ["chash", "ewma", "roundrobin"],
+
"enum": ["chash", "ewma", "least_conn",
"roundrobin"],
"type": "string"
},
"update_time": {
diff --git a/web/cypress/fixtures/plugin-dataset.json
b/web/cypress/fixtures/plugin-dataset.json
index 7f1ada3..5730d82 100644
--- a/web/cypress/fixtures/plugin-dataset.json
+++ b/web/cypress/fixtures/plugin-dataset.json
@@ -192,34 +192,81 @@
{
"shouldValid": true,
"data": {
- "token_endpoint":
"https://efactory-security-portal.salzburgresearch.at/";,
- "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket"
+ "client_id" : "foo",
+ "token_endpoint" :
"https://host.domain/auth/realms/foo/protocol/openid-connect/token";
}
},
{
"shouldValid": true,
"data": {
- "token_endpoint":
"https://efactory-security-portal.salzburgresearch.at/";,
+ "client_id": "foo",
+ "discovery":
"https://host.domain/auth/realms/foo/.well-known/uma2-configuration";
+ }
+ },
+ {
+ "shouldValid": true,
+ "data": {
+ "audience": "foo",
+ "discovery":
"https://host.domain/auth/realms/foo/.well-known/uma2-configuration";
+ }
+ },
+ {
+ "shouldValid": true,
+ "data": {
+ "client_id": "foo",
+ "lazy_load_paths": true,
+ "token_endpoint":
"https://host.domain/auth/realms/foo/protocol/openid-connect/token";,
+ "resource_registration_endpoint":
"https://host.domain/auth/realms/foo/authz/protection/resource_set";
+ }
+ },
+ {
+ "shouldValid": true,
+ "data": {
+ "client_id": "foo",
+ "lazy_load_paths": true,
+ "discovery":
"https://host.domain/auth/realms/foo/.well-known/uma2-configuration";
+ }
+ },
+ {
+ "shouldValid": true,
+ "data": {
+ "discovery":
"https://host.domain/auth/realms/foo/.well-known/uma2-configuration";,
+ "token_endpoint":
"https://host.domain/auth/realms/foo/protocol/openid-connect/token";,
+ "resource_registration_endpoint":
"https://host.domain/auth/realms/foo/authz/protection/resource_set";,
+ "client_id": "University",
+ "audience": "University",
+ "client_secret": "secret",
+ "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket",
+ "policy_enforcement_mode": "ENFORCING",
"permissions": ["res:customer#scopes:view"],
+ "lazy_load_paths": false,
+ "http_method_as_scope": false,
"timeout": 1000,
- "audience": "University",
- "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket"
+ "ssl_verify": false,
+ "cache_ttl_seconds": 1000,
+ "keepalive": true,
+ "keepalive_timeout": 10000,
+ "keepalive_pool": 5
}
},
{
"shouldValid": false,
"data": {
- "permissions": ["res:customer#scopes:view"]
+ "client_id": "foo"
}
},
{
- "shouldValid": true,
+ "shouldValid": false,
"data": {
- "token_endpoint":
"http://127.0.0.1:8090/auth/realms/University/protocol/openid-connect/token";,
- "permissions": ["course_resource#view"],
- "audience": "course_management",
- "grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket",
- "timeout": 3000
+ "discovery":
"https://host.domain/auth/realms/foo/.well-known/uma2-configuration";
+ }
+ },
+ {
+ "shouldValid": false,
+ "data": {
+ "client_id": "foo",
+ "token_endpoint":
"https://host.domain/auth/realms/foo/protocol/openid-connect/token";,
+ "lazy_load_paths": true
}
}
],
