fix oss telemetry tests

elastic · Nov 20, 2019 · a6c905b · a6c905b
1 parent d63a190
commit a6c905b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/...cy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.test.ts b/...cy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.test.ts
@@ -44,13 +44,11 @@ describe('getVisualizationsCollector#fetch', () => {
     // In real life, the CollectorSet calls fetch and handles errors
     test('defers the errors', async () => {
       const mockTaskFetch = jest.fn(() => {
-        return Promise.reject(Error('BOOM'));
+        throw new Error('BOOM');
       });
 
       const { fetch } = getUsageCollector(getMockTaskManager(mockTaskFetch));
-      await expect(async () => {
-        await fetch();
-      }).rejects.toEqual({ message: 'BOOM' });
+      await expect(fetch()).rejects.toThrowErrorMatchingInlineSnapshot(`"BOOM"`);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts
@@ -9,6 +9,8 @@ import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../
 import { PLUGIN_ID, VIS_TELEMETRY_TASK } from '../../../constants';
 import { visualizationsTaskRunner } from './visualizations/task_runner';
 import KbnServer from '../../../../../../../src/legacy/server/kbn_server';
+import { LegacyConfig } from '../../plugin';
+import { TaskInstance } from '../../../../task_manager';
 
 export function registerTasks({
   taskManager,
@@ -19,7 +21,7 @@ export function registerTasks({
   taskManager?: TaskManagerPluginSetupContract;
   logger: Logger;
   elasticsearch: CoreSetup['elasticsearch'];
-  config: any;
+  config: LegacyConfig;
 }) {
   if (!taskManager) {
     logger.debug('Task manager is not available');
@@ -30,7 +32,7 @@ export function registerTasks({
     [VIS_TELEMETRY_TASK]: {
       title: 'X-Pack telemetry calculator for Visualizations',
       type: VIS_TELEMETRY_TASK,
-      createTaskRunner({ taskInstance }: { taskInstance: any }) {
+      createTaskRunner({ taskInstance }: { taskInstance: TaskInstance }) {
         return {
           run: visualizationsTaskRunner(taskInstance, config, elasticsearch),
         };

diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
@@ -10,6 +10,7 @@ import { getNextMidnight } from '../../get_next_midnight';
 import { VisState } from '../../../../../../../../src/legacy/core_plugins/visualizations/public';
 import { TaskInstance } from '../../../../../task_manager';
 import { ESSearchHit } from '../../../../../apm/typings/elasticsearch';
+import { LegacyConfig } from '../../../plugin';
 
 interface VisSummary {
   type: string;
@@ -72,7 +73,7 @@ async function getStats(callCluster: APICaller, index: string) {
 
 export function visualizationsTaskRunner(
   taskInstance: TaskInstance,
-  config: any,
+  config: LegacyConfig,
   es: CoreSetup['elasticsearch']
 ) {
   const { callAsInternalUser: callCluster } = es.createClient('data');

diff --git a/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts b/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts
@@ -17,6 +17,10 @@ interface UsageCollectorDefinition {
   fetch(): Promise<any>;
 }
 
+export interface LegacyConfig {
+  get: (key: string) => string | number | boolean;
+}
+
 export interface OssTelemetrySetupDependencies {
   __LEGACY: {
     telemetry: {
@@ -25,7 +29,7 @@ export interface OssTelemetrySetupDependencies {
         register(collector: UsageCollector): void;
       };
     };
-    config: any;
+    config: LegacyConfig;
     xpackMainStatus: { kbnServer: KbnServer };
   };
   taskManager?: TaskManagerPluginSetupContract;

diff --git a/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts b/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { APICaller, CoreSetup } from 'kibana/server';
 
 import { TaskInstance } from '../../task_manager';
 import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/plugin';
@@ -27,15 +27,15 @@ const defaultMockSavedObjects = [
 
 const defaultMockTaskDocs = [getMockTaskInstance()];
 
-export const getMockEs = (mockCallWithInternal: any = getMockCallWithInternal()) =>
+export const getMockEs = (mockCallWithInternal: APICaller = getMockCallWithInternal()) =>
   (({
     createClient: () => ({ callAsInternalUser: mockCallWithInternal }),
   } as unknown) as CoreSetup['elasticsearch']);
 
-export const getMockCallWithInternal = (hits: any[] = defaultMockSavedObjects) => {
-  return (): Promise<any> => {
+export const getMockCallWithInternal = (hits: unknown[] = defaultMockSavedObjects): APICaller => {
+  return ((() => {
     return Promise.resolve({ hits: { hits } });
-  };
+  }) as unknown) as APICaller;
 };
 
 export const getMockTaskFetch = (docs: TaskInstance[] = defaultMockTaskDocs) => {
@@ -50,8 +50,8 @@ export const getMockConfig = () => {
 
 export const getMockTaskManager = (fetch: any = getMockTaskFetch()) =>
   (({
-    registerTaskDefinitions: (opts: any) => undefined,
-    ensureScheduled: (opts: any) => Promise.resolve(),
+    registerTaskDefinitions: () => undefined,
+    ensureScheduled: () => Promise.resolve(),
     fetch,
   } as unknown) as TaskManagerPluginSetupContract);