[7.x] [Reporting] Update more Server Types for TaskManager (#74915) (#…

…75003) * [Reporting] Update more Server Types for TaskManager (#74915) * [Reporting] Update more Server Types for TaskManager * remove some task manager references * more strict * more strict 2 * simplify * fix test * fix test * routing validation unused types cleanup * remove more casting in route handlers * feedback changes * original comment was fine Co-authored-by: Elastic Machine <[email protected]> # Conflicts: # x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts # x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts # x-pack/plugins/reporting/server/lib/store/store.ts * fix test * fix test
elastic · Aug 14, 2020 · 304f9d2 · 304f9d2
1 parent 3199af1
commit 304f9d2
Show file tree

Hide file tree

Showing 38 changed files with 780 additions and 415 deletions.
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
@@ -23,7 +23,6 @@ import { HeadlessChromiumDriverFactory } from './browsers/chromium/driver_factor
 import { screenshotsObservableFactory } from './lib/screenshots';
 import { checkLicense, getExportTypesRegistry } from './lib';
 import { ESQueueInstance } from './lib/create_queue';
-import { EnqueueJobFn } from './lib/enqueue_job';
 import { ReportingStore } from './lib/store';
 
 export interface ReportingInternalSetup {
@@ -36,7 +35,6 @@ export interface ReportingInternalSetup {
 
 export interface ReportingInternalStart {
   browserDriverFactory: HeadlessChromiumDriverFactory;
-  enqueueJob: EnqueueJobFn;
   esqueue: ESQueueInstance;
   store: ReportingStore;
   savedObjects: SavedObjectsServiceStart;
@@ -115,7 +113,7 @@ export class ReportingCore {
   /*
    * Gives async access to the startDeps
    */
-  private async getPluginStartDeps() {
+  public async getPluginStartDeps() {
     if (this.pluginStartDeps) {
       return this.pluginStartDeps;
     }
@@ -131,10 +129,6 @@ export class ReportingCore {
     return (await this.getPluginStartDeps()).esqueue;
   }
 
-  public async getEnqueueJob() {
-    return (await this.getPluginStartDeps()).enqueueJob;
-  }
-
   public async getLicenseInfo() {
     const { licensing } = this.getPluginSetupDeps();
     return await licensing.license$

diff --git a/x-pack/plugins/reporting/server/export_types/csv/create_job.ts b/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
@@ -5,10 +5,10 @@
  */
 
 import { cryptoFactory } from '../../lib';
-import { ESQueueCreateJobFn, ScheduleTaskFnFactory } from '../../types';
+import { CreateJobFn, ScheduleTaskFnFactory } from '../../types';
 import { JobParamsDiscoverCsv } from './types';
 
-export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
+export const scheduleTaskFnFactory: ScheduleTaskFnFactory<CreateJobFn<
   JobParamsDiscoverCsv
 >> = function createJobFactoryFn(reporting) {
   const config = reporting.getConfig();