savedObjectTagging: use importExport instead of esArchiver for FT…

…R tests (#135679) * migrate most of the datasets * update the tagging_api suite * update the security_and_spaces suite * adapt the functional suite
elastic · Jul 5, 2022 · dc78287 · dc78287
1 parent 96048fa
commit dc78287
Show file tree

Hide file tree

Showing 44 changed files with 1,314 additions and 3,993 deletions.
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('POST /internal/saved_objects_tagging/tags/_bulk_delete', () => {
+    before(async () => {
+      await createTestSpaces(ftrContext);
+    });
+
+    after(async () => {
+      await deleteTestSpaces(ftrContext);
+    });
+
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTags(ftrContext);
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTags, createTestSpaces, deleteTags, deleteTestSpaces } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('GET /internal/saved_objects_tagging/tags/_find', () => {
     before(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTestSpaces(ftrContext);
     });
 
     after(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTestSpaces(ftrContext);
+    });
+
+    beforeEach(async () => {
+      await createTags(ftrContext);
+    });
+
+    afterEach(async () => {
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/...st/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts b/...st/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('GET /internal/saved_objects_tagging/assignments/_assignable_types', () => {
     before(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTestSpaces(ftrContext);
     });
 
     after(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTestSpaces(ftrContext);
+    });
+
+    beforeEach(async () => {
+      await createTags(ftrContext);
+    });
+
+    afterEach(async () => {
+      await deleteTags(ftrContext);
     });
 
     const assignablePerUser = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts
@@ -11,19 +11,19 @@ import { FtrProviderContext } from '../services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const supertest = getService('supertestWithoutAuth');
 
   describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      await kibanaServer.importExport.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
       );
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      await kibanaServer.importExport.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
       );
     });
 

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('POST /api/saved_objects_tagging/tags/create', () => {
+    before(async () => {
+      await createTestSpaces(ftrContext);
+    });
+
+    after(async () => {
+      await deleteTestSpaces(ftrContext);
+    });
+
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTags(ftrContext);
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('DELETE /api/saved_objects_tagging/tags/{id}', () => {
+    before(async () => {
+      await createTestSpaces(ftrContext);
+    });
+
+    after(async () => {
+      await deleteTestSpaces(ftrContext);
+    });
+
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTags(ftrContext);
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('GET /api/saved_objects_tagging/tags/{id}', () => {
     before(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTestSpaces(ftrContext);
     });
 
     after(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTestSpaces(ftrContext);
+    });
+
+    beforeEach(async () => {
+      await createTags(ftrContext);
+    });
+
+    afterEach(async () => {
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('GET /api/saved_objects_tagging/tags', () => {
     before(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTestSpaces(ftrContext);
     });
 
     after(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTestSpaces(ftrContext);
+    });
+
+    beforeEach(async () => {
+      await createTags(ftrContext);
+    });
+
+    afterEach(async () => {
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/test_utils.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/test_utils.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../services';
+
+export const createTestSpaces = async ({ getService }: FtrProviderContext) => {
+  const spaceService = getService('spaces');
+  await spaceService.create({
+    id: 'space_1',
+    name: 'Space 1',
+    description: 'This is the first test space',
+  });
+  await spaceService.create({
+    id: 'space_2',
+    name: 'Space 2',
+    description: 'This is the second test space',
+  });
+};
+
+export const deleteTestSpaces = async ({ getService }: FtrProviderContext) => {
+  const spaceService = getService('spaces');
+  await spaceService.delete('space_1');
+  await spaceService.delete('space_2');
+};
+
+export const createTags = async ({ getService }: FtrProviderContext) => {
+  const kibanaServer = getService('kibanaServer');
+  await kibanaServer.importExport.load(
+    'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/default_space.json'
+  );
+  await kibanaServer.importExport.load(
+    'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/space_1.json',
+    { space: 'space_1' }
+  );
+};
+
+export const deleteTags = async ({ getService }: FtrProviderContext) => {
+  const kibanaServer = getService('kibanaServer');
+  await kibanaServer.importExport.unload(
+    'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/default_space.json'
+  );
+  await kibanaServer.importExport.unload(
+    'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/space_1.json',
+    { space: 'space_1' }
+  );
+};
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts
@@ -8,23 +8,27 @@
 import expect from '@kbn/expect';
 import { USERS, User, ExpectedResponse } from '../../../common/lib';
 import { FtrProviderContext } from '../services';
+import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const supertest = getService('supertestWithoutAuth');
+export default function (ftrContext: FtrProviderContext) {
+  const supertest = ftrContext.getService('supertestWithoutAuth');
 
   describe('POST /api/saved_objects_tagging/tags/{id}', () => {
+    before(async () => {
+      await createTestSpaces(ftrContext);
+    });
+
+    after(async () => {
+      await deleteTestSpaces(ftrContext);
+    });
+
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await createTags(ftrContext);
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
-      );
+      await deleteTags(ftrContext);
     });
 
     const responses: Record<string, ExpectedResponse> = {

diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts
@@ -10,19 +10,19 @@ import { FtrProviderContext } from '../services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const supertest = getService('supertest');
 
   describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
     beforeEach(async () => {
-      await esArchiver.load(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      await kibanaServer.importExport.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
       );
     });
 
     afterEach(async () => {
-      await esArchiver.unload(
-        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      await kibanaServer.importExport.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
       );
     });