Ensure EQL works with RCS (#94265)

The PR allows EQL read action to work with new RCS. It also updates the common CCS test suite to include existing EQL yaml tests. Relates: #93720
elastic · Mar 8, 2023 · a96ffea · a96ffea
1 parent 7c342f1
commit a96ffea
Show file tree

Hide file tree

Showing 6 changed files with 640 additions and 2 deletions.
diff --git a/qa/ccs-common-rest/build.gradle b/qa/ccs-common-rest/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'elasticsearch.internal-yaml-rest-test'
 restResources {
   restApi {
     include '_common', 'bulk', 'count', 'cluster', 'field_caps', 'knn_search', 'index', 'indices', 'msearch',
-      'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt'
+      'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt', 'eql'
   }
   restTests {
     includeCore 'field_caps', 'msearch', 'search', 'suggest', 'scroll', "indices.resolve_index"
@@ -27,6 +27,7 @@ dependencies {
   clusterModules project(':x-pack:plugin:analytics')
   clusterModules project(':x-pack:plugin:vector-tile')
   clusterModules project(':modules:legacy-geo')
+  clusterModules project(':x-pack:plugin:eql')
 }
 
 tasks.named("yamlRestTest") {

diff --git a/...rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java b/...rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java
@@ -75,6 +75,7 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
         .module("mapper-extras")
         .module("vector-tile")
         .module("x-pack-analytics")
+        .module("x-pack-eql")
         .setting("xpack.security.enabled", "false")
         // geohex_grid requires gold license
         .setting("xpack.license.self_generated.type", "trial")
@@ -111,6 +112,10 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
         "async_search.get",
         "async_search.status",
         "async_search.delete",
+        "eql.search",
+        "eql.get",
+        "eql.get_status",
+        "eql.delete",
         "open_point_in_time",
         "close_point_in_time"
     );
@@ -350,6 +355,9 @@ private boolean shouldReplaceIndexWithRemote(String apiName) {
                 || apiName.equals("async_search.get")
                 || apiName.equals("async_search.delete")
                 || apiName.equals("async_search.status")
+                || apiName.equals("eql.get")
+                || apiName.equals("eql.get_status")
+                || apiName.equals("eql.delete")
                 || apiName.equals("close_point_in_time")) {
                 return false;
             }

diff --git a/...t/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java b/...t/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java
@@ -72,6 +72,7 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
         .module("analysis-common")
         .module("vector-tile")
         .module("x-pack-analytics")
+        .module("x-pack-eql")
         .setting("xpack.license.self_generated.type", "trial")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.security.transport.ssl.enabled", "false")