[FTR] Use importExport for saved_object/basic archive (elastic#100244)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
tylersmalley · Jun 13, 2021 · e0f9ad7 · e0f9ad7
1 parent 73225da
commit e0f9ad7
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 108 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/export.ts b/test/api_integration/apis/saved_objects/export.ts
@@ -538,6 +538,10 @@ export default function ({ getService }: FtrProviderContext) {
             const objects = ndjsonToObject(resp.text);
             expect(objects.length).to.eql(10001);
           });
+        await supertest
+          // @ts-expect-error TS complains about using `anotherCustomVisId` before it is assigned
+          .delete(`/s/${SPACE_ID}/api/saved_objects/visualization/${anotherCustomVisId}`)
+          .expect(200);
       });
 
       it('should return 400 when exporting more than allowed by maxImportExportSize', async () => {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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', () => {