Skip to content

Commit f2cbec3

Browse files
criamicokibanamachineelasticmachine
authored andcommitted
[Fleet] Add meta:{id} to fleet schemas (elastic#270560)
Fixes elastic#261258 possibly also elastic#264565 (to be verified) ## Summary Add `meta: { id }` to Fleet body/response schemas Files changed: - `server/types/models/agent_policy.ts` — versioned policy schemas (v3–v6), `new_agent_policy`, `agent_policy`, `agent_policy_response`, `full_agent_policy`, outputs responses - `server/types/rest_spec/agent_policy.ts` — bulk get, copy, delete, full policy, K8s manifest, list outputs, cleanup task request/response schemas - `server/types/models/enrollment_api_key.ts `— `enrollment_api_key` - `server/types/rest_spec/enrollment_api_key.ts` — enrollment key CRUD and bulk delete schemas - `common/types/models/package_policy_schema.ts `— all package policy schemas: new, versioned (v22–v24), simplified, update, response, dry-run, status - `server/types/rest_spec/package_policy.ts` — bulk get, create, delete, upgrade, dry-run schemas - `server/types/rest_spec/epm.ts `— ~40 package management schemas (categories, package info/list/stats, install/delete/bulk operations, etc.) - `server/types/rest_spec/agent.ts` — `action_id_response` / `action_message_response` branches of `ActionIdOrMessageSchema` (resolves items #1 and #2 of elastic#264565) ### Testing Verified locally with: ``` node scripts/capture_oas_snapshot --no-serverless --include-path /api/fleet node scripts/validate_oas_docs node scripts/check_api_contracts --distribution stack ``` It looks like there are no Fleet errors left after this change but the final verification step will be ran in the ci for Terraform --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 89a6b6c commit f2cbec3

11 files changed

Lines changed: 28830 additions & 50672 deletions

File tree

oas_docs/output/kibana.serverless.yaml

Lines changed: 13648 additions & 24691 deletions
Large diffs are not rendered by default.

oas_docs/output/kibana.yaml

Lines changed: 13625 additions & 24668 deletions
Large diffs are not rendered by default.

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ describe('checking migration metadata changes on all registered SO types', () =>
105105
"file": "5d2da4f1b03f551745b938f4e71b3d328bb65d3ff5ed89ae42a66240fa358346",
106106
"file-upload-usage-collection-telemetry": "d6d7e6f366e33ec93a4996229e44d32aea97e04f696259b9915c0d21001ff698",
107107
"fileShare": "5f3b4cb0a3aa1d3b03f31b2f0741baa548068f2ec478b8632ef4f02cb65f2b75",
108-
"fleet-agent-policies": "0afcc3826e53382b6b0cf9c1ae6013666508d85647a997ffb0fc561bcf5d8087",
108+
"fleet-agent-policies": "ecb6e5990c46caf46dc7e8323e3f4a5a772cf4d0a3e4e0f148d40e44a7054114",
109109
"fleet-cloud-connector": "d7ca8a3de46fc3bc440514943649cb14af6d111b7f490b18f8e34e444b4ed3fa",
110110
"fleet-cloud-onboarding-deployment": "bad508764b7eaada2556e13153679953736c68e190110e281b9a7d52c7d10bc2",
111111
"fleet-fleet-server-host": "edbc06c4a73586e7820549ab481244989af89ba9191b002cce97d0843a01008e",
112112
"fleet-message-signing-keys": "67aecd34e081183b2a99cc1451583977e4ad918074dc5b1579cc4b23750d3829",
113-
"fleet-package-policies": "04d5e251e1b1e0453a1ab91f7776527512d55af5609c612f3fbef3e832cb27ed",
113+
"fleet-package-policies": "5c5d0debdefd5322af7015fd582b5141742e36f6b2a00be58155e25c8f8241b6",
114114
"fleet-preconfiguration-deletion-record": "1154f80d0ef53014ea52c7642131e31365f86909e93b265e7f38c2c317c645cf",
115115
"fleet-proxy": "b38a96aa9da6664ff35cd67c4470e0280dbd4b07e8d063a71d6e97dc077d9be4",
116116
"fleet-setup-lock": "df3c142ba8907c8ccf004d2240c79d476a70946db092ab4c485d3eb1a3f5bb82",
@@ -123,10 +123,10 @@ describe('checking migration metadata changes on all registered SO types', () =>
123123
"infra-custom-dashboards": "1287737d9b23b8559bf442dafe4275039c5a44969421c5d25b3f1ee60b030d5b",
124124
"infrastructure-monitoring-log-view": "a15ae1d2c400f2ea175cd407705dccd85178f9db82def8137b24c4ee4a489ae9",
125125
"infrastructure-ui-source": "498c2ba7abd4329a0d8b40efd98b4b16991107512d38141707f9f2e10521b367",
126-
"ingest-agent-policies": "cab3f6654c1f88ce32182a99d996ef2902ea1157cb6a029bf82b9f227cf547a1",
126+
"ingest-agent-policies": "1966acba3d49b5057979b1c8518e359be28e7f21450f75a6ad9246dc334f5f95",
127127
"ingest-download-sources": "c87e062ef293585e85fccec0c865d7cef48e0ff9a919d7781d5f7627d275484b",
128128
"ingest-outputs": "b377c664edc65976f10f339f4b26271b2d238df90f7c5dd126b0c825926486b9",
129-
"ingest-package-policies": "cb0d8ad6bdfe0c5dec513250f604a74d79d06232d4b1ab873cd26cca1a57197e",
129+
"ingest-package-policies": "958b60978741bf0f2755dbacd44b4aa9a31d3e5b483872fa1f500722b79b30d5",
130130
"ingest_manager_settings": "d7f88bef81425b890d9d277acd01423556e804269c9e405aeced2629b55695b4",
131131
"integration-config": "8fecaf29e55097075e6d8927bf8353ca3cfa8bc9e352389411da05b31ae704e0",
132132
"intercept_interaction_record": "d7cb1aad5a2e5f459aa1fea81337ab206987845814dc14f151645d3be13cb293",
@@ -735,10 +735,10 @@ describe('checking migration metadata changes on all registered SO types', () =>
735735
"fleet-agent-policies|global: 21f06d2abf533c0fb63934a6229bd7b0ce7ed97b",
736736
"fleet-agent-policies|mappings: 7a6aef21c517facd41e5df4c7fa7f66d1ef68829",
737737
"fleet-agent-policies|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
738-
"fleet-agent-policies|10.6.0: 153249e09dcbaed854657aeecffe317f2f0b1661d38054454707c7454c830b50",
739-
"fleet-agent-policies|10.5.0: 2f09dc81c8398b0e02589491da420a0a5f159001cc5427ec754ce9f0d788cb4b",
740-
"fleet-agent-policies|10.4.0: 4d8f31802678cc675f596f4ac3f9f50e6691dbce1c5b7c7a9d84c436775d57ed",
741-
"fleet-agent-policies|10.3.0: f45d663cb22d804a33eb71c380faf44efbbfa0ca92cd8aa0c62fcae92919080c",
738+
"fleet-agent-policies|10.6.0: 5fa3667a0a1e89df4d1c7580d12df95436a3fc66b452d1a023c8d0556c6c51b7",
739+
"fleet-agent-policies|10.5.0: 3499a78b02a6673e934b0384511550e61fd215ed71613dc194936424b4395682",
740+
"fleet-agent-policies|10.4.0: 81bcc7106027cc8a1ad698984e2600504983662db6fe948664f5c39bc76ae8a9",
741+
"fleet-agent-policies|10.3.0: a4b4f6078a638dffd52c7cf7499508da1222d2e4ce9717b52f6248ce07dee499",
742742
"fleet-agent-policies|10.2.0: b0042f8a6c0373d27acc94bb2ddc913c1d2f8847961d8b75b0c99b2b4ce71b2c",
743743
"fleet-agent-policies|10.1.0: 7fce3be244f92bb99b17c8757c39a49aec078ff90cae70971e42e202a574348c",
744744
"=============================================================================================",
@@ -768,8 +768,8 @@ describe('checking migration metadata changes on all registered SO types', () =>
768768
"fleet-package-policies|global: b8c5158782fe91d5a5636274dee693a6fef2e457",
769769
"fleet-package-policies|mappings: fb3acda96f9119aa483b39736c9a07da565b8489",
770770
"fleet-package-policies|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
771-
"fleet-package-policies|10.9.0: 89356f02be60fa90201796fb74afd808b4b60d5b20ef15568988a91e5304555b",
772-
"fleet-package-policies|10.8.0: 63afabdb9ed904ad1240d75a808166a98bc23ca9c36851e2262b4507bfa5513e",
771+
"fleet-package-policies|10.9.0: 00464256f3d400ef3382cc3696c29a16f5df01bdc41c01f0440f6a1ad8f5097b",
772+
"fleet-package-policies|10.8.0: 5f4fbabdb466e88079735c9284de829636999e37e125f808d43eb4807a9cefa1",
773773
"fleet-package-policies|10.7.0: 175fe637899f2c70d1c5e2b2dbe459962d4b7048367b9930d393f280222093cf",
774774
"fleet-package-policies|10.6.0: ef0c3e9699868aa625f197708fda2114eac175a8d3c0f2984634102adf61cb15",
775775
"fleet-package-policies|10.5.0: d60de40b75a31ee199487f5a53329033afbfc78767c42d16d987e95173df9516",
@@ -846,10 +846,10 @@ describe('checking migration metadata changes on all registered SO types', () =>
846846
"ingest-agent-policies|global: c3b43ce09de4bc7883a7ef73aec64d7d679b28d2",
847847
"ingest-agent-policies|mappings: ebeefa360c807146ea4645800fedad0869063ac1",
848848
"ingest-agent-policies|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
849-
"ingest-agent-policies|10.11.0: 153249e09dcbaed854657aeecffe317f2f0b1661d38054454707c7454c830b50",
850-
"ingest-agent-policies|10.10.0: 2f09dc81c8398b0e02589491da420a0a5f159001cc5427ec754ce9f0d788cb4b",
851-
"ingest-agent-policies|10.9.0: 4d8f31802678cc675f596f4ac3f9f50e6691dbce1c5b7c7a9d84c436775d57ed",
852-
"ingest-agent-policies|10.8.0: f45d663cb22d804a33eb71c380faf44efbbfa0ca92cd8aa0c62fcae92919080c",
849+
"ingest-agent-policies|10.11.0: 5fa3667a0a1e89df4d1c7580d12df95436a3fc66b452d1a023c8d0556c6c51b7",
850+
"ingest-agent-policies|10.10.0: 3499a78b02a6673e934b0384511550e61fd215ed71613dc194936424b4395682",
851+
"ingest-agent-policies|10.9.0: 81bcc7106027cc8a1ad698984e2600504983662db6fe948664f5c39bc76ae8a9",
852+
"ingest-agent-policies|10.8.0: a4b4f6078a638dffd52c7cf7499508da1222d2e4ce9717b52f6248ce07dee499",
853853
"ingest-agent-policies|10.7.0: b0042f8a6c0373d27acc94bb2ddc913c1d2f8847961d8b75b0c99b2b4ce71b2c",
854854
"ingest-agent-policies|10.6.0: 5cb51278f489660ab671e971b91569729d498aae1feaceeca2c2f57c93246b65",
855855
"ingest-agent-policies|10.5.0: 7fce3be244f92bb99b17c8757c39a49aec078ff90cae70971e42e202a574348c",
@@ -887,8 +887,8 @@ describe('checking migration metadata changes on all registered SO types', () =>
887887
"ingest-package-policies|global: a89e06415e12609fa3575379d06ab1b542da6f04",
888888
"ingest-package-policies|mappings: fb3acda96f9119aa483b39736c9a07da565b8489",
889889
"ingest-package-policies|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
890-
"ingest-package-policies|10.23.0: 35593d9ec9def3cd57253e632160ac7f5b2390ad4bb1f0687b1a8a5d526b5205",
891-
"ingest-package-policies|10.22.0: 63afabdb9ed904ad1240d75a808166a98bc23ca9c36851e2262b4507bfa5513e",
890+
"ingest-package-policies|10.23.0: 2566b4db65ac68fd79020b74783d69695448b680de2d22546ae04ad6aba16b94",
891+
"ingest-package-policies|10.22.0: 5f4fbabdb466e88079735c9284de829636999e37e125f808d43eb4807a9cefa1",
892892
"ingest-package-policies|10.21.0: 175fe637899f2c70d1c5e2b2dbe459962d4b7048367b9930d393f280222093cf",
893893
"ingest-package-policies|10.20.0: 522700650b5a10db91d2337e8b82582841a3884049e40c20525aed0a1e1f475e",
894894
"ingest-package-policies|10.19.0: d60de40b75a31ee199487f5a53329033afbfc78767c42d16d987e95173df9516",

0 commit comments

Comments
 (0)