[Archive Migration] x-pack..security/discover (elastic#106896)

vadimkibana · Aug 8, 2021 · 98b7230 · 98b7230
1 parent 562bd01
commit 98b7230
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 311 deletions.
diff --git a/x-pack/test/functional/apps/security/secure_roles_perm.js b/x-pack/test/functional/apps/security/secure_roles_perm.js
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import { keyBy } from 'lodash';
+
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects([
     'security',
@@ -29,7 +30,9 @@ export default function ({ getService, getPageObjects }) {
       log.debug('users');
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       log.debug('load kibana index with default index pattern');
-      await esArchiver.load('x-pack/test/functional/es_archives/security/discover');
+      await kibanaServer.importExport.load(
+        'x-pack/test/functional/fixtures/kbn_archiver/security/discover'
+      );
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.settings.navigateTo();
     });
@@ -87,6 +90,9 @@ export default function ({ getService, getPageObjects }) {
 
     after(async function () {
       await PageObjects.security.forceLogout();
+      await kibanaServer.importExport.unload(
+        'x-pack/test/functional/fixtures/kbn_archiver/security/discover'
+      );
     });
   });
 }
diff --git a/x-pack/test/functional/apps/security/user_email.js b/x-pack/test/functional/apps/security/user_email.js
@@ -7,14 +7,17 @@
 
 import expect from '@kbn/expect';
 import { keyBy } from 'lodash';
+
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['security', 'settings', 'common', 'accountSetting']);
   const log = getService('log');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   describe('useremail', function () {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/security/discover');
+      await kibanaServer.importExport.load(
+        'x-pack/test/functional/fixtures/kbn_archiver/security/discover'
+      );
       await PageObjects.settings.navigateTo();
       await PageObjects.security.clickElasticsearchUsers();
     });
@@ -55,6 +58,9 @@ export default function ({ getService, getPageObjects }) {
 
     after(async function () {
       await PageObjects.security.forceLogout();
+      await kibanaServer.importExport.unload(
+        'x-pack/test/functional/fixtures/kbn_archiver/security/discover'
+      );
     });
   });
 }
diff --git a/x-pack/test/functional/es_archives/security/discover/data.json.gz b/x-pack/test/functional/es_archives/security/discover/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security/discover/mappings.json b/x-pack/test/functional/es_archives/security/discover/mappings.json