Simplify nullable field

openapi-validator requires we specify 'type' twice when using 'oneOf'.
Do this, removing some 'oneOf' declarations in the process.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/docs/api/schemas/latest/patchwork.yaml b/docs/api/schemas/latest/patchwork.yaml
index e3c867226f8bf8c1d466379fce4867119bc0d9cf..edfe3477633d42ec6113ef5059b853666a2ec99a 100644 (file)
--- a/docs/api/schemas/latest/patchwork.yaml
+++ b/docs/api/schemas/latest/patchwork.yaml
@@ -1497,11 +1497,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1568,6 +1569,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1584,9 +1588,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1606,6 +1610,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1622,9 +1629,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1651,9 +1658,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1666,6 +1678,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1687,17 +1700,17 @@ components:
           readOnly: true
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
     CommentUpdate:
       type: object
       properties:
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
     CoverList:
       type: object
       properties:
@@ -1726,9 +1739,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1764,7 +1782,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1806,9 +1825,12 @@ components:
           title: Actor
           description: The user that caused/created this event.
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         payload:
           type: object
     EventCoverCreated:
@@ -1881,14 +1903,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -2002,9 +2024,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -2018,17 +2045,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2049,9 +2082,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -2095,7 +2131,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -2129,18 +2166,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2149,9 +2191,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
         related:
           title: Relations
           type: array
@@ -2185,9 +2227,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -2259,6 +2304,9 @@ components:
           maxLength: 64
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2269,6 +2317,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2301,9 +2352,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -2440,12 +2494,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2480,9 +2537,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2518,9 +2575,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2561,9 +2618,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2658,6 +2715,9 @@ components:
           maxLength: 2000
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2668,6 +2728,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2700,6 +2763,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string

diff --git a/docs/api/schemas/patchwork.j2 b/docs/api/schemas/patchwork.j2
index 3c8d9385dae7d3c335ff3f3011139c389093aa45..fba79e900f180d43223546381d0ee4ad708e1818 100644 (file)
--- a/docs/api/schemas/patchwork.j2
+++ b/docs/api/schemas/patchwork.j2
@@ -1548,11 +1548,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1624,6 +1625,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1640,9 +1644,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1662,6 +1666,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1678,9 +1685,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1712,9 +1719,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
 {% endif %}
         date:
           title: Date
@@ -1728,6 +1740,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1750,17 +1763,17 @@ components:
 {% if version >= (1, 3) %}
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
     CommentUpdate:
       type: object
       properties:
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
 {% endif %}
     CoverList:
       type: object
@@ -1793,9 +1806,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
 {% endif %}
         date:
           title: Date
@@ -1836,7 +1854,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1879,9 +1898,12 @@ components:
           title: Actor
           description: The user that caused/created this event.
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
 {% endif %}
         payload:
           type: object
@@ -1955,14 +1977,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -2079,9 +2101,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
 {% endif %}
         date:
           title: Date
@@ -2096,17 +2123,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2127,9 +2160,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -2177,7 +2213,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -2211,18 +2248,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2231,9 +2273,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
 {% if version >= (1, 2) %}
         related:
           title: Relations
@@ -2269,9 +2311,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -2346,6 +2391,9 @@ components:
 {% if version >= (1, 2) %}
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2356,6 +2404,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2391,9 +2442,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -2532,12 +2586,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2577,9 +2634,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
 {% endif %}
         date:
           title: Date
@@ -2619,9 +2676,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
 {% endif %}
         date:
           title: Date
@@ -2666,9 +2723,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
 {% endif %}
         date:
           title: Date
@@ -2765,6 +2822,9 @@ components:
 {% if version >= (1, 2) %}
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2775,6 +2835,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2810,6 +2873,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string

diff --git a/docs/api/schemas/v1.0/patchwork.yaml b/docs/api/schemas/v1.0/patchwork.yaml
index da8dc3d126aae39ef142c6e349580ca2f1ea24e9..390135eca4a055a7db0fc596b37088e3a887c2b5 100644 (file)
--- a/docs/api/schemas/v1.0/patchwork.yaml
+++ b/docs/api/schemas/v1.0/patchwork.yaml
@@ -1205,11 +1205,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1258,6 +1259,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1274,9 +1278,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1296,6 +1300,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1312,9 +1319,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1340,6 +1347,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1404,7 +1412,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1514,14 +1523,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -1640,17 +1649,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1671,9 +1686,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -1707,7 +1725,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1741,18 +1760,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1761,9 +1785,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
     Person:
       type: object
       properties:
