[ES body removal] @elastic/security-generative-ai (#204859)

elastic · Jan 21, 2025 · db6a1b0 · db6a1b0
1 parent adb6cde
commit db6a1b0
Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/...lutions/security/plugins/elastic_assistant/server/ai_assistant_data_clients/index.test.ts b/...lutions/security/plugins/elastic_assistant/server/ai_assistant_data_clients/index.test.ts
@@ -80,12 +80,10 @@ describe('AIAssistantDataClient', () => {
       });
       const reader = await assistantConversationsDataClient.getReader();
       const query = { query: { bool: { filter: { range: { '@timestamp': { gte: 0 } } } } } };
-      await reader.search({
-        body: query,
-      });
+      await reader.search(query);
 
       expect(clusterClient.search).toHaveBeenCalledWith({
-        body: query,
+        ...query,
         ignore_unavailable: true,
         index: '.kibana-elastic-ai-assistant-conversations-default',
         seq_no_primary_term: true,
@@ -102,11 +100,9 @@ describe('AIAssistantDataClient', () => {
       const reader = await assistantConversationsDataClient.getReader();
       const query = { query: { bool: { filter: { range: { '@timestamp': { gte: 0 } } } } } };
 
-      await expect(
-        reader.search({
-          body: query,
-        })
-      ).rejects.toThrowErrorMatchingInlineSnapshot(`"something went wrong!"`);
+      await expect(reader.search(query)).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"something went wrong!"`
+      );
 
       expect(logger.error).toHaveBeenCalledWith(
         `Error performing search in AIAssistantDataClient - something went wrong!`

diff --git a/...curity/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts b/...curity/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts
@@ -9,6 +9,7 @@ import {
   MlTrainedModelDeploymentNodesStats,
   MlTrainedModelStats,
   SearchTotalHits,
+  QueryDslQueryContainer,
 } from '@elastic/elasticsearch/lib/api/types';
 import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { KibanaRequest } from '@kbn/core-http-server';
@@ -23,7 +24,6 @@ import {
   Metadata,
 } from '@kbn/elastic-assistant-common';
 import pRetry from 'p-retry';
-import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { StructuredTool } from '@langchain/core/tools';
 import { AnalyticsServiceSetup, AuditLogger, ElasticsearchClient } from '@kbn/core/server';
 import { IndexPatternsFetcher } from '@kbn/data-views-plugin/server';

diff --git a/...ck/solutions/security/plugins/elastic_assistant/server/ai_assistant_service/index.test.ts b/...ck/solutions/security/plugins/elastic_assistant/server/ai_assistant_service/index.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
-import { IndicesGetDataStreamResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IndicesGetDataStreamResponse } from '@elastic/elasticsearch/lib/api/types';
 import { errors as EsErrors } from '@elastic/elasticsearch';
 import { ReplaySubject, Subject } from 'rxjs';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';