From 9851b7bcfaca7cd026533f347a715d61dfb8b599 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Sat, 12 Jun 2021 22:12:38 -0700 Subject: [PATCH] [FTR] Use importExport for saved_object/basic archive (#100244) (#102016) Signed-off-by: Tyler Smalley --- .../apis/kql_telemetry/kql_telemetry.ts | 16 ++++----- .../apis/saved_objects/bulk_get.ts | 8 ++--- .../apis/saved_objects/bulk_update.ts | 16 ++++----- .../apis/saved_objects/create.ts | 8 ++--- .../apis/saved_objects/delete.ts | 16 ++++----- .../apis/saved_objects/find.ts | 36 +++++++++---------- .../api_integration/apis/saved_objects/get.ts | 8 ++--- .../apis/saved_objects/import.ts | 16 ++++----- .../apis/saved_objects/resolve.ts | 16 ++++----- .../apis/saved_objects/update.ts | 16 ++++----- .../apis/saved_objects_management/find.ts | 32 ++++++++--------- .../apis/saved_objects_management/get.ts | 16 ++++----- .../saved_objects_management/relationships.ts | 16 ++++----- test/api_integration/apis/shorten/index.js | 16 ++++----- test/api_integration/apis/stats/stats.js | 16 ++++----- 15 files changed, 126 insertions(+), 126 deletions(-) diff --git a/test/api_integration/apis/kql_telemetry/kql_telemetry.ts b/test/api_integration/apis/kql_telemetry/kql_telemetry.ts index 8f618753fd7490..5770ed0866a900 100644 --- a/test/api_integration/apis/kql_telemetry/kql_telemetry.ts +++ b/test/api_integration/apis/kql_telemetry/kql_telemetry.ts @@ -17,16 +17,16 @@ export default function ({ getService }: FtrProviderContext) { const es = getService('es'); describe('telemetry API', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should increment the opt *in* counter in the .kibana/kql-telemetry document', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects/bulk_get.ts b/test/api_integration/apis/saved_objects/bulk_get.ts index 6c0bb5b0861efc..e349482960678b 100644 --- a/test/api_integration/apis/saved_objects/bulk_get.ts +++ b/test/api_integration/apis/saved_objects/bulk_get.ts @@ -39,11 +39,11 @@ export default function ({ getService }: FtrProviderContext) { ); }); - after(() => - kibanaServer.importExport.unload( + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200 with individual responses', async () => await supertest diff --git a/test/api_integration/apis/saved_objects/bulk_update.ts b/test/api_integration/apis/saved_objects/bulk_update.ts index 187d0582052884..cf402bf2f62217 100644 --- a/test/api_integration/apis/saved_objects/bulk_update.ts +++ b/test/api_integration/apis/saved_objects/bulk_update.ts @@ -15,16 +15,16 @@ export default function ({ getService }: FtrProviderContext) { const kibanaServer = getService('kibanaServer'); describe('bulkUpdate', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200', async () => { const response = await supertest diff --git a/test/api_integration/apis/saved_objects/create.ts b/test/api_integration/apis/saved_objects/create.ts index befc54b7a372ee..00018e47c9dd36 100644 --- a/test/api_integration/apis/saved_objects/create.ts +++ b/test/api_integration/apis/saved_objects/create.ts @@ -24,11 +24,11 @@ export default function ({ getService }: FtrProviderContext) { ); }); - after(() => - kibanaServer.importExport.unload( + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects/delete.ts b/test/api_integration/apis/saved_objects/delete.ts index 2dfe64bf39d023..fc38050deabffe 100644 --- a/test/api_integration/apis/saved_objects/delete.ts +++ b/test/api_integration/apis/saved_objects/delete.ts @@ -14,16 +14,16 @@ export default function ({ getService }: FtrProviderContext) { const kibanaServer = getService('kibanaServer'); describe('delete', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200 when deleting a doc', async () => await supertest diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts index 5283fba6d58ca2..a38043c7c93524 100644 --- a/test/api_integration/apis/saved_objects/find.ts +++ b/test/api_integration/apis/saved_objects/find.ts @@ -261,18 +261,18 @@ export default function ({ getService }: FtrProviderContext) { }); describe('`has_reference` and `has_reference_operator` parameters', () => { - before(() => - kibanaServer.importExport.load( - 'test/api_integration/fixtures/kbn_archiver/saved_objects/references', + before(async () => { + await kibanaServer.importExport.load( + 'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json', { space: SPACE_ID } - ) - ); - after(() => - kibanaServer.importExport.unload( - 'test/api_integration/fixtures/kbn_archiver/saved_objects/references', + ); + }); + after(async () => { + await kibanaServer.importExport.unload( + 'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json', { space: SPACE_ID } - ) - ); + ); + }); it('search for a reference', async () => { await supertest @@ -333,18 +333,18 @@ export default function ({ getService }: FtrProviderContext) { }); describe('searching for special characters', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json', { space: SPACE_ID } - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json', { space: SPACE_ID } - ) - ); + ); + }); it('can search for objects with dashes', async () => await supertest diff --git a/test/api_integration/apis/saved_objects/get.ts b/test/api_integration/apis/saved_objects/get.ts index 8c3dff9ceea6a4..8122308e449303 100644 --- a/test/api_integration/apis/saved_objects/get.ts +++ b/test/api_integration/apis/saved_objects/get.ts @@ -23,11 +23,11 @@ export default function ({ getService }: FtrProviderContext) { 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' ); }); - after(() => - kibanaServer.importExport.unload( + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200', async () => await supertest diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts index 61dc23ec10ca8a..c899f082ec4d3f 100644 --- a/test/api_integration/apis/saved_objects/import.ts +++ b/test/api_integration/apis/saved_objects/import.ts @@ -43,16 +43,16 @@ export default function ({ getService }: FtrProviderContext) { }; describe('with basic data existing', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 415 when no file passed in', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects/resolve.ts b/test/api_integration/apis/saved_objects/resolve.ts index 24f327248690bf..a00a44f98223d0 100644 --- a/test/api_integration/apis/saved_objects/resolve.ts +++ b/test/api_integration/apis/saved_objects/resolve.ts @@ -22,16 +22,16 @@ export default function ({ getService }: FtrProviderContext) { }); describe('with kibana index', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200', async () => await supertest diff --git a/test/api_integration/apis/saved_objects/update.ts b/test/api_integration/apis/saved_objects/update.ts index de60444602185b..1c73d0788e51ca 100644 --- a/test/api_integration/apis/saved_objects/update.ts +++ b/test/api_integration/apis/saved_objects/update.ts @@ -14,16 +14,16 @@ export default function ({ getService }: FtrProviderContext) { const kibanaServer = getService('kibanaServer'); describe('update', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200', async () => { await supertest .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`) diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts index 8c3a8ef8049f6f..6e36303cc1fe07 100644 --- a/test/api_integration/apis/saved_objects_management/find.ts +++ b/test/api_integration/apis/saved_objects_management/find.ts @@ -25,16 +25,16 @@ export default function ({ getService }: FtrProviderContext) { }); describe('with kibana index', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200 with individual responses', async () => await supertest @@ -93,16 +93,16 @@ export default function ({ getService }: FtrProviderContext) { }); describe('`hasReference` and `hasReferenceOperator` parameters', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json' - ) - ); + ); + }); it('search for a reference', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects_management/get.ts b/test/api_integration/apis/saved_objects_management/get.ts index f6e29193f71617..3b49a28ca40223 100644 --- a/test/api_integration/apis/saved_objects_management/get.ts +++ b/test/api_integration/apis/saved_objects_management/get.ts @@ -18,16 +18,16 @@ export default function ({ getService }: FtrProviderContext) { const existingObject = 'visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab'; const nonexistentObject = 'wigwags/foo'; - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('should return 200 for object that exists and inject metadata', async () => await supertest diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts index 98e2b864fef6e5..aa488942edbeb7 100644 --- a/test/api_integration/apis/saved_objects_management/relationships.ts +++ b/test/api_integration/apis/saved_objects_management/relationships.ts @@ -43,16 +43,16 @@ export default function ({ getService }: FtrProviderContext) { }); describe('relationships', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json' - ) - ); + ); + }); const baseApiUrl = `/api/kibana/management/saved_objects/relationships`; const defaultTypes = ['visualization', 'index-pattern', 'search', 'dashboard']; diff --git a/test/api_integration/apis/shorten/index.js b/test/api_integration/apis/shorten/index.js index 24dab995578193..86c39426205ad3 100644 --- a/test/api_integration/apis/shorten/index.js +++ b/test/api_integration/apis/shorten/index.js @@ -13,16 +13,16 @@ export default function ({ getService }) { const kibanaServer = getService('kibanaServer'); describe('url shortener', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); it('generates shortened urls', async () => { const resp = await supertest diff --git a/test/api_integration/apis/stats/stats.js b/test/api_integration/apis/stats/stats.js index fc95f59ff5c88c..61936a73da38da 100644 --- a/test/api_integration/apis/stats/stats.js +++ b/test/api_integration/apis/stats/stats.js @@ -47,16 +47,16 @@ export default function ({ getService }) { const kibanaServer = getService('kibanaServer'); describe('kibana stats api', () => { - before(() => - kibanaServer.importExport.load( + before(async () => { + await kibanaServer.importExport.load( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); - after(() => - kibanaServer.importExport.unload( + ); + }); + after(async () => { + await kibanaServer.importExport.unload( 'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json' - ) - ); + ); + }); describe('basic', () => { it('should return the stats without cluster_uuid with no query string params', () => {