@@ -1792,9 +1816,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -1872,9 +1899,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -1984,12 +2014,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2180,6 +2213,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string

diff --git a/docs/api/schemas/v1.1/patchwork.yaml b/docs/api/schemas/v1.1/patchwork.yaml
index 2837f6646052075e8f3d01120ca88a9fc9aec3d1..26631f75acf66cb3217d6318202305a8dd1da54e 100644 (file)
--- a/docs/api/schemas/v1.1/patchwork.yaml
+++ b/docs/api/schemas/v1.1/patchwork.yaml
@@ -1210,11 +1210,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1263,6 +1264,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1279,9 +1283,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1301,6 +1305,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1317,9 +1324,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1350,6 +1357,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1429,7 +1437,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1539,14 +1548,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -1670,17 +1679,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1701,9 +1716,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -1742,7 +1760,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1776,18 +1795,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1796,9 +1820,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
     Person:
       type: object
       properties:
@@ -1827,9 +1851,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -1923,9 +1950,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -2035,12 +2065,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2251,6 +2284,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string

diff --git a/docs/api/schemas/v1.2/patchwork.yaml b/docs/api/schemas/v1.2/patchwork.yaml
index 3d6fbcee1ed163d37999dfad6a9e3bdd1e12d274..8da026e18b727d8f8d35eadd3e8e626823faee3f 100644 (file)
--- a/docs/api/schemas/v1.2/patchwork.yaml
+++ b/docs/api/schemas/v1.2/patchwork.yaml
@@ -1357,11 +1357,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1428,6 +1429,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1444,9 +1448,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1466,6 +1470,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1482,9 +1489,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1506,9 +1513,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1521,6 +1533,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1568,9 +1581,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1606,7 +1624,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1648,9 +1667,12 @@ components:
           title: Actor
           description: The user that caused/created this event.
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         payload:
           type: object
     EventCoverCreated:
@@ -1723,14 +1745,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -1844,9 +1866,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1860,17 +1887,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1891,9 +1924,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -1937,7 +1973,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1971,18 +2008,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -1991,9 +2033,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
         related:
           title: Relations
           type: array
@@ -2027,9 +2069,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -2101,6 +2146,9 @@ components:
           maxLength: 64
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2111,6 +2159,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2143,9 +2194,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -2282,12 +2336,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2317,9 +2374,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2355,9 +2412,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2398,9 +2455,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2495,6 +2552,9 @@ components:
           maxLength: 2000
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2505,6 +2565,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2537,6 +2600,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string

diff --git a/docs/api/schemas/v1.3/patchwork.yaml b/docs/api/schemas/v1.3/patchwork.yaml
index 0755573a20c3c5b1e6567e2ed9081f48b292ebce..f143193c9f8f8de37c843a7201797094b6617f8e 100644 (file)
--- a/docs/api/schemas/v1.3/patchwork.yaml
+++ b/docs/api/schemas/v1.3/patchwork.yaml
@@ -1497,11 +1497,12 @@ components:
         owner:
           title: Owner
           readOnly: true
-          anyOf:
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
-            - type: object
-              allOf:
-                - $ref: '#/components/schemas/UserEmbedded'
+            - $ref: '#/components/schemas/UserEmbedded'
         patches:
           title: Patches
           type: array
@@ -1568,6 +1569,9 @@ components:
           description: >
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1584,9 +1588,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     CheckCreate:
       type: object
       required:
@@ -1606,6 +1610,9 @@ components:
           description:
             The target URL to associate with this check. This should be
             specific to the patch.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -1622,9 +1629,9 @@ components:
         description:
           title: Description
           description: A brief description of the check.
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
     Comment:
       type: object
       properties:
@@ -1651,9 +1658,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1666,6 +1678,7 @@ components:
         submitter:
           type: object
           title: Submitter
