Fix openapi spec and add new fields

elastic · Aug 4, 2022 · c59fefb · c59fefb
1 parent 447a608
commit c59fefb
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 90 deletions.
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -557,6 +557,18 @@
                           ]
                         },
                         "savedObject": {
+                          "type": "object"
+                        },
+                        "latestVersion": {
+                          "type": "string"
+                        },
+                        "keepPoliciesUpToDate": {
+                          "type": "boolean"
+                        },
+                        "notice": {
+                          "type": "string"
+                        },
+                        "licensePath": {
                           "type": "string"
                         }
                       },
@@ -3914,6 +3926,26 @@
           "version": {
             "type": "string"
           },
+          "release": {
+            "type": "string",
+            "enum": [
+              "experimental",
+              "beta",
+              "ga"
+            ]
+          },
+          "source": {
+            "type": "object",
+            "properties": {
+              "license": {
+                "type": "string",
+                "enum": [
+                  "Apache-2.0",
+                  "Elastic-2.0"
+                ]
+              }
+            }
+          },
           "readme": {
             "type": "string"
           },
@@ -3929,34 +3961,32 @@
               "type": "string"
             }
           },
-          "requirement": {
-            "oneOf": [
-              {
+          "conditions": {
+            "type": "object",
+            "properties": {
+              "kibana": {
+                "type": "object",
                 "properties": {
-                  "kibana": {
-                    "type": "object",
-                    "properties": {
-                      "versions": {
-                        "type": "string"
-                      }
-                    }
+                  "versions": {
+                    "type": "string"
                   }
                 }
               },
-              {
+              "elasticsearch": {
+                "type": "object",
                 "properties": {
-                  "elasticsearch": {
-                    "type": "object",
-                    "properties": {
-                      "versions": {
-                        "type": "string"
-                      }
-                    }
+                  "subscription": {
+                    "type": "string",
+                    "enum": [
+                      "basic",
+                      "gold",
+                      "platinum",
+                      "enterprise"
+                    ]
                   }
                 }
               }
-            ],
-            "type": "object"
+            }
           },
           "screenshots": {
             "type": "array",
@@ -4060,6 +4090,22 @@
           },
           "path": {
             "type": "string"
+          },
+          "elasticsearch": {
+            "type": "object",
+            "properties": {
+              "privileges": {
+                "type": "object",
+                "properties": {
+                  "cluster": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
           }
         },
         "required": [
@@ -4069,7 +4115,7 @@
           "description",
           "type",
           "categories",
-          "requirement",
+          "conditions",
           "assets",
           "format_version",
           "download",
@@ -4306,6 +4352,10 @@
                 "description": "list of agent IDs"
               }
             ]
+          },
+          "force": {
+            "type": "boolean",
+            "description": "Force upgrade, skipping validation (should be used with caution)"
           }
         },
         "required": [
@@ -4315,32 +4365,21 @@
       },
       "upgrade_agent": {
         "title": "Upgrade agent",
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "version": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "version"
-            ]
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
           },
-          {
-            "type": "object",
-            "properties": {
-              "version": {
-                "type": "string"
-              },
-              "source_uri": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "version"
-            ]
+          "source_uri": {
+            "type": "string"
+          },
+          "force": {
+            "type": "boolean",
+            "description": "Force upgrade, skipping validation (should be used with caution)"
           }
+        },
+        "required": [
+          "version"
         ]
       },
       "agent_action": {

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -350,6 +350,14 @@ paths:
                           - install_failed
                           - not_installed
                       savedObject:
+                        type: object
+                      latestVersion:
+                        type: string
+                      keepPoliciesUpToDate:
+                        type: boolean
+                      notice:
+                        type: string
+                      licensePath:
                         type: string
                     required:
                       - status
@@ -2442,6 +2450,20 @@ components:
           type: string
         version:
           type: string
+        release:
+          type: string
+          enum:
+            - experimental
+            - beta
+            - ga
+        source:
+          type: object
+          properties:
+            license:
+              type: string
+              enum:
+                - Apache-2.0
+                - Elastic-2.0
         readme:
           type: string
         description:
@@ -2452,21 +2474,24 @@ components:
           type: array
           items:
             type: string
-        requirement:
-          oneOf:
-            - properties:
-                kibana:
-                  type: object
-                  properties:
-                    versions:
-                      type: string
-            - properties:
-                elasticsearch:
-                  type: object
-                  properties:
-                    versions:
-                      type: string
+        conditions:
           type: object
+          properties:
+            kibana:
+              type: object
+              properties:
+                versions:
+                  type: string
+            elasticsearch:
+              type: object
+              properties:
+                subscription:
+                  type: string
+                  enum:
+                    - basic
+                    - gold
+                    - platinum
+                    - enterprise
         screenshots:
           type: array
           items:
@@ -2537,14 +2562,24 @@ components:
           type: string
         path:
           type: string
+        elasticsearch:
+          type: object
+          properties:
+            privileges:
+              type: object
+              properties:
+                cluster:
+                  type: array
+                  items:
+                    type: string
       required:
         - name
         - title
         - version
         - description
         - type
         - categories
-        - requirement
+        - conditions
         - assets
         - format_version
         - download
@@ -2716,26 +2751,25 @@ components:
               items:
                 type: string
               description: list of agent IDs
+        force:
+          type: boolean
+          description: Force upgrade, skipping validation (should be used with caution)
       required:
         - agents
         - version
     upgrade_agent:
       title: Upgrade agent
-      oneOf:
-        - type: object
-          properties:
-            version:
-              type: string
-          required:
-            - version
-        - type: object
-          properties:
-            version:
-              type: string
-            source_uri:
-              type: string
-          required:
-            - version
+      type: object
+      properties:
+        version:
+          type: string
+        source_uri:
+          type: string
+        force:
+          type: boolean
+          description: Force upgrade, skipping validation (should be used with caution)
+      required:
+        - version
     agent_action:
       title: Agent action
       oneOf: