Skip to content

Commit

Permalink
revert changing executeJobFactory to synchronous
Browse files Browse the repository at this point in the history
  • Loading branch information
tsullivan committed Apr 2, 2020
1 parent 9ccee60 commit 1705882
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { createGenerateCsv } from './lib/generate_csv';

export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
JobDocPayloadDiscoverCsv
>> = function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
>> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
const config = reporting.getConfig();
const crypto = cryptoFactory(config.get('encryptionKey'));
const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { createGenerateCsv } from './lib';

export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
JobParamsPanelCsv
>> = function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
>> = async function executeJobFactoryFn(reporting: ReportingCore, parentLogger: Logger) {
const config = reporting.getConfig();
const crypto = cryptoFactory(config.get('encryptionKey'));
const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'execute-job']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { generatePngObservableFactory } from '../lib/generate_png';

type QueuedPngExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocPayloadPNG>>;

export const executeJobFactory: QueuedPngExecutorFactory = function executeJobFactoryFn(
export const executeJobFactory: QueuedPngExecutorFactory = async function executeJobFactoryFn(
reporting: ReportingCore,
parentLogger: Logger
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { generatePdfObservableFactory } from '../lib/generate_pdf';

type QueuedPdfExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocPayloadPDF>>;

export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFactoryFn(
export const executeJobFactory: QueuedPdfExecutorFactory = async function executeJobFactoryFn(
reporting: ReportingCore,
parentLogger: Logger
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export async function createWorkerFactory<JobParamsType>(
ImmediateExecuteFn<JobParamsType> | ESQueueWorkerExecuteFn<JobDocPayloadType>
>
>) {
const jobExecutor = exportType.executeJobFactory(reporting, logger);
const jobExecutor = await exportType.executeJobFactory(reporting, logger); // FIXME: does not "need" to be async
jobExecutors.set(exportType.jobType, jobExecutor);
}

Expand Down
3 changes: 1 addition & 2 deletions x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ export async function enqueueJobFactory(
throw new Error(`Export type ${exportTypeId} does not exist in the registry!`);
}

// TODO: the createJobFn should be unwrapped in the register method of the export types registry
const createJob = (await exportType.createJobFactory(reporting, logger)) as CreateJobFn;
const createJob = exportType.createJobFactory(reporting, logger) as CreateJobFn;
const payload = await createJob(jobParams, headers, request);

const options = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function registerGenerateCsvFromSavedObjectImmediate(
const logger = parentLogger.clone(['savedobject-csv']);
const jobParams = getJobParamsFromRequest(request, { isImmediate: true });
const createJobFn = createJobFactory(reporting, logger);
const executeJobFn = executeJobFactory(reporting, logger);
const executeJobFn = await executeJobFactory(reporting, logger); // FIXME: does not "need" to be async
const jobDocPayload: JobDocPayloadPanelCsv = await createJobFn(
jobParams,
request.headers,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/reporting/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export type CreateJobFactory<CreateJobFnType> = (
export type ExecuteJobFactory<ExecuteJobFnType> = (
reporting: ReportingCore,
logger: LevelLogger
) => ExecuteJobFnType;
) => Promise<ExecuteJobFnType>; // FIXME: does not "need" to be async

export interface ExportTypeDefinition<
JobParamsType,
Expand Down

0 comments on commit 1705882

Please sign in to comment.