+          readOnly: true
           allOf:
             - $ref: '#/components/schemas/PersonEmbedded'
         content:
@@ -1687,17 +1700,17 @@ components:
           readOnly: true
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
     CommentUpdate:
       type: object
       properties:
         addressed:
           title: Addressed
-          oneOf:
-            - type: 'null'
-            - type: boolean
+          type:
+            - 'null'
+            - 'boolean'
     CoverList:
       type: object
       properties:
@@ -1726,9 +1739,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -1764,7 +1782,8 @@ components:
     CoverDetail:
       allOf:
         - $ref: '#/components/schemas/CoverList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -1806,9 +1825,12 @@ components:
           title: Actor
           description: The user that caused/created this event.
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         payload:
           type: object
     EventCoverCreated:
@@ -1881,14 +1903,14 @@ components:
                   $ref: '#/components/schemas/PatchEmbedded'
                 previous_relation:
                   title: Previous relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
                 current_relation:
                   title: Current relation
-                  oneOf:
-                    - type: 'null'
-                    - type: string
+                  type:
+                    - 'null'
+                    - 'string'
     EventPatchDelegated:
       allOf:
         - $ref: '#/components/schemas/EventBase'
@@ -2002,9 +2024,14 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
+              format: uri
+              maxLength: 2000
         date:
           title: Date
           type: string
@@ -2018,17 +2045,23 @@ components:
           maxLength: 255
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2049,9 +2082,12 @@ components:
         delegate:
           title: Delegate
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
         mbox:
           title: Mbox
           type: string
@@ -2095,7 +2131,8 @@ components:
     PatchDetail:
       allOf:
         - $ref: '#/components/schemas/PatchList'
-        - properties:
+        - type: object
+          properties:
             headers:
               title: Headers
               anyOf:
@@ -2129,18 +2166,23 @@ components:
       properties:
         commit_ref:
           title: Commit ref
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               maxLength: 255
         pull_url:
           title: Pull URL
-          type: string
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
-              maxLength: 255
               format: uri
+              maxLength: 255
         state:
           title: State
           type: string
@@ -2149,9 +2191,9 @@ components:
           type: boolean
         delegate:
           title: Delegate
-          oneOf:
-            - type: 'null'
-            - type: integer
+          type:
+            - 'null'
+            - 'integer'
         related:
           title: Relations
           type: array
@@ -2185,9 +2227,12 @@ components:
         user:
           title: User
           readOnly: true
-          anyOf:
-            - $ref: '#/components/schemas/UserEmbedded'
+          type:
+            - 'null'
+            - 'object'
+          oneOf:
             - type: 'null'
+            - $ref: '#/components/schemas/UserEmbedded'
     Project:
       type: object
       properties:
@@ -2259,6 +2304,9 @@ components:
           maxLength: 64
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2269,6 +2317,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2301,9 +2352,12 @@ components:
           description: >
             An optional name to associate with the series, e.g. "John's PCI
             series".
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
-            - type: string
+            - type: 'string'
               maxLength: 255
         date:
           title: Date
@@ -2440,12 +2494,15 @@ components:
           description: >
             The target URL to associate with this check. This should be specific
             to the patch.
+          readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
               format: uri
               maxLength: 200
-          readOnly: true
         context:
           title: Context
           description: >
@@ -2480,9 +2537,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2518,9 +2575,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2561,9 +2618,9 @@ components:
         list_archive_url:
           title: List archive URL
           readOnly: true
-          oneOf:
-            - type: 'null'
-            - type: string
+          type:
+            - 'null'
+            - 'string'
         date:
           title: Date
           type: string
@@ -2658,6 +2715,9 @@ components:
           maxLength: 2000
         list_archive_url:
           title: List archive URL
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2668,6 +2728,9 @@ components:
           description: >
             URL format for the list archive's Message-ID redirector. {} will be
             replaced by the Message-ID.
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string
@@ -2700,6 +2763,9 @@ components:
             An optional name to associate with the series, e.g. "John's PCI
             series".
           readOnly: true
+          type:
+            - 'null'
+            - 'string'
           oneOf:
             - type: 'null'
             - type: string