diff --git a/src/schemas/validation/dialect.yaml b/src/schemas/validation/dialect.yaml index d300d94feb..1986c9e8f8 100644 --- a/src/schemas/validation/dialect.yaml +++ b/src/schemas/validation/dialect.yaml @@ -1,8 +1,8 @@ -$id: https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS +$id: https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS $schema: https://json-schema.org/draft/2020-12/schema -title: OpenAPI 3.1 Schema Object Dialect -description: A JSON Schema dialect describing schemas found in OpenAPI v3.1 Descriptions +title: OpenAPI 3.2 Schema Object Dialect +description: A JSON Schema dialect describing schemas found in OpenAPI v3.2.x Descriptions $dynamicAnchor: meta @@ -14,8 +14,8 @@ $vocabulary: https://json-schema.org/draft/2020-12/vocab/meta-data: true https://json-schema.org/draft/2020-12/vocab/unevaluated: true https://json-schema.org/draft/2020-12/vocab/validation: true - https://spec.openapis.org/oas/3.1/vocab/base: false + https://spec.openapis.org/oas/3.2/vocab/base: false allOf: - $ref: https://json-schema.org/draft/2020-12/schema - - $ref: https://spec.openapis.org/oas/3.1/meta/WORK-IN-PROGRESS + - $ref: https://spec.openapis.org/oas/3.2/meta/WORK-IN-PROGRESS diff --git a/src/schemas/validation/meta.yaml b/src/schemas/validation/meta.yaml index 6cfce4976d..eb6a9af2dd 100644 --- a/src/schemas/validation/meta.yaml +++ b/src/schemas/validation/meta.yaml @@ -1,13 +1,13 @@ -$id: https://spec.openapis.org/oas/3.1/meta/WORK-IN-PROGRESS +$id: https://spec.openapis.org/oas/3.2/meta/WORK-IN-PROGRESS $schema: https://json-schema.org/draft/2020-12/schema title: OAS Base Vocabulary -description: A JSON Schema Vocabulary used in the OpenAPI Schema Dialect +description: A JSON Schema Vocabulary used in the OpenAPI JSON Schema Dialect $dynamicAnchor: meta $vocabulary: - https://spec.openapis.org/oas/3.1/vocab/base: true + https://spec.openapis.org/oas/3.2/vocab/base: true type: - object diff --git a/src/schemas/validation/schema-base.yaml b/src/schemas/validation/schema-base.yaml index ea239c03e9..195ae5ed43 100644 --- a/src/schemas/validation/schema-base.yaml +++ b/src/schemas/validation/schema-base.yaml @@ -1,20 +1,20 @@ -$id: 'https://spec.openapis.org/oas/3.1/schema-base/WORK-IN-PROGRESS' +$id: 'https://spec.openapis.org/oas/3.2/schema-base/WORK-IN-PROGRESS' $schema: 'https://json-schema.org/draft/2020-12/schema' -description: The description of OpenAPI v3.1.x Documents using the OpenAPI JSON Schema dialect +description: The description of OpenAPI v3.2.x Documents using the OpenAPI JSON Schema dialect -$ref: 'https://spec.openapis.org/oas/3.1/schema/WORK-IN-PROGRESS' +$ref: 'https://spec.openapis.org/oas/3.2/schema/WORK-IN-PROGRESS' properties: jsonSchemaDialect: $ref: '#/$defs/dialect' $defs: dialect: - const: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS' + const: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS' schema: $dynamicAnchor: meta - $ref: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS' + $ref: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS' properties: $schema: $ref: '#/$defs/dialect' diff --git a/src/schemas/validation/schema.yaml b/src/schemas/validation/schema.yaml index 88148f6847..3f7e5065aa 100644 --- a/src/schemas/validation/schema.yaml +++ b/src/schemas/validation/schema.yaml @@ -1,19 +1,19 @@ -$id: 'https://spec.openapis.org/oas/3.1/schema/WORK-IN-PROGRESS' +$id: 'https://spec.openapis.org/oas/3.2/schema/WORK-IN-PROGRESS' $schema: 'https://json-schema.org/draft/2020-12/schema' -description: The description of OpenAPI v3.1.x Documents without Schema Object validation +description: The description of OpenAPI v3.2.x Documents without Schema Object validation type: object properties: openapi: type: string - pattern: '^3\.1\.\d+(-.+)?$' + pattern: '^3\.2\.\d+(-.+)?$' info: $ref: '#/$defs/info' jsonSchemaDialect: type: string format: uri - default: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS' + default: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS' servers: type: array items: @@ -53,7 +53,7 @@ unevaluatedProperties: false $defs: info: - $comment: https://spec.openapis.org/oas/v3.1#info-object + $comment: https://spec.openapis.org/oas/v3.2#info-object type: object properties: title: @@ -78,7 +78,7 @@ $defs: unevaluatedProperties: false contact: - $comment: https://spec.openapis.org/oas/v3.1#contact-object + $comment: https://spec.openapis.org/oas/v3.2#contact-object type: object properties: name: @@ -93,7 +93,7 @@ $defs: unevaluatedProperties: false license: - $comment: https://spec.openapis.org/oas/v3.1#license-object + $comment: https://spec.openapis.org/oas/v3.2#license-object type: object properties: name: @@ -114,7 +114,7 @@ $defs: unevaluatedProperties: false server: - $comment: https://spec.openapis.org/oas/v3.1#server-object + $comment: https://spec.openapis.org/oas/v3.2#server-object type: object properties: url: @@ -131,7 +131,7 @@ $defs: unevaluatedProperties: false server-variable: - $comment: https://spec.openapis.org/oas/v3.1#server-variable-object + $comment: https://spec.openapis.org/oas/v3.2#server-variable-object type: object properties: enum: @@ -149,7 +149,7 @@ $defs: unevaluatedProperties: false components: - $comment: https://spec.openapis.org/oas/v3.1#components-object + $comment: https://spec.openapis.org/oas/v3.2#components-object type: object properties: schemas: @@ -201,7 +201,7 @@ $defs: unevaluatedProperties: false paths: - $comment: https://spec.openapis.org/oas/v3.1#paths-object + $comment: https://spec.openapis.org/oas/v3.2#paths-object type: object patternProperties: '^/': @@ -210,7 +210,7 @@ $defs: unevaluatedProperties: false path-item: - $comment: https://spec.openapis.org/oas/v3.1#path-item-object + $comment: https://spec.openapis.org/oas/v3.2#path-item-object type: object properties: $ref: @@ -248,7 +248,7 @@ $defs: unevaluatedProperties: false operation: - $comment: https://spec.openapis.org/oas/v3.1#operation-object + $comment: https://spec.openapis.org/oas/v3.2#operation-object type: object properties: tags: @@ -290,7 +290,7 @@ $defs: unevaluatedProperties: false external-documentation: - $comment: https://spec.openapis.org/oas/v3.1#external-documentation-object + $comment: https://spec.openapis.org/oas/v3.2#external-documentation-object type: object properties: description: @@ -304,7 +304,7 @@ $defs: unevaluatedProperties: false parameter: - $comment: https://spec.openapis.org/oas/v3.1#parameter-object + $comment: https://spec.openapis.org/oas/v3.2#parameter-object type: object properties: name: @@ -444,7 +444,7 @@ $defs: $ref: '#/$defs/parameter' request-body: - $comment: https://spec.openapis.org/oas/v3.1#request-body-object + $comment: https://spec.openapis.org/oas/v3.2#request-body-object type: object properties: description: @@ -470,7 +470,7 @@ $defs: $ref: '#/$defs/request-body' content: - $comment: https://spec.openapis.org/oas/v3.1#fixed-fields-10 + $comment: https://spec.openapis.org/oas/v3.2#fixed-fields-10 type: object additionalProperties: $ref: '#/$defs/media-type' @@ -478,7 +478,7 @@ $defs: format: media-range media-type: - $comment: https://spec.openapis.org/oas/v3.1#media-type-object + $comment: https://spec.openapis.org/oas/v3.2#media-type-object type: object properties: schema: @@ -493,7 +493,7 @@ $defs: unevaluatedProperties: false encoding: - $comment: https://spec.openapis.org/oas/v3.1#encoding-object + $comment: https://spec.openapis.org/oas/v3.2#encoding-object type: object properties: contentType: @@ -521,7 +521,7 @@ $defs: unevaluatedProperties: false responses: - $comment: https://spec.openapis.org/oas/v3.1#responses-object + $comment: https://spec.openapis.org/oas/v3.2#responses-object type: object properties: default: @@ -540,7 +540,7 @@ $defs: required: [default] response: - $comment: https://spec.openapis.org/oas/v3.1#response-object + $comment: https://spec.openapis.org/oas/v3.2#response-object type: object properties: description: @@ -571,7 +571,7 @@ $defs: $ref: '#/$defs/response' callbacks: - $comment: https://spec.openapis.org/oas/v3.1#callback-object + $comment: https://spec.openapis.org/oas/v3.2#callback-object type: object $ref: '#/$defs/specification-extensions' additionalProperties: @@ -588,7 +588,7 @@ $defs: $ref: '#/$defs/callbacks' example: - $comment: https://spec.openapis.org/oas/v3.1#example-object + $comment: https://spec.openapis.org/oas/v3.2#example-object type: object properties: summary: @@ -617,7 +617,7 @@ $defs: $ref: '#/$defs/example' link: - $comment: https://spec.openapis.org/oas/v3.1#link-object + $comment: https://spec.openapis.org/oas/v3.2#link-object type: object properties: operationRef: @@ -651,7 +651,7 @@ $defs: $ref: '#/$defs/link' header: - $comment: https://spec.openapis.org/oas/v3.1#header-object + $comment: https://spec.openapis.org/oas/v3.2#header-object type: object properties: description: @@ -697,7 +697,7 @@ $defs: $ref: '#/$defs/header' tag: - $comment: https://spec.openapis.org/oas/v3.1#tag-object + $comment: https://spec.openapis.org/oas/v3.2#tag-object type: object properties: name: @@ -718,7 +718,7 @@ $defs: unevaluatedProperties: false reference: - $comment: https://spec.openapis.org/oas/v3.1#reference-object + $comment: https://spec.openapis.org/oas/v3.2#reference-object type: object properties: $ref: @@ -730,14 +730,14 @@ $defs: type: string schema: - $comment: https://spec.openapis.org/oas/v3.1#schema-object + $comment: https://spec.openapis.org/oas/v3.2#schema-object $dynamicAnchor: meta type: - object - boolean security-scheme: - $comment: https://spec.openapis.org/oas/v3.1#security-scheme-object + $comment: https://spec.openapis.org/oas/v3.2#security-scheme-object type: object properties: type: @@ -938,7 +938,7 @@ $defs: unevaluatedProperties: false security-requirement: - $comment: https://spec.openapis.org/oas/v3.1#security-requirement-object + $comment: https://spec.openapis.org/oas/v3.2#security-requirement-object type: object additionalProperties: type: array @@ -946,7 +946,7 @@ $defs: type: string specification-extensions: - $comment: https://spec.openapis.org/oas/v3.1#specification-extensions + $comment: https://spec.openapis.org/oas/v3.2#specification-extensions patternProperties: '^x-': true diff --git a/tests/schema/fail/invalid_schema_types.yaml b/tests/schema/fail/invalid_schema_types.yaml index d295b1f0ed..ae51ad083e 100644 --- a/tests/schema/fail/invalid_schema_types.yaml +++ b/tests/schema/fail/invalid_schema_types.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.1 +openapi: 3.2.0 # this example shows invalid types for the schemaObject diff --git a/tests/schema/fail/no_containers.yaml b/tests/schema/fail/no_containers.yaml index c158bcb2b6..3c38be021d 100644 --- a/tests/schema/fail/no_containers.yaml +++ b/tests/schema/fail/no_containers.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 # this example should fail as there are no paths, components or webhooks containers (at least one of which must be present) diff --git a/tests/schema/fail/server_enum_empty.yaml b/tests/schema/fail/server_enum_empty.yaml index cd6d30eb3e..db4b970ced 100644 --- a/tests/schema/fail/server_enum_empty.yaml +++ b/tests/schema/fail/server_enum_empty.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 # this example should fail as the server variable enum is empty, and so does not contain the default value diff --git a/tests/schema/fail/servers.yaml b/tests/schema/fail/servers.yaml index 1470fe1ec8..1b5e2d5fc8 100644 --- a/tests/schema/fail/servers.yaml +++ b/tests/schema/fail/servers.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 # this example should fail, as servers must be an array, not an object diff --git a/tests/schema/fail/unknown_container.yaml b/tests/schema/fail/unknown_container.yaml index 7f31e86053..c0a4b8bb7e 100644 --- a/tests/schema/fail/unknown_container.yaml +++ b/tests/schema/fail/unknown_container.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 # this example should fail as overlays is not a valid top-level object/keyword diff --git a/tests/schema/pass/comp_pathitems.yaml b/tests/schema/pass/comp_pathitems.yaml index 502ca1fca2..5178c1f56b 100644 --- a/tests/schema/pass/comp_pathitems.yaml +++ b/tests/schema/pass/comp_pathitems.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/info_summary.yaml b/tests/schema/pass/info_summary.yaml index 30d224afc2..6697751d56 100644 --- a/tests/schema/pass/info_summary.yaml +++ b/tests/schema/pass/info_summary.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API summary: My lovely API diff --git a/tests/schema/pass/license_identifier.yaml b/tests/schema/pass/license_identifier.yaml index fbdba5efbe..20d5e4368e 100644 --- a/tests/schema/pass/license_identifier.yaml +++ b/tests/schema/pass/license_identifier.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API summary: My lovely API diff --git a/tests/schema/pass/mega.yaml b/tests/schema/pass/mega.yaml index 8838c03a6d..a0179b64bd 100644 --- a/tests/schema/pass/mega.yaml +++ b/tests/schema/pass/mega.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: summary: My API's summary title: My API diff --git a/tests/schema/pass/minimal_comp.yaml b/tests/schema/pass/minimal_comp.yaml index 4553689ab4..8f81f7e05e 100644 --- a/tests/schema/pass/minimal_comp.yaml +++ b/tests/schema/pass/minimal_comp.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/minimal_hooks.yaml b/tests/schema/pass/minimal_hooks.yaml index e67b2889de..0e44257ad0 100644 --- a/tests/schema/pass/minimal_hooks.yaml +++ b/tests/schema/pass/minimal_hooks.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/minimal_paths.yaml b/tests/schema/pass/minimal_paths.yaml index 016e86796f..c332bba18c 100644 --- a/tests/schema/pass/minimal_paths.yaml +++ b/tests/schema/pass/minimal_paths.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/non-oauth-scopes.yaml b/tests/schema/pass/non-oauth-scopes.yaml index e757452f38..45506616b4 100644 --- a/tests/schema/pass/non-oauth-scopes.yaml +++ b/tests/schema/pass/non-oauth-scopes.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: Non-oAuth Scopes example version: 1.0.0 diff --git a/tests/schema/pass/path_no_response.yaml b/tests/schema/pass/path_no_response.yaml index 334608f111..e4876799c9 100644 --- a/tests/schema/pass/path_no_response.yaml +++ b/tests/schema/pass/path_no_response.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/path_var_empty_pathitem.yaml b/tests/schema/pass/path_var_empty_pathitem.yaml index ba92742f10..e79b7cd4fe 100644 --- a/tests/schema/pass/path_var_empty_pathitem.yaml +++ b/tests/schema/pass/path_var_empty_pathitem.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/schema.yaml b/tests/schema/pass/schema.yaml index e192529a68..a6d72b9972 100644 --- a/tests/schema/pass/schema.yaml +++ b/tests/schema/pass/schema.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/servers.yaml b/tests/schema/pass/servers.yaml index 77a20498da..8e7aa858ad 100644 --- a/tests/schema/pass/servers.yaml +++ b/tests/schema/pass/servers.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: API version: 1.0.0 diff --git a/tests/schema/pass/valid_schema_types.yaml b/tests/schema/pass/valid_schema_types.yaml index 4431adcda5..43e7cdc782 100644 --- a/tests/schema/pass/valid_schema_types.yaml +++ b/tests/schema/pass/valid_schema_types.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.1 +openapi: 3.2.1 # this example shows that top-level schemaObjects MAY be booleans diff --git a/tests/schema/pass/webhook-example.yaml b/tests/schema/pass/webhook-example.yaml index 2ac1cda985..c0b505ac63 100644 --- a/tests/schema/pass/webhook-example.yaml +++ b/tests/schema/pass/webhook-example.yaml @@ -1,4 +1,4 @@ -openapi: 3.1.0 +openapi: 3.2.0 info: title: Webhook Example version: 1.0.0