maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[reporting] Move chromium user data to path.data (#112198)

Browse source
This commit is contained in:
Jonathan Budzenski 2021-09-15 16:31:08 -05:00 committed by GitHub
parent ccf4410095
commit 6435a81561
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
View file

@ -7,9 +7,9 @@
import apm from 'elastic-apm-node'; import apm from 'elastic-apm-node';
import { i18n } from '@kbn/i18n'; import { i18n } from '@kbn/i18n';
import { getDataPath } from '@kbn/utils';
import del from 'del'; import del from 'del';
import fs from 'fs'; import fs from 'fs';
import os from 'os';
import path from 'path'; import path from 'path';
import puppeteer from 'puppeteer'; import puppeteer from 'puppeteer';
import * as Rx from 'rxjs'; import * as Rx from 'rxjs';
@ -59,7 +59,7 @@ export class HeadlessChromiumDriverFactory {
logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`); logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`);
} }
this.userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-')); this.userDataDir = fs.mkdtempSync(path.join(getDataPath(), 'chromium-'));
this.getChromiumArgs = (viewport: ViewportConfig) => this.getChromiumArgs = (viewport: ViewportConfig) =>
args({ args({
userDataDir: this.userDataDir, userDataDir: this.userDataDir,

5
x-pack/plugins/reporting/server/browsers/chromium/driver_factory/start_logs.ts
View file

@ -10,9 +10,10 @@ import { spawn } from 'child_process';
import del from 'del'; import del from 'del';
import { mkdtempSync } from 'fs'; import { mkdtempSync } from 'fs';
import { uniq } from 'lodash'; import { uniq } from 'lodash';
import os, { tmpdir } from 'os'; import os from 'os';
import { join } from 'path'; import { join } from 'path';
import { createInterface } from 'readline'; import { createInterface } from 'readline';
import { getDataPath } from '@kbn/utils';
import { fromEvent, merge, of, timer } from 'rxjs'; import { fromEvent, merge, of, timer } from 'rxjs';
import { catchError, map, reduce, takeUntil, tap } from 'rxjs/operators'; import { catchError, map, reduce, takeUntil, tap } from 'rxjs/operators';
import { ReportingCore } from '../../../'; import { ReportingCore } from '../../../';
@ -61,7 +62,7 @@ export const browserStartLogs = (
const config = core.getConfig(); const config = core.getConfig();
const proxy = config.get('capture', 'browser', 'chromium', 'proxy'); const proxy = config.get('capture', 'browser', 'chromium', 'proxy');
const disableSandbox = config.get('capture', 'browser', 'chromium', 'disableSandbox'); const disableSandbox = config.get('capture', 'browser', 'chromium', 'disableSandbox');
const userDataDir = mkdtempSync(join(tmpdir(), 'chromium-')); const userDataDir = mkdtempSync(join(getDataPath(), 'chromium-'));
const platform = process.platform; const platform = process.platform;
const architecture = os.arch(); const architecture = os.arch();