From 7bb68d7ad6a0ae879aeb51f32cd35113bac06ab4 Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Fri, 5 Aug 2022 12:59:52 -0500 Subject: [PATCH 1/8] replace es_archives/empty_kibana with kibanaServer.savedObjects.cleanStandardList --- .../security_and_spaces/setup.ts | 3 ++- .../alerting_api_integration/spaces_only/tests/index.ts | 4 ++-- .../spaces_only_legacy/tests/index.ts | 4 ++-- .../apis/metrics_ui/log_entry_highlights.ts | 5 +++-- x-pack/test/api_integration/apis/metrics_ui/sources.ts | 5 +++-- x-pack/test/api_integration/apis/ml/modules/index.ts | 8 ++++---- x-pack/test/api_integration/apis/osquery/packs.ts | 4 ++-- .../apis/security_solution/saved_objects/notes.ts | 6 +++--- .../security_solution/saved_objects/pinned_events.ts | 6 +++--- .../apis/security_solution/saved_objects/timeline.ts | 6 +++--- .../apis/agent_policy/agent_policy.ts | 4 ++-- .../fleet_api_integration/apis/download_sources/crud.ts | 5 +++-- .../apis/epm/install_error_rollback.ts | 6 +++--- x-pack/test/fleet_api_integration/apis/fleet_setup.ts | 5 +++-- .../test/fleet_api_integration/apis/fleet_telemetry.ts | 5 +++-- x-pack/test/fleet_api_integration/apis/outputs/crud.ts | 5 +++-- .../fleet_api_integration/apis/package_policy/create.ts | 4 ++-- .../fleet_api_integration/apis/package_policy/delete.ts | 4 ++-- .../fleet_api_integration/apis/package_policy/get.ts | 5 +++-- .../fleet_api_integration/apis/package_policy/update.ts | 5 +++-- .../fleet_api_integration/apis/package_policy/upgrade.ts | 5 +++-- .../apis/preconfiguration/preconfiguration.ts | 5 +++-- x-pack/test/fleet_api_integration/apis/service_tokens.ts | 6 +++--- .../with_host_configured/app_search/engines.ts | 7 +++---- .../without_host_configured/app_search/setup_guide.ts | 9 +++++---- .../workplace_search/setup_guide.ts | 9 +++++---- .../test_suites/event_log/public_api_integration.ts | 3 ++- .../reporting_without_security/management.ts | 5 ++--- .../apps/endpoint/endpoint_telemetry.ts | 5 +++-- x-pack/test/visual_regression/tests/login_page.ts | 6 +++--- 30 files changed, 86 insertions(+), 73 deletions(-) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts index 69ca58e1edc12..c70c9bd355bf6 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts @@ -12,6 +12,7 @@ import { Spaces, Users } from './scenarios'; export async function setupSpacesAndUsers(getService: FtrProviderContext['getService']) { const securityService = getService('security'); const spacesService = getService('spaces'); + const kibanaServer = getService('kibanaServer'); for (const space of Spaces) { await spacesService.create(space); @@ -52,5 +53,5 @@ export async function tearDown(getService: FtrProviderContext['getService']) { } } - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); } diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts index 424deaaf83815..b8f57f279d2ff 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts @@ -28,6 +28,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) { } export async function tearDown(getService: FtrProviderContext['getService']) { - const esArchiver = getService('esArchiver'); - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + const kibanaServer = getService('kibanaServer'); + await kibanaServer.savedObjects.cleanStandardList(); } diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts index 757f2793b239f..73bca087f27be 100644 --- a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts @@ -26,6 +26,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) { } export async function tearDown(getService: FtrProviderContext['getService']) { - const esArchiver = getService('esArchiver'); - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + const kibanaServer = getService('kibanaServer'); + await kibanaServer.savedObjects.cleanStandardList(); } diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts index bd9a9a0e7c480..aba182274c9a3 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts @@ -37,6 +37,7 @@ const COMMON_HEADERS = { export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); + const kibanaServer = getService('kibanaServer'); describe('log highlight apis', () => { before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs')); @@ -44,8 +45,8 @@ export default function ({ getService }: FtrProviderContext) { describe('/log_entries/highlights', () => { describe('with the default source', () => { - before(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); - after(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); + before(() => kibanaServer.savedObjects.cleanStandardList()); + after(() => kibanaServer.savedObjects.cleanStandardList()); it('Handles empty responses', async () => { const { body } = await supertest diff --git a/x-pack/test/api_integration/apis/metrics_ui/sources.ts b/x-pack/test/api_integration/apis/metrics_ui/sources.ts index 0ba6f49634b54..c58b332c7102f 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/sources.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/sources.ts @@ -18,6 +18,7 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); const SOURCE_API_URL = '/api/metrics/source/default'; + const kibanaServer = getService('kibanaServer'); const patchRequest = async ( body: PartialMetricsSourceConfigurationProperties ): Promise => { @@ -32,8 +33,8 @@ export default function ({ getService }: FtrProviderContext) { describe('sources', () => { before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); - beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); - afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); + before(() => kibanaServer.savedObjects.cleanStandardList()); + after(() => kibanaServer.savedObjects.cleanStandardList()); describe('patch request', () => { it('applies all top-level field updates to an existing source', async () => { diff --git a/x-pack/test/api_integration/apis/ml/modules/index.ts b/x-pack/test/api_integration/apis/ml/modules/index.ts index 182de3e2648cb..de8919976fd33 100644 --- a/x-pack/test/api_integration/apis/ml/modules/index.ts +++ b/x-pack/test/api_integration/apis/ml/modules/index.ts @@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService, loadTestFile }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const ml = getService('ml'); const fleetPackages = ['apache', 'nginx']; @@ -16,8 +16,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { describe('modules', function () { before(async () => { - // use empty_kibana to make sure the fleet setup is removed correctly after the tests - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + // use await kibanaServer.savedObjects.cleanStandardList(); to make sure the fleet setup is removed correctly after the tests + await kibanaServer.savedObjects.cleanStandardList(); // Fleet need to be setup to be able to setup packages await ml.testResources.setupFleet(); @@ -32,7 +32,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { for (const fleetPackage of installedPackages) { await ml.testResources.removeFleetPackage(fleetPackage.pkgName, fleetPackage.version); } - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); loadTestFile(require.resolve('./get_module')); diff --git a/x-pack/test/api_integration/apis/osquery/packs.ts b/x-pack/test/api_integration/apis/osquery/packs.ts index 840d5aecaeae0..dc019bffeec6f 100644 --- a/x-pack/test/api_integration/apis/osquery/packs.ts +++ b/x-pack/test/api_integration/apis/osquery/packs.ts @@ -50,13 +50,13 @@ export default function ({ getService }: FtrProviderContext) { let hostedPolicy: Record; let packagePolicyId: string; before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); }); after(async () => { - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts index 03ea91775d1bf..a6dc1f88c596e 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts @@ -10,12 +10,12 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const supertest = getService('supertest'); describe('Note - Saved Objects', () => { - beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); - afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); + before(() => kibanaServer.savedObjects.cleanStandardList()); + after(() => kibanaServer.savedObjects.cleanStandardList()); describe('create a note', () => { it('should return a timelineId, timelineVersion, noteId and version', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts index 8391f2f9ab18a..dcfe8a109b04e 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts @@ -10,12 +10,12 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const supertest = getService('supertest'); describe('Pinned Events - Saved Objects', () => { - beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); - afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); + before(() => kibanaServer.savedObjects.cleanStandardList()); + after(() => kibanaServer.savedObjects.cleanStandardList()); describe('Pinned an event', () => { it('return a timelineId, timelineVersion, pinnedEventId and version', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts index 32d307ebc22d5..e3a79ba91b29c 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts @@ -12,12 +12,12 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; import { createBasicTimeline } from './helpers'; export default function ({ getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const supertest = getService('supertest'); describe('Timeline - Saved Objects', () => { - beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); - afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); + beforeEach(() => kibanaServer.savedObjects.cleanStandardList()); + afterEach(() => kibanaServer.savedObjects.cleanStandardList()); describe('Persist a timeline', () => { it('Create a timeline just with a title', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts index f9118326dcb7c..e02cec95cebff 100644 --- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts +++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts @@ -22,7 +22,7 @@ export default function (providerContext: FtrProviderContext) { let systemPkgVersion: string; before(async () => { await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); setupFleetAndAgents(providerContext); let packagePoliciesToDeleteIds: string[] = []; @@ -40,7 +40,7 @@ export default function (providerContext: FtrProviderContext) { } await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); it('should work with valid minimum required values', async () => { const { diff --git a/x-pack/test/fleet_api_integration/apis/download_sources/crud.ts b/x-pack/test/fleet_api_integration/apis/download_sources/crud.ts index 4e5d2c60ae932..c48f5602f5b52 100644 --- a/x-pack/test/fleet_api_integration/apis/download_sources/crud.ts +++ b/x-pack/test/fleet_api_integration/apis/download_sources/crud.ts @@ -14,11 +14,12 @@ export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); describe('fleet_download_sources_crud', async function () { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); @@ -38,7 +39,7 @@ export default function (providerContext: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts index 9a49958d31d34..8906a7fa3ea37 100644 --- a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts +++ b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts @@ -13,10 +13,10 @@ import { setupFleetAndAgents } from '../agents/services'; export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); const pkgName = 'error_handling'; const goodPackageVersion = '0.1.0'; const badPackageVersion = '0.2.0'; + const kibanaServer = getService('kibanaServer'); const installPackage = async (pkg: string, version: string) => { await supertest @@ -33,10 +33,10 @@ export default function (providerContext: FtrProviderContext) { skipIfNoDockerRegistry(providerContext); setupFleetAndAgents(providerContext); beforeEach(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); afterEach(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); it('on a fresh install, it should uninstall a broken package during rollback', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts index 1d640f50c04a3..e1e1f90f57eb6 100644 --- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts +++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts @@ -14,16 +14,17 @@ export default function (providerContext: FtrProviderContext) { const supertest = getService('supertest'); const es = getService('es'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); describe('fleet_setup', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); beforeEach(async () => { diff --git a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts index 88368e784dfa6..d1e7cd8d999c6 100644 --- a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts +++ b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts @@ -14,20 +14,21 @@ export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); let agentCount = 0; let pkgVersion: string; describe('fleet_telemetry', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); if (pkgVersion) { await supertest.delete(`/api/fleet/epm/packages/fleet_server/${pkgVersion}`); diff --git a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts index 43a3707a21963..f48e17a704504 100644 --- a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts +++ b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts @@ -14,11 +14,12 @@ export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); describe('fleet_output_crud', async function () { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); @@ -37,7 +38,7 @@ export default function (providerContext: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts index c16815eee3168..67c7c8f537c67 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts @@ -27,13 +27,13 @@ export default function (providerContext: FtrProviderContext) { skipIfNoDockerRegistry(providerContext); let agentPolicyId: string; before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); }); after(async () => { - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts index 1f7377ba189ba..ad1012ba561c1 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts @@ -21,7 +21,7 @@ export default function (providerContext: FtrProviderContext) { let agentPolicy: any; let packagePolicy: any; before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); @@ -86,7 +86,7 @@ export default function (providerContext: FtrProviderContext) { .send({ force: true, packagePolicyIds: [packagePolicy.id] }); }); after(async () => { - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts index 5c3ed257d7b5e..dc73643377fbb 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts @@ -23,7 +23,8 @@ export default function (providerContext: FtrProviderContext) { skipIfNoDockerRegistry(providerContext); before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); + await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); @@ -33,7 +34,7 @@ export default function (providerContext: FtrProviderContext) { await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); }); describe('get by id', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts index d1fa97b715b76..eb0cd96fd0b87 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts @@ -30,7 +30,8 @@ export default function (providerContext: FtrProviderContext) { let packagePolicyId: string; let packagePolicyId2: string; before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); + await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); @@ -121,7 +122,7 @@ export default function (providerContext: FtrProviderContext) { await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); }); it('should work with valid values on "regular" policies', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts index 6486579f41c73..4a113714dc324 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts @@ -17,6 +17,7 @@ export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); function withTestPackageVersion(version: string) { before(async function () { @@ -42,12 +43,12 @@ export default function (providerContext: FtrProviderContext) { let packagePolicyId: string; before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); diff --git a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts index ee7679d2cef65..83d2913e7aa59 100644 --- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts +++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts @@ -21,7 +21,8 @@ export default function (providerContext: FtrProviderContext) { describe('Preconfiguration', async () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); + await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); @@ -31,7 +32,7 @@ export default function (providerContext: FtrProviderContext) { await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); - await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('kibanaServer').savedObjects.cleanStandardList(); }); // Basic health check for the API; functionality is covered by the unit tests diff --git a/x-pack/test/fleet_api_integration/apis/service_tokens.ts b/x-pack/test/fleet_api_integration/apis/service_tokens.ts index e668caab8e98f..bd13c3f5b8ca8 100644 --- a/x-pack/test/fleet_api_integration/apis/service_tokens.ts +++ b/x-pack/test/fleet_api_integration/apis/service_tokens.ts @@ -11,16 +11,16 @@ import { FtrProviderContext } from '../../api_integration/ftr_provider_context'; export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const esClient = getService('es'); describe('fleet_service_tokens', async () => { before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); describe('POST /api/fleet/service_tokens', () => { diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts index 142f6af984994..b5dacc730823b 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts @@ -15,11 +15,10 @@ export default function enterpriseSearchSetupEnginesTests({ getService, getPageObjects, }: FtrProviderContext) { - const esArchiver = getService('esArchiver') as EsArchiver; const browser = getService('browser') as Browser; const retry = getService('retry'); const appSearch = getService('appSearch') as AppSearchService; - + const kibanaServer = getService('kibanaServer'); const PageObjects = getPageObjects(['appSearch', 'security']); describe('Engines Overview', function () { @@ -28,14 +27,14 @@ export default function enterpriseSearchSetupEnginesTests({ let metaEngine: IEngine; before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); engine1 = await appSearch.createEngine(); engine2 = await appSearch.createEngine(); metaEngine = await appSearch.createMetaEngine([engine1.name, engine2.name]); }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); appSearch.destroyEngine(engine1.name); appSearch.destroyEngine(engine2.name); appSearch.destroyEngine(metaEngine.name); diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts index e7bec22936d12..2995150d73d07 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts @@ -12,16 +12,17 @@ export default function enterpriseSearchSetupGuideTests({ getService, getPageObjects, }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); const browser = getService('browser'); const retry = getService('retry'); - + const kibanaServer = getService('kibanaServer'); const PageObjects = getPageObjects(['appSearch']); describe('Setup Guide', function () { - before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + before(async () => { + await kibanaServer.savedObjects.cleanStandardList(); + }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); describe('when no enterpriseSearch.host is configured', () => { diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts index e1e78885e6401..0be3156d29c02 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts @@ -12,16 +12,17 @@ export default function enterpriseSearchSetupGuideTests({ getService, getPageObjects, }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); const browser = getService('browser'); const retry = getService('retry'); - + const kibanaServer = getService('kibanaServer'); const PageObjects = getPageObjects(['workplaceSearch']); describe('Setup Guide', function () { - before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + before(async () => { + await kibanaServer.savedObjects.cleanStandardList(); + }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); describe('when no enterpriseSearch.host is configured', () => { diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts index a7bcdf2ddc52c..961efb82a90d1 100644 --- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts +++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts @@ -21,6 +21,7 @@ export default function ({ getService }: FtrProviderContext) { const retry = getService('retry'); const spacesService = getService('spaces'); const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); describe('Event Log public API', () => { before(async () => { @@ -32,7 +33,7 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); for (const namespace of [undefined, 'namespace-a']) { diff --git a/x-pack/test/reporting_functional/reporting_without_security/management.ts b/x-pack/test/reporting_functional/reporting_without_security/management.ts index 36589d375b0e0..f9444c7e4c729 100644 --- a/x-pack/test/reporting_functional/reporting_without_security/management.ts +++ b/x-pack/test/reporting_functional/reporting_without_security/management.ts @@ -40,7 +40,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { const supertest = getService('supertestWithoutAuth'); const kibanaServer = getService('kibanaServer'); const testSubjects = getService('testSubjects'); - const esArchiver = getService('esArchiver'); const reportingApi = getService('reportingAPI'); const ecommerceSOPath = 'x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json'; @@ -55,12 +54,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('Polling for jobs', () => { beforeEach(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await kibanaServer.importExport.load(ecommerceSOPath); }); afterEach(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await kibanaServer.importExport.unload(ecommerceSOPath); await reportingApi.deleteAllReports(); }); diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts index efc87330eb822..3dc4f9fb3f3a4 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts @@ -11,17 +11,18 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const telemetryTestResources = getService('telemetryTestResources'); + const kibanaServer = getService('kibanaServer'); // The source of the data for these tests have changed and need to be updated // There are currently tests in the security_solution application being maintained describe.skip('security solution endpoint telemetry', () => { after(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); describe('when no agents are connected', () => { before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); it('reports no endpoints or policies', async () => { diff --git a/x-pack/test/visual_regression/tests/login_page.ts b/x-pack/test/visual_regression/tests/login_page.ts index 34e1132134744..3e2b410024036 100644 --- a/x-pack/test/visual_regression/tests/login_page.ts +++ b/x-pack/test/visual_regression/tests/login_page.ts @@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); const visualTesting = getService('visualTesting'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); @@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe.skip('Security', () => { describe('Login Page', () => { before(async () => { - await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await kibanaServer.savedObjects.cleanStandardList(); }); afterEach(async () => { From 49bb523b91742dacf106b658df2aca9fe99afb4f Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Fri, 5 Aug 2022 18:08:59 +0000 Subject: [PATCH 2/8] [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' --- .../enterprise_search/with_host_configured/app_search/engines.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts index b5dacc730823b..5b10de7b3e036 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts @@ -6,7 +6,6 @@ */ import expect from '@kbn/expect'; -import { EsArchiver } from '@kbn/es-archiver'; import { AppSearchService, IEngine } from '../../../../services/app_search_service'; import { Browser } from '../../../../../../../test/functional/services/common'; import { FtrProviderContext } from '../../../../ftr_provider_context'; From 9f49004d2fab86b711abb85700300ba61d46e738 Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Fri, 5 Aug 2022 13:48:47 -0500 Subject: [PATCH 3/8] add missing kibanaServer --- .../test/alerting_api_integration/security_and_spaces/setup.ts | 3 +-- .../test/fleet_api_integration/apis/package_policy/create.ts | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts index c70c9bd355bf6..88c65a1fa86b5 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts @@ -12,7 +12,6 @@ import { Spaces, Users } from './scenarios'; export async function setupSpacesAndUsers(getService: FtrProviderContext['getService']) { const securityService = getService('security'); const spacesService = getService('spaces'); - const kibanaServer = getService('kibanaServer'); for (const space of Spaces) { await spacesService.create(space); @@ -40,7 +39,7 @@ export async function setupSpacesAndUsers(getService: FtrProviderContext['getSer export async function tearDown(getService: FtrProviderContext['getService']) { const securityService = getService('security'); - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); for (const user of Users) { await securityService.user.delete(user.username); diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts index 67c7c8f537c67..46f716e132246 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts @@ -14,6 +14,7 @@ export default function (providerContext: FtrProviderContext) { const { getService } = providerContext; const es: Client = getService('es'); const supertest = getService('supertest'); + const kibanaServer = getService('kibanaServer'); const getPackagePolicyById = async (id: string) => { const { body } = await supertest.get(`/api/fleet/package_policies/${id}`); From 45e9642f078968fc4c152b53893412d3b24586c4 Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Tue, 9 Aug 2022 14:34:39 -0500 Subject: [PATCH 4/8] add a tearDown --- .../security_and_spaces/group2/tests/alerting/rbac_legacy.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts index 4f0f53383e206..367a8c6c0671b 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts @@ -10,7 +10,7 @@ import { SavedObjectsUtils } from '@kbn/core/server/saved_objects'; import { UserAtSpaceScenarios, Superuser } from '../../../scenarios'; import { FtrProviderContext } from '../../../../common/ftr_provider_context'; import { ESTestIndexTool, getUrlPrefix, ObjectRemover, AlertUtils } from '../../../../common/lib'; -import { setupSpacesAndUsers } from '../../../setup'; +import { setupSpacesAndUsers, tearDown } from '../../../setup'; // eslint-disable-next-line import/no-default-export export default function alertTests({ getService }: FtrProviderContext) { @@ -71,6 +71,7 @@ export default function alertTests({ getService }: FtrProviderContext) { await esTestIndexTool.destroy(); await es.indices.delete({ index: authorizationIndex }); await esArchiver.unload('x-pack/test/functional/es_archives/alerts_legacy'); + await tearDown(getService); }); for (const scenario of UserAtSpaceScenarios) { From 4c2e16c5d3bd6dc63b9bf3fab6be736f2978b11a Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Tue, 9 Aug 2022 17:26:59 -0500 Subject: [PATCH 5/8] revert changes that don't pass --- .../security_and_spaces/group2/tests/alerting/rbac_legacy.ts | 3 +-- .../alerting_api_integration/security_and_spaces/setup.ts | 4 ++-- .../test/alerting_api_integration/spaces_only/tests/index.ts | 4 ++-- .../spaces_only_legacy/tests/index.ts | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts index 367a8c6c0671b..4f0f53383e206 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts @@ -10,7 +10,7 @@ import { SavedObjectsUtils } from '@kbn/core/server/saved_objects'; import { UserAtSpaceScenarios, Superuser } from '../../../scenarios'; import { FtrProviderContext } from '../../../../common/ftr_provider_context'; import { ESTestIndexTool, getUrlPrefix, ObjectRemover, AlertUtils } from '../../../../common/lib'; -import { setupSpacesAndUsers, tearDown } from '../../../setup'; +import { setupSpacesAndUsers } from '../../../setup'; // eslint-disable-next-line import/no-default-export export default function alertTests({ getService }: FtrProviderContext) { @@ -71,7 +71,6 @@ export default function alertTests({ getService }: FtrProviderContext) { await esTestIndexTool.destroy(); await es.indices.delete({ index: authorizationIndex }); await esArchiver.unload('x-pack/test/functional/es_archives/alerts_legacy'); - await tearDown(getService); }); for (const scenario of UserAtSpaceScenarios) { diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts index 88c65a1fa86b5..69ca58e1edc12 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts @@ -39,7 +39,7 @@ export async function setupSpacesAndUsers(getService: FtrProviderContext['getSer export async function tearDown(getService: FtrProviderContext['getService']) { const securityService = getService('security'); - const kibanaServer = getService('kibanaServer'); + const esArchiver = getService('esArchiver'); for (const user of Users) { await securityService.user.delete(user.username); @@ -52,5 +52,5 @@ export async function tearDown(getService: FtrProviderContext['getService']) { } } - await kibanaServer.savedObjects.cleanStandardList(); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts index b8f57f279d2ff..424deaaf83815 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts @@ -28,6 +28,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) { } export async function tearDown(getService: FtrProviderContext['getService']) { - const kibanaServer = getService('kibanaServer'); - await kibanaServer.savedObjects.cleanStandardList(); + const esArchiver = getService('esArchiver'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts index 73bca087f27be..757f2793b239f 100644 --- a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts @@ -26,6 +26,6 @@ export async function buildUp(getService: FtrProviderContext['getService']) { } export async function tearDown(getService: FtrProviderContext['getService']) { - const kibanaServer = getService('kibanaServer'); - await kibanaServer.savedObjects.cleanStandardList(); + const esArchiver = getService('esArchiver'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } From d51b4d56585b2e2e6a770e3085c1d98bff8b8d31 Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Thu, 11 Aug 2022 16:19:02 -0500 Subject: [PATCH 6/8] revert fleet_setup, delete spaces in tearDown --- .../alerting_api_integration/security_and_spaces/setup.ts | 6 ++++-- x-pack/test/fleet_api_integration/apis/fleet_setup.ts | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts index 69ca58e1edc12..74dcdc3989e2a 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/setup.ts @@ -39,7 +39,7 @@ export async function setupSpacesAndUsers(getService: FtrProviderContext['getSer export async function tearDown(getService: FtrProviderContext['getService']) { const securityService = getService('security'); - const esArchiver = getService('esArchiver'); + const spacesService = getService('spaces'); for (const user of Users) { await securityService.user.delete(user.username); @@ -52,5 +52,7 @@ export async function tearDown(getService: FtrProviderContext['getService']) { } } - await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + for (const space of Spaces) { + await spacesService.delete(space.id); + } } diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts index e1e1f90f57eb6..1d640f50c04a3 100644 --- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts +++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts @@ -14,17 +14,16 @@ export default function (providerContext: FtrProviderContext) { const supertest = getService('supertest'); const es = getService('es'); const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); describe('fleet_setup', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await kibanaServer.savedObjects.cleanStandardList(); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await kibanaServer.savedObjects.cleanStandardList(); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); beforeEach(async () => { From 5f3d7060a4001d12cfbe9de09db533db7d750830 Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Fri, 12 Aug 2022 17:19:44 -0500 Subject: [PATCH 7/8] Don't fail on deleting spaces --- x-pack/test/common/services/spaces.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x-pack/test/common/services/spaces.ts b/x-pack/test/common/services/spaces.ts index 24554e151135c..c023d8da26ba5 100644 --- a/x-pack/test/common/services/spaces.ts +++ b/x-pack/test/common/services/spaces.ts @@ -24,7 +24,7 @@ export function SpacesServiceProvider({ getService }: FtrProviderContext) { return new (class SpacesService { public async create(space: any) { - log.debug('creating space'); + log.debug(`creating space ${space.name}`); const { data, status, statusText } = await axios.post('/api/spaces/space', space); if (status !== 200) { @@ -32,19 +32,19 @@ export function SpacesServiceProvider({ getService }: FtrProviderContext) { `Expected status code of 200, received ${status} ${statusText}: ${util.inspect(data)}` ); } - log.debug('created space'); + log.debug(`created space ${space}`); } public async delete(spaceId: string) { - log.debug(`deleting space: ${spaceId}`); + log.debug(`deleting space id: ${spaceId}`); const { data, status, statusText } = await axios.delete(`/api/spaces/space/${spaceId}`); if (status !== 204) { - throw new Error( + log.debug( `Expected status code of 204, received ${status} ${statusText}: ${util.inspect(data)}` ); } - log.debug(`deleted space: ${spaceId}`); + log.debug(`deleted space id: ${spaceId}`); } })(); } From 7733c90e9bd7e357f4e0ebd5864bccce6646278c Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Sat, 13 Aug 2022 12:14:06 -0500 Subject: [PATCH 8/8] revert file for failing test --- .../test/fleet_api_integration/apis/package_policy/update.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts index eb0cd96fd0b87..d1fa97b715b76 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts @@ -30,8 +30,7 @@ export default function (providerContext: FtrProviderContext) { let packagePolicyId: string; let packagePolicyId2: string; before(async () => { - await getService('kibanaServer').savedObjects.cleanStandardList(); - + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); await getService('esArchiver').load( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); @@ -122,7 +121,7 @@ export default function (providerContext: FtrProviderContext) { await getService('esArchiver').unload( 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' ); - await getService('kibanaServer').savedObjects.cleanStandardList(); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('should work with valid values on "regular" policies', async function () {