getSavedObjectsClient may be null, specifically during tests

jloleysens · Nov 12, 2019 · 1b229f5 · 1b229f5
1 parent c0d123a
commit 1b229f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/routes/create_request_shim.ts b/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/routes/create_request_shim.ts
@@ -12,6 +12,6 @@ export const createRequestShim = (req: Request): RequestShim => {
     headers: req.headers,
     payload: req.payload,
     params: req.params,
-    getSavedObjectsClient: req.getSavedObjectsClient.bind(req),
+    getSavedObjectsClient: req.getSavedObjectsClient ? req.getSavedObjectsClient.bind(req) : null,
   };
 };
diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/routes/reindex_indices.ts b/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/routes/reindex_indices.ts
@@ -73,6 +73,10 @@ export function registerReindexIndicesRoutes(
     },
     async handler(request) {
       const reqShim = createRequestShim(request);
+      if (!reqShim.getSavedObjectsClient) {
+        // May be null under certain conditions, probably in tests.
+        throw new Error('Could not find SavedObjectsClient getter.');
+      }
       const client = reqShim.getSavedObjectsClient();
       const { indexName } = reqShim.params;
       const callCluster = callWithRequest.bind(null, reqShim) as CallCluster;

diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/types.ts b/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/types.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Legacy } from 'kibana';
+import { SavedObjectsClientContract } from 'kibana/server';
 import { ServerRoute } from 'hapi';
 import { ElasticsearchPlugin } from 'src/legacy/core_plugins/elasticsearch';
 import { XPackMainPlugin } from '../../../xpack_main/xpack_main';
@@ -31,5 +32,5 @@ export interface RequestShim {
   headers: { [key: string]: string };
   payload: any;
   params: any;
-  getSavedObjectsClient: any;
+  getSavedObjectsClient: (() => SavedObjectsClientContract) | null;
 }