Make response spec match actual/TS type

elastic · Jul 21, 2021 · 5d1216e · 5d1216e
1 parent f2014cd
commit 5d1216e
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 119 deletions.
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -481,7 +481,21 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/bulk_upgrade_agents"
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "object",
+                    "properties": {
+                      "success": {
+                        "type": "boolean"
+                      },
+                      "error": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "success"
+                    ]
+                  }
                 }
               }
             }
@@ -1849,64 +1863,31 @@
       },
       "bulk_upgrade_agents": {
         "title": "Bulk upgrade agents",
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "version": {
-                "type": "string"
-              },
-              "agents": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            },
-            "required": [
-              "version",
-              "agents"
-            ]
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
           },
-          {
-            "type": "object",
-            "properties": {
-              "version": {
-                "type": "string"
-              },
-              "source_uri": {
-                "type": "string"
-              },
-              "agents": {
+          "source_uri": {
+            "type": "string"
+          },
+          "agents": {
+            "oneOf": [
+              {
                 "type": "array",
                 "items": {
                   "type": "string"
                 }
-              }
-            },
-            "required": [
-              "version",
-              "agents"
-            ]
-          },
-          {
-            "type": "object",
-            "properties": {
-              "version": {
-                "type": "string"
               },
-              "source_uri": {
-                "type": "string"
-              },
-              "agents": {
+              {
                 "type": "string"
               }
-            },
-            "required": [
-              "version",
-              "agents"
             ]
           }
+        },
+        "required": [
+          "agents",
+          "version"
         ]
       },
       "upgrade_agent": {

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -301,7 +301,16 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/bulk_upgrade_agents'
+                type: object
+                additionalProperties:
+                  type: object
+                  properties:
+                    success:
+                      type: boolean
+                    error:
+                      type: string
+                  required:
+                    - success
         '400':
           description: BAD REQUEST
           content:
@@ -1176,42 +1185,21 @@ components:
         - status
     bulk_upgrade_agents:
       title: Bulk upgrade agents
-      oneOf:
-        - type: object
-          properties:
-            version:
-              type: string
-            agents:
-              type: array
-              items:
-                type: string
-          required:
-            - version
-            - agents
-        - type: object
-          properties:
-            version:
-              type: string
-            source_uri:
-              type: string
-            agents:
-              type: array
+      type: object
+      properties:
+        version:
+          type: string
+        source_uri:
+          type: string
+        agents:
+          oneOf:
+            - type: array
               items:
                 type: string
-          required:
-            - version
-            - agents
-        - type: object
-          properties:
-            version:
-              type: string
-            source_uri:
-              type: string
-            agents:
-              type: string
-          required:
-            - version
-            - agents
+            - type: string
+      required:
+        - agents
+        - version
     upgrade_agent:
       title: Upgrade agent
       oneOf:

diff --git a/x-pack/plugins/fleet/common/openapi/components/schemas/bulk_upgrade_agents.yaml b/x-pack/plugins/fleet/common/openapi/components/schemas/bulk_upgrade_agents.yaml
@@ -1,37 +1,16 @@
 title: Bulk upgrade agents
-oneOf:
-  - type: object
-    properties:
-      version:
-        type: string
-      agents:
-        type: array
+type: object
+properties:
+  version:
+    type: string
+  source_uri:
+    type: string
+  agents:
+    oneOf:
+      - type: array
         items:
           type: string
-    required:
-      - version
-      - agents
-  - type: object
-    properties:
-      version:
-        type: string
-      source_uri:
-        type: string
-      agents:
-        type: array
-        items:
-          type: string
-    required:
-      - version
-      - agents
-  - type: object
-    properties:
-      version:
-        type: string
-      source_uri:
-        type: string
-      agents:
-        type: string
-    required:
-      - version
-      - agents
+      - type: string
+required:
+  - agents
+  - version
diff --git a/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_upgrade.yaml b/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_upgrade.yaml
@@ -7,7 +7,16 @@ post:
       content:
         application/json:
           schema:
-            $ref: ../components/schemas/bulk_upgrade_agents.yaml
+              type: object
+              additionalProperties:
+                type: object
+                properties:
+                  success:
+                    type: boolean
+                  error:
+                    type: string
+                required:
+                  - success
     '400':
       description: BAD REQUEST
       content: