From 7fc746a203dd7063e5bb898d0c5f62ae517fc9f3 Mon Sep 17 00:00:00 2001
From: Lukas Olson <lukas@elastic.co>
Date: Fri, 3 Nov 2023 16:46:59 -0700
Subject: [PATCH] Add API integration test

---
 .../ese_search/ese_search_strategy.ts         |  5 +-
 .../api_integration/apis/search/search.ts     | 65 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index 97a1716850858..131cb4691af65 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -57,7 +57,10 @@ export const enhancedEsSearchStrategyProvider = (
 
     const search = async () => {
       const params = id
-        ? getDefaultAsyncGetParams(searchConfig, options)
+        ? {
+            ...getDefaultAsyncGetParams(searchConfig, options),
+            ...request.params,
+          }
         : {
             ...(await getDefaultAsyncSubmitParams(uiSettingsClient, searchConfig, options)),
             ...request.params,
diff --git a/x-pack/test/api_integration/apis/search/search.ts b/x-pack/test/api_integration/apis/search/search.ts
index 391923601d7c5..976c9339d0c82 100644
--- a/x-pack/test/api_integration/apis/search/search.ts
+++ b/x-pack/test/api_integration/apis/search/search.ts
@@ -186,6 +186,71 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resp2.body.isRunning).to.be(true);
       });
 
+      it('should cancel an async search without server crash', async function () {
+        await markRequiresShardDelayAgg(this);
+
+        const resp = await supertest
+          .post(`/internal/search/ese`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+          .set('kbn-xsrf', 'foo')
+          .send({
+            params: {
+              body: {
+                query: {
+                  match_all: {},
+                },
+                ...shardDelayAgg('10s'),
+              },
+              wait_for_completion_timeout: '1ms',
+            },
+          })
+          .expect(200);
+
+        const { id } = resp.body;
+        expect(id).not.to.be(undefined);
+        expect(resp.body.isPartial).to.be(true);
+        expect(resp.body.isRunning).to.be(true);
+
+        // Send a follow-up request that waits up to 10s for completion
+        const req = supertest
+          .post(`/internal/search/ese/${id}`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+          .set('kbn-xsrf', 'foo')
+          .send({ params: { wait_for_completion_timeout: '10s' } })
+          .expect(200);
+
+        // After 2s, abort and send the cancellation (to result in a race towards cancellation)
+        // This should be swallowed and not kill the Kibana server
+        await new Promise((resolve) =>
+          setTimeout(() => {
+            req.abort();
+            resolve(null);
+          }, 2000)
+        );
+        await supertest
+          .delete(`/internal/search/ese/${id}`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+          .set('kbn-xsrf', 'foo')
+          .expect(200);
+
+        let err: Error;
+        try {
+          await req;
+        } catch (e) {
+          err = e;
+        }
+
+        expect(err).not.to.be(undefined);
+
+        // Ensure the search was succesfully cancelled
+        await supertest
+          .post(`/internal/search/ese/${id}`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+          .set('kbn-xsrf', 'foo')
+          .send({})
+          .expect(404);
+      });
+
       it('should fail without kbn-xref header', async () => {
         const resp = await supertest
           .post(`/internal/search/ese`)