Update 3.1 schema id for patch release (#2718)

* Update 3.1 schema id for patch release * Generate JSON for new version of 3.1 schemas * Catchup v3.0 schema with #2158 * Catchup v3.0 schemas with #2673 * Catchup v3.0 schemas with #2706 * Update schema id for 3.0 release
OAI · Oct 7, 2021 · 413b1a8 · 413b1a8
1 parent ce732af
commit 413b1a8
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 27 deletions.
diff --git a/schemas/v3.0/schema.json b/schemas/v3.0/schema.json
@@ -1,5 +1,5 @@
 {
-  "id": "https://spec.openapis.org/oas/3.0/schema/2019-04-02",
+  "id": "https://spec.openapis.org/oas/3.0/schema/2021-09-28",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Validation schema for OpenAPI Specification 3.0.X.",
   "type": "object",
@@ -1358,9 +1358,8 @@
           "description": "Bearer",
           "properties": {
             "scheme": {
-              "enum": [
-                "bearer"
-              ]
+              "type": "string",
+              "pattern": "^[Bb][Ee][Aa][Rr][Ee][Rr]$"
             }
           }
         },
@@ -1374,9 +1373,8 @@
           "properties": {
             "scheme": {
               "not": {
-                "enum": [
-                  "bearer"
-                ]
+                "type": "string",
+                "pattern": "^[Bb][Ee][Aa][Rr][Ee][Rr]$"
               }
             }
           }
@@ -1489,7 +1487,8 @@
     "PasswordOAuthFlow": {
       "type": "object",
       "required": [
-        "tokenUrl"
+        "tokenUrl",
+        "scopes"
       ],
       "properties": {
         "tokenUrl": {
@@ -1516,7 +1515,8 @@
     "ClientCredentialsFlow": {
       "type": "object",
       "required": [
-        "tokenUrl"
+        "tokenUrl",
+        "scopes"
       ],
       "properties": {
         "tokenUrl": {
@@ -1544,7 +1544,8 @@
       "type": "object",
       "required": [
         "authorizationUrl",
-        "tokenUrl"
+        "tokenUrl",
+        "scopes"
       ],
       "properties": {
         "authorizationUrl": {
@@ -1628,7 +1629,14 @@
         "headers": {
           "type": "object",
           "additionalProperties": {
-            "$ref": "#/definitions/Header"
+            "oneOf": [
+              {
+                "$ref": "#/definitions/Header"
+              },
+              {
+                "$ref": "#/definitions/Reference"
+              }
+            ]
           }
         },
         "style": {
@@ -1651,4 +1659,4 @@
       "additionalProperties": false
     }
   }
-}
+}
diff --git a/schemas/v3.0/schema.yaml b/schemas/v3.0/schema.yaml
@@ -1,4 +1,4 @@
-id: https://spec.openapis.org/oas/3.0/schema/2021-08-12
+id: https://spec.openapis.org/oas/3.0/schema/2021-09-28
 $schema: http://json-schema.org/draft-04/schema#
 description: Validation schema for OpenAPI Specification 3.0.X.
 type: object

diff --git a/schemas/v3.1/schema-base.json b/schemas/v3.1/schema-base.json
@@ -1,7 +1,7 @@
 {
-  "$id": "https://spec.openapis.org/oas/3.1/schema-base/2021-05-20",
+  "$id": "https://spec.openapis.org/oas/3.1/schema-base/2021-09-28",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$ref": "https://spec.openapis.org/oas/3.1/schema/2021-05-20",
+  "$ref": "https://spec.openapis.org/oas/3.1/schema/2021-09-28",
   "properties": {
     "jsonSchemaDialect": {
       "$ref": "#/$defs/dialect"
@@ -21,4 +21,4 @@
       }
     }
   }
-}
+}
diff --git a/schemas/v3.1/schema-base.yaml b/schemas/v3.1/schema-base.yaml
@@ -1,7 +1,7 @@
-$id: 'https://spec.openapis.org/oas/3.1/schema-base/2021-05-20'
+$id: 'https://spec.openapis.org/oas/3.1/schema-base/2021-09-28'
 $schema: 'https://json-schema.org/draft/2020-12/schema'
 
-$ref: 'https://spec.openapis.org/oas/3.1/schema/2021-05-20'
+$ref: 'https://spec.openapis.org/oas/3.1/schema/2021-09-28'
 properties:
   jsonSchemaDialect:
     $ref: '#/$defs/dialect'

diff --git a/schemas/v3.1/schema.json b/schemas/v3.1/schema.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://spec.openapis.org/oas/3.1/schema/2021-05-20",
+  "$id": "https://spec.openapis.org/oas/3.1/schema/2021-09-28",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {
@@ -622,6 +622,7 @@
     },
     "parameter-or-reference": {
       "if": {
+        "type": "object",
         "required": [
           "$ref"
         ]
@@ -865,6 +866,7 @@
     },
     "example-or-reference": {
       "if": {
+        "type": "object",
         "required": [
           "$ref"
         ]
@@ -1131,7 +1133,8 @@
                 "const": "http"
               },
               "scheme": {
-                "const": "bearer"
+                "type": "string",
+                "pattern": "^[Bb][Ee][Aa][Rr][Ee][Rr]$"
               }
             },
             "required": [
@@ -1144,10 +1147,7 @@
               "bearerFormat": {
                 "type": "string"
               }
-            },
-            "required": [
-              "scheme"
-            ]
+            }
           }
         },
         "type-oauth2": {
@@ -1348,4 +1348,4 @@
       }
     }
   }
-}
+}
diff --git a/schemas/v3.1/schema.yaml b/schemas/v3.1/schema.yaml
@@ -1,4 +1,4 @@
-$id: 'https://spec.openapis.org/oas/3.1/schema/2021-05-20'
+$id: 'https://spec.openapis.org/oas/3.1/schema/2021-09-28'
 $schema: 'https://json-schema.org/draft/2020-12/schema'
 
 type: object

diff --git a/tests/v3.1/test.js b/tests/v3.1/test.js
@@ -14,7 +14,7 @@ before(async () => {
   JsonSchema.add(dialect);
   JsonSchema.add(vocabulary);
   JsonSchema.add(yaml.parse(fs.readFileSync(`${__dirname}/../../schemas/v3.1/schema.yaml`, "utf8"), { prettyErrors: true }));
-  metaSchema = await JsonSchema.get("https://spec.openapis.org/oas/3.1/schema/2021-05-20");
+  metaSchema = await JsonSchema.get("https://spec.openapis.org/oas/3.1/schema/2021-09-28");
 });
 
 describe("v3.1 Pass", () => {