x-pack/oss_telemetry: use Elasticsearch from CoreStart

elastic · Mar 11, 2020 · 2260086 · 2260086
1 parent b0fbc85
commit 2260086
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/x-pack/plugins/oss_telemetry/server/lib/tasks/index.ts b/x-pack/plugins/oss_telemetry/server/lib/tasks/index.ts
@@ -17,26 +17,28 @@ import {
 export function registerTasks({
   taskManager,
   logger,
-  elasticsearch,
+  getStartServices,
   config,
 }: {
   taskManager?: TaskManagerSetupContract;
   logger: Logger;
-  elasticsearch: CoreSetup['elasticsearch'];
+  getStartServices: CoreSetup['getStartServices'];
   config: Observable<{ kibana: { index: string } }>;
 }) {
   if (!taskManager) {
     logger.debug('Task manager is not available');
     return;
   }
 
+  const esClientPromise = getStartServices().then(([{ elasticsearch }]) => elasticsearch.client);
+
   taskManager.registerTaskDefinitions({
     [VIS_TELEMETRY_TASK]: {
       title: 'X-Pack telemetry calculator for Visualizations',
       type: VIS_TELEMETRY_TASK,
       createTaskRunner({ taskInstance }: { taskInstance: TaskInstance }) {
         return {
-          run: visualizationsTaskRunner(taskInstance, config, elasticsearch),
+          run: visualizationsTaskRunner(taskInstance, config, esClientPromise),
         };
       },
     },

diff --git a/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts b/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
@@ -6,7 +6,7 @@
 
 import { Observable } from 'rxjs';
 import _, { countBy, groupBy, mapValues } from 'lodash';
-import { APICaller, CoreSetup } from 'kibana/server';
+import { APICaller, CoreSetup, CoreStart } from 'kibana/server';
 import { getNextMidnight } from '../../get_next_midnight';
 import { TaskInstance } from '../../../../../task_manager/server';
 import { ESSearchHit } from '../../../../../apm/typings/elasticsearch';
@@ -73,17 +73,15 @@ async function getStats(callCluster: APICaller, index: string) {
 export function visualizationsTaskRunner(
   taskInstance: TaskInstance,
   config: Observable<{ kibana: { index: string } }>,
-  es: CoreSetup['elasticsearch']
+  esClientPromise: Promise<CoreStart['elasticsearch']['client']>
 ) {
-  const { callAsInternalUser: callCluster } = es.createClient('data');
-
   return async () => {
     let stats;
     let error;
 
     try {
       const index = (await config.toPromise()).kibana.index;
-      stats = await getStats(callCluster, index);
+      stats = await getStats((await esClientPromise).callAsInternalUser, index);
     } catch (err) {
       if (err.constructor === Error) {
         error = err.message;

diff --git a/x-pack/plugins/oss_telemetry/server/test_utils/index.ts b/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, CoreSetup } from 'kibana/server';
+import { APICaller, CoreSetup, CoreStart } from 'kibana/server';
 
 import { of } from 'rxjs';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { elasticsearchServiceMock } from 'src/core/server/mocks';
 import {
   ConcreteTaskInstance,
   TaskStatus,
@@ -43,10 +45,11 @@ const defaultMockSavedObjects = [
 
 const defaultMockTaskDocs = [getMockTaskInstance()];
 
-export const getMockEs = (mockCallWithInternal: APICaller = getMockCallWithInternal()) =>
-  (({
-    createClient: () => ({ callAsInternalUser: mockCallWithInternal }),
-  } as unknown) as CoreSetup['elasticsearch']);
+export const getMockEs = async (mockCallWithInternal: APICaller = getMockCallWithInternal()) => {
+  const client = elasticsearchServiceMock.createClusterClient();
+  (client.callAsInternalUser as any) = mockCallWithInternal;
+  return client;
+};
 
 export const getMockCallWithInternal = (hits: unknown[] = defaultMockSavedObjects): APICaller => {
   return ((() => {