From c12363f30fca330588fd425258cea4d7d5039266 Mon Sep 17 00:00:00 2001 From: Rudolf Meijering Date: Mon, 21 Aug 2023 11:38:04 +0200 Subject: [PATCH] Fix 7.17 forward compatibility with 8.2+ (#164043) ## Summary Fixes https://github.com/elastic/kibana/issues/130474 It does not seem like the failure was ES promotion related, but rather that Kibana might create a config saved object which then caused some of the assertions to fail. This PR changes our assertions to not be sensitive to any new saved objects that might have been added, as long as the unknown ones are deleted it works. ### Checklist Delete any items that are not applicable to this PR. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/)) - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)) - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)) - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) ### Risk Matrix Delete this section if it is not applicable to this PR. Before closing this PR, invite QA, stakeholders, and other developers to identify risks that should be tested prior to the change/feature release. When forming the risk matrix, consider some of the following examples and how they may potentially impact the change: | Risk | Probability | Severity | Mitigation/Notes | |---------------------------|-------------|----------|-------------------------| | Multiple Spaces—unexpected behavior in non-default Kibana Space. | Low | High | Integration tests will verify that all features are still supported in non-default Kibana Space and when user switches between spaces. | | Multiple nodes—Elasticsearch polling might have race conditions when multiple Kibana nodes are polling for the same tasks. | High | Low | Tasks are idempotent, so executing them multiple times will not result in logical error, but will degrade performance. To test for this case we add plenty of unit tests around this logic and document manual testing procedure. | | Code should gracefully handle cases when feature X or plugin Y are disabled. | Medium | High | Unit tests will verify that any feature flag or plugin combination still results in our service operational. | | [See more potential risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) | ### For maintainers - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) --- .../saved_objects/delete_unknown_types.ts | 77 ++++++------------- 1 file changed, 23 insertions(+), 54 deletions(-) diff --git a/test/api_integration/apis/saved_objects/delete_unknown_types.ts b/test/api_integration/apis/saved_objects/delete_unknown_types.ts index fabae914d20b4..a2f07e021076f 100644 --- a/test/api_integration/apis/saved_objects/delete_unknown_types.ts +++ b/test/api_integration/apis/saved_objects/delete_unknown_types.ts @@ -16,8 +16,7 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const es = getService('es'); - // FAILING ES 8.2 forward compatibility: https://github.com/elastic/kibana/issues/130474 - describe.skip('/deprecations/_delete_unknown_types', () => { + describe('/deprecations/_delete_unknown_types', () => { before(async () => { await esArchiver.emptyKibanaIndex(); await esArchiver.load( @@ -50,40 +49,23 @@ export default function ({ getService }: FtrProviderContext) { it('should return 200 with individual responses', async () => { const beforeDelete = await fetchIndexContent(); - expect(beforeDelete).to.eql([ - { - id: 'dashboard:b70c7ae0-3224-11e8-a572-ffca06da1357', - type: 'dashboard', - }, - { - id: 'index-pattern:8963ca30-3224-11e8-a572-ffca06da1357', - type: 'index-pattern', - }, - { - id: 'search:960372e0-3224-11e8-a572-ffca06da1357', - type: 'search', - }, - { - id: 'space:default', - type: 'space', - }, - { - id: 'unknown-shareable-doc', - type: 'unknown-shareable-type', - }, - { - id: 'unknown-type:unknown-doc', - type: 'unknown-type', - }, - { - id: 'visualization:a42c0580-3224-11e8-a572-ffca06da1357', - type: 'visualization', - }, - ]); + const beforeDeleteIds = beforeDelete.map((obj) => obj.id); + [ + 'dashboard:b70c7ae0-3224-11e8-a572-ffca06da1357', + 'index-pattern:8963ca30-3224-11e8-a572-ffca06da1357', + 'search:960372e0-3224-11e8-a572-ffca06da1357', + 'space:default', + 'unknown-shareable-doc', + 'unknown-type:unknown-doc', + 'visualization:a42c0580-3224-11e8-a572-ffca06da1357', + ].forEach((id) => { + expect(beforeDeleteIds).to.contain(id); + }); await supertest .post(`/internal/saved_objects/deprecations/_delete_unknown_types`) .send({}) + .set('kbn-xsrf', 'true') .expect(200) .then((resp) => { expect(resp.body).to.eql({ success: true }); @@ -97,28 +79,15 @@ export default function ({ getService }: FtrProviderContext) { await delay(1000); continue; } - expect(afterDelete).to.eql([ - { - id: 'dashboard:b70c7ae0-3224-11e8-a572-ffca06da1357', - type: 'dashboard', - }, - { - id: 'index-pattern:8963ca30-3224-11e8-a572-ffca06da1357', - type: 'index-pattern', - }, - { - id: 'search:960372e0-3224-11e8-a572-ffca06da1357', - type: 'search', - }, - { - id: 'space:default', - type: 'space', - }, - { - id: 'visualization:a42c0580-3224-11e8-a572-ffca06da1357', - type: 'visualization', - }, - ]); + const afterDeleteIds = afterDelete.map((obj) => obj.id); + [ + 'dashboard:b70c7ae0-3224-11e8-a572-ffca06da1357', + 'index-pattern:8963ca30-3224-11e8-a572-ffca06da1357', + 'search:960372e0-3224-11e8-a572-ffca06da1357', + 'space:default', + 'visualization:a42c0580-3224-11e8-a572-ffca06da1357', + ].forEach((id) => expect(afterDeleteIds).to.contain(id)); + break; } });