wip

elastic · Apr 13, 2021 · 1ea7325 · 1ea7325
1 parent fb482fc
commit 1ea7325
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/src/plugins/data/public/search/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor.test.ts
@@ -136,7 +136,7 @@ describe('SearchInterceptor', () => {
         await searchInterceptor.search(mockRequest, { sessionId }).toPromise();
         expect(fetchMock.mock.calls[0][0]).toEqual(
           expect.objectContaining({
-            options: { sessionId, isStored: true, isRestore: true },
+            options: { sessionId, isStored: true, isRestore: true, strategy: 'es' },
           })
         );
 

diff --git a/src/plugins/data/server/search/session/session_service.ts b/src/plugins/data/server/search/session/session_service.ts
@@ -45,7 +45,7 @@ export class SearchSessionService implements ISearchSessionService {
         throw new Error('delete not implemented in OSS search session service');
       },
       getConfig: () => {
-        return null;
+        throw new Error('getConfig not implemented in OSS search session service');
       },
     });
   }

diff --git a/src/plugins/data/server/search/session/types.ts b/src/plugins/data/server/search/session/types.ts
@@ -32,7 +32,7 @@ export interface IScopedSearchSessionsClient<T = unknown> {
   cancel: (sessionId: string) => Promise<{}>;
   delete: (sessionId: string) => Promise<{}>;
   extend: (sessionId: string, expires: Date) => Promise<SavedObjectsUpdateResponse<T>>;
-  getConfig: () => SearchSessionsConfigSchema | null;
+  getConfig: () => SearchSessionsConfigSchema;
 }
 
 export interface ISearchSessionService<T = unknown> {

diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
@@ -31,7 +31,7 @@ export async function getIgnoreThrottled(
  */
 export async function getDefaultAsyncSubmitParams(
   uiSettingsClient: IUiSettingsClient,
-  searchSessionsConfig: SearchSessionsConfigSchema | null,
+  searchSessionsConfig: SearchSessionsConfigSchema,
   options: ISearchOptions
 ): Promise<
   Pick<
@@ -54,9 +54,7 @@ export async function getDefaultAsyncSubmitParams(
     ...(await getDefaultSearchParams(uiSettingsClient)),
     ...(options.sessionId
       ? {
-          keep_alive: searchSessionsConfig
-            ? `${searchSessionsConfig.defaultExpiration.asMilliseconds()}ms`
-            : '1m',
+          keep_alive: `${searchSessionsConfig.defaultExpiration.asMilliseconds()}ms`,
         }
       : {}),
   };