From 0833542eef17f56441fc69842e9fae104f1b654f Mon Sep 17 00:00:00 2001
From: "Devin W. Hurley" <devin.hurley@elastic.co>
Date: Tue, 22 Jun 2021 19:49:24 -0400
Subject: [PATCH] removes reference to esArchiver key in config and updates
 path of esArchiver data (#16)

---
 x-pack/test/rule_registry/common/config.ts           |  1 -
 .../security_and_spaces/tests/basic/get_alerts.ts    |  2 +-
 .../security_and_spaces/tests/basic/update_alert.ts  | 12 ++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/x-pack/test/rule_registry/common/config.ts b/x-pack/test/rule_registry/common/config.ts
index 1ed85da86036583..0e2b1220eaa05a7 100644
--- a/x-pack/test/rule_registry/common/config.ts
+++ b/x-pack/test/rule_registry/common/config.ts
@@ -61,7 +61,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       junit: {
         reportName: 'X-Pack Case API Integration Tests',
       },
-      esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'),
       esTestCluster: {
         ...xPackApiIntegrationTestsConfig.get('esTestCluster'),
         license,
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts
index fde6b3358d00e4b..62aec9f15b56556 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts
@@ -52,7 +52,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('rbac', () => {
     before(async () => {
-      await esArchiver.load('rule_registry/alerts');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_registry/alerts');
     });
     describe('Users:', () => {
       it(`${superUser.username} should be able to access the APM alert in ${SPACE1}`, async () => {
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts
index c0d237ab70634d4..e091de5a0098b3b 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts
@@ -45,10 +45,10 @@ export default ({ getService }: FtrProviderContext) => {
   describe('rbac', () => {
     describe('Users update:', () => {
       beforeEach(async () => {
-        await esArchiver.load('rule_registry/alerts');
+        await esArchiver.load('x-pack/test/functional/es_archives/rule_registry/alerts');
       });
       afterEach(async () => {
-        await esArchiver.unload('rule_registry/alerts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/rule_registry/alerts');
       });
       it(`${superUser.username} should be able to update the APM alert in ${SPACE1}`, async () => {
         const apmIndex = await getAPMIndexName(superUser);
@@ -56,7 +56,7 @@ export default ({ getService }: FtrProviderContext) => {
           .post(`${getSpaceUrlPrefix(SPACE1)}${TEST_URL}`)
           .auth(superUser.username, superUser.password)
           .set('kbn-xsrf', 'true')
-          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', indexName: apmIndex })
+          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', index: apmIndex })
           .expect(200);
       });
 
@@ -66,7 +66,7 @@ export default ({ getService }: FtrProviderContext) => {
           .post(`${getSpaceUrlPrefix(SPACE1)}${TEST_URL}`)
           .auth(obsOnlySpacesAll.username, obsOnlySpacesAll.password)
           .set('kbn-xsrf', 'true')
-          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', indexName: apmIndex })
+          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', index: apmIndex })
           .expect(200);
       });
       it(`${obsOnlyReadSpacesAll.username} should NOT be able to update the APM alert in ${SPACE1}`, async () => {
@@ -75,7 +75,7 @@ export default ({ getService }: FtrProviderContext) => {
           .post(`${getSpaceUrlPrefix(SPACE1)}${TEST_URL}`)
           .auth(obsOnlyReadSpacesAll.username, obsOnlyReadSpacesAll.password)
           .set('kbn-xsrf', 'true')
-          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', indexName: apmIndex })
+          .send({ ids: ['NoxgpHkBqbdrfX07MqXV'], status: 'closed', index: apmIndex })
           .expect(403);
       });
 
@@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => {
             .send({
               ids: ['NoxgpHkBqbdrfX07MqXV'],
               status: 'closed',
-              indexName: apmIndex,
+              index: apmIndex,
             })
             .expect(403);
         });