From 7ac409a010eaea4f1cdb317a997e50c1f50c273d Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Fri, 15 Mar 2024 13:58:32 -0500
Subject: [PATCH] Remove duplicated es_archive thanks to new cypress task
 functionality

In #178724, we added the ability to retrieve archives from another
location (namely, where our FTR archives live). This allows me to delete
the duplicated archive specific for the cypress usage, and share the FTR
archive between both. Nice!
---
 .../event_correlation_rule.cy.ts              |  4 +-
 .../no_at_timestamp_field/data.json           | 38 -------------------
 .../no_at_timestamp_field/mappings.json       | 32 ----------------
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/data.json
 delete mode 100644 x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/mappings.json

diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/event_correlation_rule.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/event_correlation_rule.cy.ts
index 7b4c4a7ed86f8..17b767be45565 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/event_correlation_rule.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/event_correlation_rule.cy.ts
@@ -186,11 +186,11 @@ describe('EQL rules', { tags: ['@ess', '@serverless'] }, () => {
 
   describe('with source data requiring EQL overrides', () => {
     before(() => {
-      cy.task('esArchiverLoad', { archiveName: 'no_at_timestamp_field' });
+      cy.task('esArchiverLoad', { archiveName: 'no_at_timestamp_field', type: 'ftr' });
     });
 
     after(() => {
-      cy.task('esArchiverUnload', 'no_at_timestamp_field');
+      cy.task('esArchiverUnload', { archiveName: 'no_at_timestamp_field', type: 'ftr' });
     });
 
     it('includes EQL options in query validation', () => {
diff --git a/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/data.json b/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/data.json
deleted file mode 100644
index 3ee1387b01e5c..0000000000000
--- a/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/data.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": "no_at_timestamp_field",
-    "source": {
-      "locale": "pt",
-      "event.category": "configuration",
-      "event.ingested": 1608131778
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": "no_at_timestamp_field",
-    "source": {
-      "locale": "es",
-      "event.category": "configuration",
-      "event.ingested": 1608131778
-    },
-    "type": "_doc"
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": "no_at_timestamp_field",
-    "source": {
-      "locale": "ua",
-      "event.category": "configuration",
-      "event.ingested": 1608131779
-    },
-    "type": "_doc"
-  }
-}
diff --git a/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/mappings.json b/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/mappings.json
deleted file mode 100644
index 76f0aa8521fc3..0000000000000
--- a/x-pack/test/security_solution_cypress/es_archives/no_at_timestamp_field/mappings.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": "no_at_timestamp_field",
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "locale": {
-          "type": "keyword"
-        },
-        "event": {
-          "properties": {
-            "category": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "ingested": {
-              "type": "date",
-              "format": "epoch_second"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "1",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}