Fix APM setup_request tests

elastic · Dec 4, 2019 · 85fae62 · 85fae62
1 parent 79051b0
commit 85fae62
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
@@ -78,7 +78,7 @@ async function getParamsForSearchRequest(
 ) {
   const { uiSettings } = context.core;
   const [indices, includeFrozen] = await Promise.all([
-    getApmIndices(context.core, context.config),
+    getApmIndices(context.core.savedObjects.client, context.config),
     uiSettings.client.get('search:includeFrozen')
   ]);
 

diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -50,6 +50,11 @@ function getMockRequest() {
         client: {
           get: jest.fn().mockResolvedValue(false)
         }
+      },
+      savedObjects: {
+        client: {
+          get: jest.fn()
+        }
       }
     }
   } as unknown) as APMRequestHandlerContext & {
@@ -65,6 +70,11 @@ function getMockRequest() {
           get: jest.Mock<any, any>;
         };
       };
+      savedObjects: {
+        client: {
+          get: jest.Mock<any, any>;
+        };
+      };
     };
   };
 

diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
@@ -70,10 +70,10 @@ export async function setupRequest<TParams extends SetupRequestParams>(
   context: APMRequestHandlerContext<TParams>,
   request: KibanaRequest
 ): Promise<InferSetup<TParams>> {
-  const { config, core } = context;
+  const { config } = context;
   const { query } = context.params;
 
-  const indices = await getApmIndices(core.savedObjects.client, config);
+  const indices = await getApmIndices(context.core.savedObjects.client, config);
 
   const dynamicIndexPattern = await getDynamicIndexPattern({
     context,