data.search body removals

Author: afharo

examples/search_examples/public/search/app.tsx

@@ -181,13 +181,15 @@ export const SearchExamplesApp = ({
     const aggs = [{ type: metricAggType, params: { field: selectedNumericField!.name } }];
     const aggsDsl = data.search.aggs.createAggConfigs(dataView, aggs).toDsl();
 
+    const body = {
+      aggs: aggsDsl,
+      query,
+    };
+
     const req = {
       params: {
         index: dataView.title,
-        body: {
-          aggs: aggsDsl,
-          query,
-        },
+        ...body,
       },
       // Add a custom request parameter to be consumed by `MyStrategy`.
       ...(strategy ? { get_cool: getCool } : {}),
@@ -197,7 +199,7 @@ export const SearchExamplesApp = ({
     setAbortController(abortController);
 
     // Submit the search request using the `data.search` service.
-    setRequest(req.params.body);
+    setRequest(body);
     setRawResponse({});
     setWarningContents([]);
     setIsLoading(true);

examples/unified_doc_viewer/public/application.tsx

@@ -44,10 +44,8 @@ function UnifiedDocViewerExamplesApp({ data }: { data: DataPublicPluginStart })
         .search({
           params: {
             index: dataView?.getIndexPattern(),
-            body: {
-              fields: ['*'],
-              _source: false,
-            },
+            fields: ['*'],
+            _source: false,
           },
         })
         .toPromise();

packages/kbn-es-archiver/src/lib/indices/kibana_index.ts

@@ -166,7 +166,7 @@ export async function createDefaultSpace({ index, client }: { index: string; cli
       index,
       id: 'space:default',
       refresh: 'wait_for',
-      body: {
+      document: {
         type: 'space',
         updated_at: new Date().toISOString(),
         space: {

packages/kbn-es/src/utils/native_realm.js

@@ -27,9 +27,7 @@ exports.NativeRealm = class NativeRealm {
         await this._client.security.changePassword({
           username,
           refresh: 'wait_for',
-          body: {
-            password,
-          },
+          password,
         });
       } catch (err) {
         const isAnonymousUserPasswordChangeError =

packages/kbn-es/src/utils/native_realm.test.js

@@ -204,7 +204,7 @@ describe('setPassword', () => {
   it('sets password for provided user', async () => {
     await nativeRealm.setPassword('kibana_system', 'foo');
     expect(mockClient.security.changePassword).toHaveBeenCalledWith({
-      body: { password: 'foo' },
+      password: 'foo',
       refresh: 'wait_for',
       username: 'kibana_system',
     });

src/platform/packages/private/kbn-generate-csv/src/lib/search_cursor_pit.test.ts

@@ -101,10 +101,10 @@ describe('CSV Export Search Cursor', () => {
       expect(dataSearchSpy).toBeCalledTimes(1);
       expect(dataSearchSpy).toBeCalledWith(
         {
-          params: {
-            body: expect.objectContaining({ pit: { id: 'somewhat-pit-id', keep_alive: '10m' } }),
+          params: expect.objectContaining({
+            pit: { id: 'somewhat-pit-id', keep_alive: '10m' },
             max_concurrent_shard_requests: 5,
-          },
+          }),
         },
         expect.objectContaining({
           strategy: 'es',
@@ -160,14 +160,12 @@ describe('CSV Export Search Cursor', () => {
       expect(dataSearchSpy).toBeCalledWith(
         {
           params: {
-            body: {
-              fields: [],
-              pit: { id: 'somewhat-pit-id', keep_alive: '10m' },
-              query: { bool: { filter: [], must: [], must_not: [], should: [] } },
-              runtime_mappings: {},
-              script_fields: {},
-              stored_fields: ['*'],
-            },
+            fields: [],
+            pit: { id: 'somewhat-pit-id', keep_alive: '10m' },
+            query: { bool: { filter: [], must: [], must_not: [], should: [] } },
+            runtime_mappings: {},
+            script_fields: {},
+            stored_fields: ['*'],
             max_concurrent_shard_requests: undefined,
           },
         },

src/platform/packages/private/kbn-generate-csv/src/lib/search_cursor_pit.ts

@@ -80,7 +80,7 @@ export class SearchCursorPit extends SearchCursor {
 
     const searchParamsPit = {
       params: {
-        body: searchBody,
+        ...searchBody,
         max_concurrent_shard_requests: effectiveMaxConcurrentShardRequests,
       },
     };

src/platform/packages/private/kbn-generate-csv/src/lib/search_cursor_scroll.test.ts

@@ -80,13 +80,11 @@ describe('CSV Export Search Cursor', () => {
       expect(dataSearchSpy).toBeCalledWith(
         {
           params: {
-            body: {
-              fields: [],
-              query: { bool: { filter: [], must: [], must_not: [], should: [] } },
-              runtime_mappings: {},
-              script_fields: {},
-              stored_fields: ['*'],
-            },
+            fields: [],
+            query: { bool: { filter: [], must: [], must_not: [], should: [] } },
+            runtime_mappings: {},
+            script_fields: {},
+            stored_fields: ['*'],
             ignore_throttled: undefined,
             index: 'test-index-pattern-string',
             max_concurrent_shard_requests: 5,
@@ -135,13 +133,11 @@ describe('CSV Export Search Cursor', () => {
       expect(dataSearchSpy).toBeCalledWith(
         {
           params: {
-            body: {
-              fields: [],
-              query: { bool: { filter: [], must: [], must_not: [], should: [] } },
-              runtime_mappings: {},
-              script_fields: {},
-              stored_fields: ['*'],
-            },
+            fields: [],
+            query: { bool: { filter: [], must: [], must_not: [], should: [] } },
+            runtime_mappings: {},
+            script_fields: {},
+            stored_fields: ['*'],
             ignore_throttled: undefined,
             index: 'test-index-pattern-string',
             max_concurrent_shard_requests: undefined,

src/platform/packages/private/kbn-generate-csv/src/lib/search_cursor_scroll.ts

@@ -38,7 +38,7 @@ export class SearchCursorScroll extends SearchCursor {
 
     const searchParamsScan = {
       params: {
-        body: searchBody,
+        ...searchBody,
         index: this.indexPatternTitle,
         scroll: scroll.duration(taskInstanceFields),
         size: scroll.size,

src/platform/plugins/shared/data/server/search/strategies/ese_search/ese_search_strategy.test.ts

@@ -270,7 +270,7 @@ describe('ES search strategy', () => {
       it('sets wait_for_completion_timeout and keep_alive in the request', async () => {
         mockSubmitCaller.mockResolvedValueOnce(mockAsyncResponse);
 
-        const params = { index: 'foo-*', body: {} };
+        const params = { index: 'foo-*' };
         const esSearch = await enhancedEsSearchStrategyProvider(
           mockLegacyConfig$,
           mockSearchConfig,
@@ -288,7 +288,7 @@ describe('ES search strategy', () => {
       it('calls the rollup API if the index is a rollup type', async () => {
         mockApiCaller.mockResolvedValueOnce(mockRollupResponse);
 
-        const params = { index: 'foo-程', body: {} };
+        const params = { index: 'foo-程' };
         const esSearch = await enhancedEsSearchStrategyProvider(
           mockLegacyConfig$,
           mockSearchConfig,

src/platform/plugins/shared/discover/public/application/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts

@@ -124,21 +124,19 @@ async function fetchDocumentsTimeRange({
           index: dataView.getIndexPattern(),
           size: 0,
           track_total_hits: false,
-          body: {
-            timeout: '20s',
-            query: dslQuery ?? { match_all: {} },
-            aggs: {
-              earliest_timestamp: {
-                min: {
-                  field: dataView.timeFieldName,
-                  format: 'strict_date_optional_time',
-                },
+          timeout: '20s',
+          query: dslQuery ?? { match_all: {} },
+          aggs: {
+            earliest_timestamp: {
+              min: {
+                field: dataView.timeFieldName,
+                format: 'strict_date_optional_time',
               },
-              latest_timestamp: {
-                max: {
-                  field: dataView.timeFieldName,
-                  format: 'strict_date_optional_time',
-                },
+            },
+            latest_timestamp: {
+              max: {
+                field: dataView.timeFieldName,
+                format: 'strict_date_optional_time',
               },
             },
           },

src/platform/plugins/shared/unified_doc_viewer/public/hooks/use_es_doc_search.ts

@@ -76,7 +76,7 @@ export function useEsDocSearch({
         data.search.search({
           params: {
             index: dataView.getIndexPattern(),
-            body: buildSearchBody(id, index, dataView)?.body,
+            ...buildSearchBody(id, index, dataView),
           },
         })
       );

x-pack/platform/plugins/private/data_visualizer/public/application/common/hooks/use_document_count_stats.ts

@@ -111,7 +111,7 @@ export const getDocumentCountStatsRequest = (
   };
   return {
     index,
-    body: searchBody,
+    ...searchBody,
   };
 };