[Reporting/Legacy] Remove reporting legacy job params compatibility s…

…himmy shim shim
elastic · Dec 12, 2019 · d2cbb51 · d2cbb51
1 parent 8e3fc6f
commit d2cbb51
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 666 deletions.
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -71,11 +71,7 @@ test(`fails if URLs are file-protocols for PDF`, async () => {
   await expect(
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
@@ -92,11 +88,7 @@ test(`fails if URLs are absolute for PDF`, async () => {
   await expect(
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
@@ -108,28 +100,21 @@ test(`fails if URLs are absolute for PDF`, async () => {
 
 test(`fails if any URLs are absolute or file's for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const objects = [
-    {
-      relativeUrl: '/app/kibana#/something_aaa',
-    },
-    {
-      relativeUrl:
-        'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
-    },
-    {
-      relativeUrl: 'file://etc/passwd/#/something',
-    },
+  const relativeUrls = [
+    '/app/kibana#/something_aaa',
+    'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
+    'file://etc/passwd/#/something',
   ];
   await expect(
     getFullUrls({
       job: {
-        objects,
+        relativeUrls,
         forceNow,
       },
       server: mockServer,
     } as FullUrlsOpts)
   ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${objects[1].relativeUrl} ${objects[2].relativeUrl}]`
+    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrls[1]} ${relativeUrls[2]}]`
   );
 });
 
@@ -192,11 +177,11 @@ test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const { urls } = await getFullUrls({
     job: {
-      objects: [
-        { relativeUrl: '/app/kibana#/something_aaa' },
-        { relativeUrl: '/app/kibana#/something_bbb' },
-        { relativeUrl: '/app/kibana#/something_ccc' },
-        { relativeUrl: '/app/kibana#/something_ddd' },
+      relativeUrls: [
+        '/app/kibana#/something_aaa',
+        '/app/kibana#/something_bbb',
+        '/app/kibana#/something_ccc',
+        '/app/kibana#/something_ddd',
       ],
       forceNow,
     },

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -20,7 +20,7 @@ function isPngJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
   return (job as JobDocPayloadPNG).relativeUrl !== undefined;
 }
 function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloadPDF {
-  return (job as JobDocPayloadPDF).objects !== undefined;
+  return (job as JobDocPayloadPDF).relativeUrls !== undefined;
 }
 
 export async function getFullUrls<JobDocPayloadType>({
@@ -48,7 +48,7 @@ export async function getFullUrls<JobDocPayloadType>({
   if (isPngJob(job)) {
     relativeUrls = [job.relativeUrl];
   } else if (isPdfJob(job)) {
-    relativeUrls = job.objects.map(obj => obj.relativeUrl);
+    relativeUrls = job.relativeUrls;
   } else {
     throw new Error(
       `No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\``

diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
@@ -30,14 +30,14 @@ export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
     validateUrls([relativeUrl]);
 
     return {
-      objectType,
-      title,
       relativeUrl,
       headers: serializedEncryptedHeaders,
       browserTimezone,
       layout,
       basePath: request.getBasePath(),
       forceNow: new Date().toISOString(),
+      title,
+      objectType,
     };
   };
 };
diff --git a/...gacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js b/...gacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js