Skip to content

Initial batch of minor schema fixes #1744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 4, 2018
Merged

Initial batch of minor schema fixes #1744

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1087db4
Use "uri-reference", not "url" or "uriref"
handrews Nov 8, 2018
13a4fd2
Fix usage of "not"
handrews Nov 8, 2018
5529143
Use patternProperties for $ref
handrews Nov 8, 2018
82ef49c
XML namespace must be an absolute URI
handrews Nov 15, 2018
f71d7f8
In Daft 5, schema.enum only SHOULD be unique, not MUST
MikeRalphson Nov 20, 2018
e619259
parameters arrays MUST be unique on name & in, therefore MUST be uniq…
MikeRalphson Nov 20, 2018
e9de80f
tags array MUST be unique by name, therefore MUST be unique across al…
MikeRalphson Nov 20, 2018
99226cf
responses object keys pattern must be anchored
MikeRalphson Nov 20, 2018
6fbc926
responses object map MAY be extended with specification extensions
MikeRalphson Nov 20, 2018
0684d65
Response.headers map missing type:object
MikeRalphson Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 30 additions & 35 deletions schemas/v3.0/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ properties:
type: array
items:
$ref: '#/definitions/Tag'
uniqueItems: true
paths:
$ref: '#/definitions/Paths'
components:
Expand All @@ -35,10 +36,10 @@ definitions:
type: object
required:
- $ref
properties:
$ref:
patternProperties:
'^\$ref$':
type: string
format: uriref
format: uri-reference
Info:
type: object
required:
Expand All @@ -51,7 +52,7 @@ definitions:
type: string
termsOfService:
type: string
format: uriref
format: uri-reference
contact:
$ref: '#/definitions/Contact'
license:
Expand All @@ -70,7 +71,7 @@ definitions:
type: string
url:
type: string
format: uriref
format: uri-reference
email:
type: string
format: email
Expand All @@ -87,7 +88,7 @@ definitions:
type: string
url:
type: string
format: uriref
format: uri-reference
patternProperties:
'^x-': {}
additionalProperties: false
Expand Down Expand Up @@ -252,7 +253,7 @@ definitions:
type: array
items: {}
minItems: 1
uniqueItems: true
uniqueItems: false
type:
type: string
enum:
Expand Down Expand Up @@ -347,7 +348,7 @@ definitions:
type: string
namespace:
type: string
format: url
format: uri
prefix:
type: string
attribute:
Expand All @@ -368,6 +369,7 @@ definitions:
description:
type: string
headers:
type: object
additionalProperties:
oneOf:
- $ref: '#/definitions/Header'
Expand Down Expand Up @@ -440,7 +442,7 @@ definitions:
value: {}
externalValue:
type: string
format: uriref
format: uri-reference
patternProperties:
'^x-': {}
additionalProperties: false
Expand Down Expand Up @@ -600,6 +602,7 @@ definitions:
oneOf:
- $ref: '#/definitions/Parameter'
- $ref: '#/definitions/Reference'
uniqueItems: true
patternProperties:
'^x-': {}
additionalProperties: false
Expand Down Expand Up @@ -627,6 +630,7 @@ definitions:
oneOf:
- $ref: '#/definitions/Parameter'
- $ref: '#/definitions/Reference'
uniqueItems: true
requestBody:
oneOf:
- $ref: '#/definitions/RequestBody'
Expand Down Expand Up @@ -662,18 +666,13 @@ definitions:
- $ref: '#/definitions/Response'
- $ref: '#/definitions/Reference'
patternProperties:
'[1-5](?:\d{2}|XX)':
'^[1-5](?:\d{2}|XX)$':
oneOf:
- $ref: '#/definitions/Response'
- $ref: '#/definitions/Reference'
'^x-': {}
minProperties: 1
additionalProperties: false
not:
type: object
patternProperties:
'^x-': {}
additionalProperties: false


SecurityRequirement:
Expand Down Expand Up @@ -707,7 +706,7 @@ definitions:
type: string
url:
type: string
format: uriref
format: uri-reference
patternProperties:
'^x-': {}
additionalProperties: false
Expand Down Expand Up @@ -1250,20 +1249,16 @@ definitions:
- $ref: '#/definitions/BearerHTTPSecurityScheme'

NonBearerHTTPSecurityScheme:
not:
type: object
properties:
scheme:
type: string
enum:
- bearer
type: object
required:
- scheme
- type
properties:
scheme:
type: string
not:
enum:
- bearer
description:
type: string
type:
Expand Down Expand Up @@ -1326,7 +1321,7 @@ definitions:
- openIdConnect
openIdConnectUrl:
type: string
format: url
format: uri-reference
description:
type: string
patternProperties:
Expand Down Expand Up @@ -1356,10 +1351,10 @@ definitions:
properties:
authorizationUrl:
type: string
format: uriref
format: uri-reference
refreshUrl:
type: string
format: uriref
format: uri-reference
scopes:
type: object
additionalProperties:
Expand All @@ -1375,10 +1370,10 @@ definitions:
properties:
tokenUrl:
type: string
format: uriref
format: uri-reference
refreshUrl:
type: string
format: uriref
format: uri-reference
scopes:
type: object
additionalProperties:
Expand All @@ -1394,10 +1389,10 @@ definitions:
properties:
tokenUrl:
type: string
format: uriref
format: uri-reference
refreshUrl:
type: string
format: uriref
format: uri-reference
scopes:
type: object
additionalProperties:
Expand All @@ -1414,13 +1409,13 @@ definitions:
properties:
authorizationUrl:
type: string
format: uriref
format: uri-reference
tokenUrl:
type: string
format: uriref
format: uri-reference
refreshUrl:
type: string
format: uriref
format: uri-reference
scopes:
type: object
additionalProperties:
Expand All @@ -1439,7 +1434,7 @@ definitions:
properties:
operationRef:
type: string
format: uriref
format: uri-reference
parameters:
type: object
additionalProperties: {}
Expand Down Expand Up @@ -1497,4 +1492,4 @@ definitions:
allowReserved:
type: boolean
default: false
additionalProperties: false
additionalProperties: false