Skip to content

Commit

Permalink
[8.x] [UII] Add types to return content packages correctly (#195505) (#…
Browse files Browse the repository at this point in the history
…195690)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[UII] Add types to return content packages correctly
(#195505)](#195505)

Note that this includes manual changes to openapi spec files. This
change is not present on the original PR as the main branch no longer
uses openapi spec files.

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-09T20:08:18Z","message":"[UII]
Add types to return content packages correctly (#195505)\n\n##
Summary\r\n\r\nRelated to #192484. This PR adding [new content package
types and\r\nschemas](elastic/package-spec#777)
so that\r\ncontent packages can be returned correctly from EPR to
unblock\r\ndevelopment of those packages.\r\n\r\nThe only current
content package is `kubernetes_otel`. You will need to\r\nbump up the
max allowed spec version and search with beta (prerelease)\r\npackages
enabled to find it:\r\n```\r\nxpack.fleet.internal.registry.spec.max:
'3.4'\r\n```\r\n\r\nTests will come with the rest of work for
#192484\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"bd6533f30b58fc831670d400f25a61321379902c","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"number":195505,"url":"https://github.com/elastic/kibana/pull/195505","mergeCommit":{"message":"[UII]
Add types to return content packages correctly (#195505)\n\n##
Summary\r\n\r\nRelated to #192484. This PR adding [new content package
types and\r\nschemas](elastic/package-spec#777)
so that\r\ncontent packages can be returned correctly from EPR to
unblock\r\ndevelopment of those packages.\r\n\r\nThe only current
content package is `kubernetes_otel`. You will need to\r\nbump up the
max allowed spec version and search with beta (prerelease)\r\npackages
enabled to find it:\r\n```\r\nxpack.fleet.internal.registry.spec.max:
'3.4'\r\n```\r\n\r\nTests will come with the rest of work for
#192484\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"bd6533f30b58fc831670d400f25a61321379902c"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195505","number":195505,"mergeCommit":{"message":"[UII]
Add types to return content packages correctly (#195505)\n\n##
Summary\r\n\r\nRelated to #192484. This PR adding [new content package
types and\r\nschemas](elastic/package-spec#777)
so that\r\ncontent packages can be returned correctly from EPR to
unblock\r\ndevelopment of those packages.\r\n\r\nThe only current
content package is `kubernetes_otel`. You will need to\r\nbump up the
max allowed spec version and search with beta (prerelease)\r\npackages
enabled to find it:\r\n```\r\nxpack.fleet.internal.registry.spec.max:
'3.4'\r\n```\r\n\r\nTests will come with the rest of work for
#192484\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"bd6533f30b58fc831670d400f25a61321379902c"}}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
jen-huang and kibanamachine authored Oct 10, 2024
1 parent 6df1c38 commit 14de289
Show file tree
Hide file tree
Showing 8 changed files with 422 additions and 4 deletions.
55 changes: 55 additions & 0 deletions oas_docs/output/kibana.serverless.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21405,6 +21405,31 @@ components:
title: Package information
type: object
properties:
agent:
type: object
properties:
privileges:
type: object
properties:
root:
type: boolean
asset_tags:
items:
type: object
properties:
asset_ids:
items:
type: string
type: array
asset_types:
items:
type: string
type: array
text:
type: string
required:
- text
type: array
assets:
items:
type: string
Expand Down Expand Up @@ -21469,6 +21494,18 @@ components:
type: array
description:
type: string
discovery:
type: object
properties:
fields:
items:
type: object
properties:
name:
type: string
required:
- name
type: array
download:
type: string
elasticsearch:
Expand All @@ -21491,6 +21528,19 @@ components:
type: boolean
name:
type: string
owner:
type: object
properties:
github:
type: string
type:
enum:
- elastic
- partner
- community
type: string
required:
- github
path:
type: string
readme:
Expand Down Expand Up @@ -21534,6 +21584,10 @@ components:
title:
type: string
type:
enum:
- integration
- input
- content
type: string
version:
type: string
Expand All @@ -21549,6 +21603,7 @@ components:
- format_version
- download
- path
- owner
Fleet_package_policy:
allOf:
- type: object
Expand Down
55 changes: 55 additions & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21405,6 +21405,31 @@ components:
title: Package information
type: object
properties:
agent:
type: object
properties:
privileges:
type: object
properties:
root:
type: boolean
asset_tags:
items:
type: object
properties:
asset_ids:
items:
type: string
type: array
asset_types:
items:
type: string
type: array
text:
type: string
required:
- text
type: array
assets:
items:
type: string
Expand Down Expand Up @@ -21469,6 +21494,18 @@ components:
type: array
description:
type: string
discovery:
type: object
properties:
fields:
items:
type: object
properties:
name:
type: string
required:
- name
type: array
download:
type: string
elasticsearch:
Expand All @@ -21491,6 +21528,19 @@ components:
type: boolean
name:
type: string
owner:
type: object
properties:
github:
type: string
type:
enum:
- elastic
- partner
- community
type: string
required:
- github
path:
type: string
readme:
Expand Down Expand Up @@ -21534,6 +21584,10 @@ components:
title:
type: string
type:
enum:
- integration
- input
- content
type: string
version:
type: string
Expand All @@ -21549,6 +21603,7 @@ components:
- format_version
- download
- path
- owner
Fleet_package_policy:
allOf:
- type: object
Expand Down
55 changes: 55 additions & 0 deletions oas_docs/output/kibana.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29184,6 +29184,31 @@ components:
title: Package information
type: object
properties:
agent:
type: object
properties:
privileges:
type: object
properties:
root:
type: boolean
asset_tags:
items:
type: object
properties:
asset_ids:
items:
type: string
type: array
asset_types:
items:
type: string
type: array
text:
type: string
required:
- text
type: array
assets:
items:
type: string
Expand Down Expand Up @@ -29248,6 +29273,18 @@ components:
type: array
description:
type: string
discovery:
type: object
properties:
fields:
items:
type: object
properties:
name:
type: string
required:
- name
type: array
download:
type: string
elasticsearch:
Expand All @@ -29270,6 +29307,19 @@ components:
type: boolean
name:
type: string
owner:
type: object
properties:
github:
type: string
type:
enum:
- elastic
- partner
- community
type: string
required:
- github
path:
type: string
readme:
Expand Down Expand Up @@ -29313,6 +29363,10 @@ components:
title:
type: string
type:
enum:
- integration
- input
- content
type: string
version:
type: string
Expand All @@ -29328,6 +29382,7 @@ components:
- format_version
- download
- path
- owner
Fleet_package_policy:
allOf:
- type: object
Expand Down
55 changes: 55 additions & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29184,6 +29184,31 @@ components:
title: Package information
type: object
properties:
agent:
type: object
properties:
privileges:
type: object
properties:
root:
type: boolean
asset_tags:
items:
type: object
properties:
asset_ids:
items:
type: string
type: array
asset_types:
items:
type: string
type: array
text:
type: string
required:
- text
type: array
assets:
items:
type: string
Expand Down Expand Up @@ -29248,6 +29273,18 @@ components:
type: array
description:
type: string
discovery:
type: object
properties:
fields:
items:
type: object
properties:
name:
type: string
required:
- name
type: array
download:
type: string
elasticsearch:
Expand All @@ -29270,6 +29307,19 @@ components:
type: boolean
name:
type: string
owner:
type: object
properties:
github:
type: string
type:
enum:
- elastic
- partner
- community
type: string
required:
- github
path:
type: string
readme:
Expand Down Expand Up @@ -29313,6 +29363,10 @@ components:
title:
type: string
type:
enum:
- integration
- input
- content
type: string
version:
type: string
Expand All @@ -29328,6 +29382,7 @@ components:
- format_version
- download
- path
- owner
Fleet_package_policy:
allOf:
- type: object
Expand Down
Loading

0 comments on commit 14de289

Please sign in to comment.