Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Aug 14, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e48bbcb
[Reporting] Update more Server Types for TaskManager (#74915)
tsullivan Aug 13, 2020
b13ec0e
Merge branch '7.x' into backport/7.x/pr-74915
tsullivan Aug 14, 2020
0d46f00
fix test
tsullivan Aug 14, 2020
37cbdbc
Merge branch '7.x' into backport/7.x/pr-74915
tsullivan Aug 14, 2020
aa25f23
fix test
tsullivan Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions x-pack/plugins/reporting/server/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -36,7 +35,6 @@ export interface ReportingInternalSetup {

export interface ReportingInternalStart {
browserDriverFactory: HeadlessChromiumDriverFactory;
enqueueJob: EnqueueJobFn;
esqueue: ESQueueInstance;
store: ReportingStore;
savedObjects: SavedObjectsServiceStart;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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$
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/reporting/server/export_types/csv/create_job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading