[Reporting] Re-delete a file

tsullivan · tsullivan · commit 4f94cb7f2c4e · 2020-07-14T15:30:10.000-07:00
...that was accidentally recovered due to incorrect manual merge
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/execute_job.ts
@@ -10,7 +10,6 @@ import { CONTENT_TYPE_CSV, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common
 import { RunTaskFnFactory, ScheduledTaskParams, TaskRunResult } from '../../types';
 import { createGenerateCsv } from '../csv/generate_csv';
 import { JobParamsPanelCsv, SearchPanel } from './types';
-import { getFakeRequest } from './lib/get_fake_request';
 import { getGenerateCsvParams } from './lib/get_csv_job';
 
 /*
@@ -44,19 +43,10 @@ export const runTaskFnFactory: RunTaskFnFactory<ImmediateExecuteFn> = function e
     const { jobParams } = jobPayload;
     const jobLogger = logger.clone([jobId === null ? 'immediate' : jobId]);
     const generateCsv = createGenerateCsv(jobLogger);
-    const { isImmediate, panel, visType } = jobParams as JobParamsPanelCsv & {
-      panel: SearchPanel;
-    };
+    const { panel, visType } = jobParams as JobParamsPanelCsv & { panel: SearchPanel };
 
     jobLogger.debug(`Execute job generating [${visType}] csv`);
 
-    if (isImmediate && req) {
-      jobLogger.info(`Executing job from Immediate API using request context`);
-    } else {
-      jobLogger.info(`Executing job async using encrypted headers`);
-      req = await getFakeRequest(jobPayload, config.get('encryptionKey')!, jobLogger);
-    }
-
     const savedObjectsClient = context.core.savedObjects.client;
 
     const uiConfig = await reporting.getUiSettingsServiceFactory(savedObjectsClient);
diff --git a/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/lib/get_fake_request.ts b/x-pack/plugins/reporting/server/export_types/csv_from_savedobject/lib/get_fake_request.ts
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12381,8 +12381,6 @@
     "xpack.reporting.errorButton.unableToGenerateReportTitle": "レポートを生成できません",
     "xpack.reporting.exportTypes.common.failedToDecryptReportJobDataErrorMessage": "レポートジョブデータの解読に失敗しました。{encryptionKey}が設定されていることを確認してこのレポートを再生成してください。{err}",
     "xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage": "ジョブヘッダーがありません",
-    "xpack.reporting.exportTypes.csv_from_savedobject.executeJob.failedToDecryptReportJobDataErrorMessage": "レポートジョブデータの解読に失敗しました{encryptionKey} が設定されていることを確認してこのレポートを再生成してください。{err}",
-    "xpack.reporting.exportTypes.csv_from_savedobject.executeJob.missingJobHeadersErrorMessage": "ジョブヘッダーがありません",
     "xpack.reporting.exportTypes.csv.executeJob.dateFormateSetting": "Kibana の高度な設定「{dateFormatTimezone}」が「ブラウザー」に設定されていますあいまいさを避けるために日付は UTC 形式に変換されます。",
     "xpack.reporting.exportTypes.csv.executeJob.failedToDecryptReportJobDataErrorMessage": "レポートジョブデータの解読に失敗しました{encryptionKey} が設定されていることを確認してこのレポートを再生成してください。{err}",
     "xpack.reporting.exportTypes.csv.executeJob.missingJobHeadersErrorMessage": "ジョブヘッダーがありません",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12387,8 +12387,6 @@
     "xpack.reporting.errorButton.unableToGenerateReportTitle": "无法生成报告",
     "xpack.reporting.exportTypes.common.failedToDecryptReportJobDataErrorMessage": "无法解密报告作业数据。请确保已设置 {encryptionKey}，然后重新生成此报告。{err}",
     "xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage": "作业标头缺失",
-    "xpack.reporting.exportTypes.csv_from_savedobject.executeJob.failedToDecryptReportJobDataErrorMessage": "无法解密报告作业数据。请确保已设置 {encryptionKey}，然后重新生成此报告。{err}",
-    "xpack.reporting.exportTypes.csv_from_savedobject.executeJob.missingJobHeadersErrorMessage": "作业标头缺失",
     "xpack.reporting.exportTypes.csv.executeJob.dateFormateSetting": "Kibana 高级设置“{dateFormatTimezone}”已设置为“浏览器”。日期将格式化为 UTC 以避免混淆。",
     "xpack.reporting.exportTypes.csv.executeJob.failedToDecryptReportJobDataErrorMessage": "无法解密报告作业数据。请确保已设置 {encryptionKey}，然后重新生成此报告。{err}",
     "xpack.reporting.exportTypes.csv.executeJob.missingJobHeadersErrorMessage": "作业标头缺失",
