diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a66c8cdd..d0826e486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fixed Mutual TLS between APIcast and the Backend API fails when using a Forward Proxy [PR #1499](https://github.com/3scale/APIcast/pull/1499) [THREESCALE-5105](https://issues.redhat.com/browse/THREESCALE-5105) - Fixed dns cache miss [PR #1500](https://github.com/3scale/APIcast/pull/1500) [THEESCALE-9301](https://issues.redhat.com/browse/THREESCALE-9301) - Fixed APIcast panic when parsing invalid base64 encoded value [PR #1505](https://github.com/3scale/APIcast/pull/1505) [THEESCALE-11435](https://issues.redhat.com/browse/THREESCALE-11435) +- Remove "$id" from the policy schema [PR #1525](https://github.com/3scale/APIcast/pull/1525) [THEESCALE-11610](https://issues.redhat.com/browse/THREESCALE-11610) ### Added diff --git a/gateway/src/apicast/policy/conditional/apicast-policy.json b/gateway/src/apicast/policy/conditional/apicast-policy.json index 787978609..b75cec4e8 100644 --- a/gateway/src/apicast/policy/conditional/apicast-policy.json +++ b/gateway/src/apicast/policy/conditional/apicast-policy.json @@ -12,7 +12,6 @@ "definitions": { "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "left": { "type": "string" @@ -58,7 +57,6 @@ "required": ["left", "op", "right"] }, "condition": { - "$id": "#/definitions/condition", "type": "object", "description": "Condition to be evaluated", "properties": { diff --git a/gateway/src/apicast/policy/content_caching/apicast-policy.json b/gateway/src/apicast/policy/content_caching/apicast-policy.json index dc9ea80a4..a5c4d7346 100644 --- a/gateway/src/apicast/policy/content_caching/apicast-policy.json +++ b/gateway/src/apicast/policy/content_caching/apicast-policy.json @@ -11,7 +11,6 @@ "definitions": { "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "left": { "type": "string" @@ -75,7 +74,6 @@ }, "rule": { "type": "object", - "$id": "#/definitions/rule", "title": "Rule", "required": [ "cache" diff --git a/gateway/src/apicast/policy/custom_metrics/apicast-policy.json b/gateway/src/apicast/policy/custom_metrics/apicast-policy.json index 85f8fcbbc..ec6b71632 100644 --- a/gateway/src/apicast/policy/custom_metrics/apicast-policy.json +++ b/gateway/src/apicast/policy/custom_metrics/apicast-policy.json @@ -21,7 +21,6 @@ "definitions": { "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "left": { "type": "string" diff --git a/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json b/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json index 6cfdc7ce3..515264619 100644 --- a/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json +++ b/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json @@ -11,7 +11,6 @@ "configuration": { "definitions": { "value_type": { - "$id": "#/definitions/value_type", "type": "string", "oneOf": [{ "enum": ["plain"], diff --git a/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json b/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json index 592159b22..0638e031f 100644 --- a/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json +++ b/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json @@ -11,7 +11,6 @@ "type": "object", "definitions": { "value_type": { - "$id": "#/definitions/value_type", "type": "string", "oneOf": [{ "enum": ["plain"], diff --git a/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json b/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json index 305180a49..d85c586ca 100644 --- a/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json +++ b/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json @@ -12,7 +12,6 @@ "definitions": { "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "left": { "type": "string" diff --git a/gateway/src/apicast/policy/rate_limit/apicast-policy.json b/gateway/src/apicast/policy/rate_limit/apicast-policy.json index 0868b4d37..43de00e61 100644 --- a/gateway/src/apicast/policy/rate_limit/apicast-policy.json +++ b/gateway/src/apicast/policy/rate_limit/apicast-policy.json @@ -8,7 +8,6 @@ "type": "object", "definitions": { "key": { - "$id": "#/definitions/key", "description": "The key corresponding to the limiter object", "type": "object", "properties": { @@ -43,7 +42,6 @@ } }, "error_handling": { - "$id": "#/definitions/error_handling", "type": "string", "description": "How to handle an error", "default": "exit", @@ -57,7 +55,6 @@ }, "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "left": { "type": "string" diff --git a/gateway/src/apicast/policy/routing/apicast-policy.json b/gateway/src/apicast/policy/routing/apicast-policy.json index 080af882d..7df1bb066 100644 --- a/gateway/src/apicast/policy/routing/apicast-policy.json +++ b/gateway/src/apicast/policy/routing/apicast-policy.json @@ -23,7 +23,6 @@ "definitions": { "operation": { "type": "object", - "$id": "#/definitions/operation", "properties": { "match": { "type": "string", diff --git a/gateway/src/apicast/policy/tls_validation/apicast-policy.json b/gateway/src/apicast/policy/tls_validation/apicast-policy.json index 7705ec752..d742a5488 100644 --- a/gateway/src/apicast/policy/tls_validation/apicast-policy.json +++ b/gateway/src/apicast/policy/tls_validation/apicast-policy.json @@ -10,7 +10,6 @@ "type": "object", "definitions": { "certificate": { - "$id": "#/definitions/certificate", "type": "object", "properties": { "pem_certificate": { @@ -21,7 +20,6 @@ } }, "store": { - "$id": "#/definitions/store", "type": "array", "items": { "$ref": "#/definitions/certificate" diff --git a/gateway/src/apicast/policy/url_rewriting/apicast-policy.json b/gateway/src/apicast/policy/url_rewriting/apicast-policy.json index e370d2e4c..de3a9beab 100644 --- a/gateway/src/apicast/policy/url_rewriting/apicast-policy.json +++ b/gateway/src/apicast/policy/url_rewriting/apicast-policy.json @@ -17,7 +17,6 @@ "definitions": { "methods": { "description": "Array of HTTP methods this rule must be applied to. If left blank it will be applied to all HTTP methods", - "$id": "#/definitions/methods", "type": "array", "items": { "type": "string",