From 26a5ebfb57d6a16272eb50efee1c89fd5bd1f0f5 Mon Sep 17 00:00:00 2001 From: Joshua Date: Wed, 2 Dec 2020 22:41:01 +0000 Subject: [PATCH] Use chromium path relative to constant file (#236) --- kibana-reports/server/routes/utils/constants.ts | 8 +------- .../utils/visual_report/visualReportHelper.ts | 14 ++------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/kibana-reports/server/routes/utils/constants.ts b/kibana-reports/server/routes/utils/constants.ts index c165d7b5..911239d5 100644 --- a/kibana-reports/server/routes/utils/constants.ts +++ b/kibana-reports/server/routes/utils/constants.ts @@ -80,10 +80,4 @@ export const DEFAULT_REPORT_HEADER = '

Open Distro Kibana Reports

'; export const SECURITY_AUTH_COOKIE_NAME = 'security_authentication'; -export const CHROMIUM_PATHS = [ - `./plugins/${PLUGIN_ID}/.chromium/headless_shell`, - './plugins/kibana-reports/.chromium/headless_shell', - './.chromium/headless_shell', - `../plugins/${PLUGIN_ID}/.chromium/headless_shell`, - '../plugins/kibana-reports/.chromium/headless_shell', -]; +export const CHROMIUM_PATH = `${__dirname}/../../../.chromium/headless_shell`; diff --git a/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts b/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts index bd8c00b7..dcd6cd3b 100644 --- a/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts +++ b/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts @@ -22,7 +22,7 @@ import { REPORT_TYPE, FORMAT, SELECTOR, - CHROMIUM_PATHS, + CHROMIUM_PATH, } from '../constants'; import { getFileName } from '../helpers'; import { CreateReportResultType } from '../types'; @@ -50,16 +50,6 @@ export const createVisualReport = async ( report_format: reportFormat, } = coreParams; - const getChromiumPath = () => { - const path = CHROMIUM_PATHS.find((path) => { - try { - return fs.existsSync(path); - } catch (error) {} - }); - if (path) return path; - logger.error('cannot find headless chromium for puppeteer'); - }; - // TODO: polish default header, maybe add a logo, depends on UX design const window = new JSDOM('').window; const DOMPurify = createDOMPurify(window); @@ -77,7 +67,7 @@ export const createVisualReport = async ( * https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#setting-up-chrome-linux-sandbox */ args: ['--no-sandbox', '--disable-setuid-sandbox'], - executablePath: getChromiumPath(), + executablePath: CHROMIUM_PATH, }); const page = await browser.newPage(); page.setDefaultNavigationTimeout(0);