From 8fd809382631ee945f12b56b317374e037a804b9 Mon Sep 17 00:00:00 2001 From: Tre Date: Mon, 2 Aug 2021 14:15:55 +0100 Subject: [PATCH] [Archive Migration] x-pack..security/discover (#106896) (#107373) --- .../apps/security/secure_roles_perm.js | 8 +- .../functional/apps/security/user_email.js | 10 +- .../security/discover/data.json.gz | Bin 1088 -> 0 bytes .../security/discover/mappings.json | 308 ------------------ .../kbn_archiver/security/discover.json | 50 +++ 5 files changed, 65 insertions(+), 311 deletions(-) delete mode 100644 x-pack/test/functional/es_archives/security/discover/data.json.gz delete mode 100644 x-pack/test/functional/es_archives/security/discover/mappings.json create mode 100644 x-pack/test/functional/fixtures/kbn_archiver/security/discover.json diff --git a/x-pack/test/functional/apps/security/secure_roles_perm.js b/x-pack/test/functional/apps/security/secure_roles_perm.js index 027d7027d46ee..0c1dbfd5f826a 100644 --- 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 index bb9b0a865ee6b..84566c1a6f5ff 100644 --- 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 deleted file mode 100644 index cce1558566be5d97f836b8a0c58e8a0a61ed13e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1088 zcmV-G1i$+qiwFP!000026U|#oZ`(K!zUNn{J}zP-PKrKsO3-2t3v7GH-s(W0$+5+j z5>=AQqlW+c4oO*-^1!B9BSXLjtf9#HI5QlQGvm!smQCDU1CunR(2 zz(*;3t8EyET)>L8%7yoQQ!U`ux6XdZC9BzvZgp$;eu%8=J|G}TfaOLuPU_kZ@lPpj zh96f#*0IS#uQ%POp;OJO0QPeSq-)vkUg>8O83yY1$bYv-N1NwQH_U9>Fz3M3xzcOv zm@TJ&{Qk^GBaJ1nlAwh3qkP*e!qgU%d@(Vw0t03-IbH;`foPqP^*YeFZfl3c6Z{=T z2m&8hOj$ruU>GRQw4Q+Q)ZMSqJ2?3w%-eRaZI6ct*cv>C!}ISbBle-+n7;wVaL`Y> zb_isq*SV|^Q+^|bE0e+%agYJJwRUFM4WX%&zyxxmhVf7{1NTCxpb8wDwHC}wG3z3E z2&QhUWw+E{T}aG0$ra>|t%d% z!xBnC3c|^s<90`VT4~Crf=ZjabPfYU-$^W;)Vx-D+kd5n#LJ_g-F?Fl=?JGaDygfX zl@1EuPJT7|iA^r83)MHA_nxv2!_OGL)cON zOAOBsho#|HD9@382x2L~E$YNl2bqY^lEs0J0*6~8Lob$|Z%rdM`OvM<9-({`kZWzw z=OeCrULPBaM$0ZO@#^Ollnk+>2~njEReBcfq*IVw4j>Iww$ZhvhH+kjwe*LET>wnm zWP|Fdd1PXZ-C9ajg-~Uheua3aw1yL>%;;^iKYS#5w4I)0QivR$`?QsHtZK+|SIfHx5r$XJ zzQ$W&5~XP?X&$RhOQ+;B<>JCL^J-1IRMM8zDdIv3(x`B8nEKrRgTQia4p8*@dl0UM zHS^vA{`95hU%KM?z5gA*hI^)O9#p$OSzbS`YJYK=y#;1?nX~2m6wdg`bai?*pU&s- zZu;@