fix generate_png to not format base64 to buffer and back to base64

tsullivan · tsullivan · commit e79e875f8366 · 2020-04-29T12:12:13.000-07:00
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.ts
@@ -126,7 +126,7 @@ test(`returns content_type of application/png`, async () => {
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = (await generatePngObservableFactory(mockReporting)) as jest.Mock;
-  generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
+  generatePngObservable.mockReturnValue(Rx.of('foo'));
 
   const { content_type: contentType } = await executeJob(
     'pngJobId',
@@ -137,10 +137,10 @@ test(`returns content_type of application/png`, async () => {
 });
 
 test(`returns content of generatePng getBuffer base64 encoded`, async () => {
-  const testContent = 'test content';
+  const testContent = 'raw string from get_screenhots';
 
   const generatePngObservable = (await generatePngObservableFactory(mockReporting)) as jest.Mock;
-  generatePngObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
+  generatePngObservable.mockReturnValue(Rx.of({ base64: testContent }));
 
   const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
@@ -150,5 +150,5 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
     cancellationToken
   );
 
-  expect(content).toEqual(Buffer.from(testContent).toString('base64'));
+  expect(content).toEqual(testContent);
 });
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
@@ -54,13 +54,14 @@ export const executeJobFactory: QueuedPngExecutorFactory = async function execut
           job.layout
         );
       }),
-      map(({ buffer, warnings }) => {
+      map(({ base64, warnings }) => {
         if (apmGeneratePng) apmGeneratePng.end();
 
         return {
           content_type: 'image/png',
-          content: buffer,
-          size: buffer.length,
+          content: base64,
+          size: (base64 && base64.length) || 0,
+
           warnings,
         };
       }),
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
@@ -23,7 +23,7 @@ export async function generatePngObservableFactory(reporting: ReportingCore) {
     browserTimezone: string,
     conditionalHeaders: ConditionalHeaders,
     layoutParams: LayoutParams
-  ): Rx.Observable<{ buffer: string; warnings: string[] }> {
+  ): Rx.Observable<{ base64: string | null; warnings: string[] }> {
     const apmTrans = apm.startTransaction('reporting generate_png', 'reporting');
     const apmLayout = apmTrans?.startSpan('create_layout', 'setup');
     if (!layoutParams || !layoutParams.dimensions) {
@@ -45,7 +45,7 @@ export async function generatePngObservableFactory(reporting: ReportingCore) {
         if (apmTrans) apmTrans.end();
 
         return {
-          buffer: results[0].screenshots[0].base64EncodedData,
+          base64: results[0].screenshots[0].base64EncodedData,
           warnings: results.reduce((found, current) => {
             if (current.error) {
               found.push(current.error.message);
