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

[6.x] [x-pack] remove use of resolveKibanaPath from plugin helpers (#18979) (#19004)

Browse source
This commit is contained in:
Spencer 2018-05-11 16:04:58 -07:00 committed by GitHub
parent 8c6f7209e4
commit ef12447f63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
x-pack/dev-tools/jest/index.js
View file

@ -6,7 +6,6 @@
import jest from 'jest';
import { resolve } from 'path';
import { resolveKibanaPath } from '@kbn/plugin-helpers';
import { createJestConfig } from './create_jest_config';
@ -14,8 +13,8 @@ import { createJestConfig } from './create_jest_config';
export function runJest() {
process.env.NODE_ENV = process.env.NODE_ENV || 'test';
const config = JSON.stringify(createJestConfig({
kibanaDirectory: resolveKibanaPath(''),
xPackKibanaDirectory: resolve(__dirname, '..', '..'),
kibanaDirectory: resolve(__dirname, '../../..'),
xPackKibanaDirectory: resolve(__dirname, '../..'),
}));
const argv = [

3
x-pack/gulp_helpers/get_plugins.js
View file

@ -7,8 +7,7 @@
const path = require('path');
const yargs = require('yargs');
const glob = require('glob');
const { resolveKibanaPath } = require('@kbn/plugin-helpers');
const { findPluginSpecs } = require(resolveKibanaPath('src/plugin_discovery'));
const { findPluginSpecs } = require('../../src/plugin_discovery');
/*
Usage:

13
x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js
View file

@ -9,13 +9,14 @@ import Puid from 'puid';
import sinon from 'sinon';
import 'sinon-as-promised';
import nodeCrypto from '@elastic/node-crypto';
import { resolveKibanaPath } from '@kbn/plugin-helpers';
import { executeJobFactory } from '../execute_job';
import { CancellationToken } from '../../../../server/lib/esqueue/helpers/cancellation_token';
const { SavedObjectsClient } = require(resolveKibanaPath('src/server/saved_objects/client/saved_objects_client.js'));
const { FieldFormat } = require(resolveKibanaPath('src/ui/field_formats/field_format.js'));
const { FieldFormatsService } = require(resolveKibanaPath('src/ui/field_formats/field_formats_service.js'));
const { createStringFormat } = require(resolveKibanaPath('src/core_plugins/kibana/common/field_formats/types/string.js'));
import { SavedObjectsClient } from '../../../../../../../src/server/saved_objects/client/saved_objects_client.js';
import { FieldFormat } from '../../../../../../../src/ui/field_formats/field_format.js';
import { FieldFormatsService } from '../../../../../../../src/ui/field_formats/field_formats_service.js';
import { createStringFormat } from '../../../../../../../src/core_plugins/kibana/common/field_formats/types/string.js';
import { executeJobFactory } from '../execute_job';
const delay = (ms) => new Promise(resolve => setTimeout(() => resolve(), ms));

11
x-pack/plugins/reporting/export_types/csv/server/lib/__tests__/field_format_map.js
View file

@ -5,12 +5,13 @@
*/
import expect from 'expect.js';
import { FieldFormat } from '../../../../../../../../src/ui/field_formats/field_format.js';
import { FieldFormatsService } from '../../../../../../../../src/ui/field_formats/field_formats_service.js';
import { createBytesFormat } from '../../../../../../../../src/core_plugins/kibana/common/field_formats/types/bytes.js';
import { createNumberFormat } from '../../../../../../../../src/core_plugins/kibana/common/field_formats/types/number.js';
import { fieldFormatMapFactory } from '../field_format_map';
import { resolveKibanaPath } from '@kbn/plugin-helpers';
const { FieldFormat } = require(resolveKibanaPath('src/ui/field_formats/field_format.js'));
const { FieldFormatsService } = require(resolveKibanaPath('src/ui/field_formats/field_formats_service.js'));
const { createBytesFormat } = require(resolveKibanaPath('src/core_plugins/kibana/common/field_formats/types/bytes.js'));
const { createNumberFormat } = require(resolveKibanaPath('src/core_plugins/kibana/common/field_formats/types/number.js'));
describe('field format map', function () {
const indexPatternSavedObject = {

5
x-pack/test/api_integration/config.js
View file

@ -4,15 +4,14 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { resolveKibanaPath } from '@kbn/plugin-helpers';
import { SupertestWithoutAuthProvider } from './services';
export default async function ({ readConfigFile }) {
// Read the Kibana API integration tests config file so that we can utilize its services.
const kibanaAPITestsConfig = await readConfigFile(resolveKibanaPath('test/api_integration/config.js'));
const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js'));
const xPackFunctionalTestsConfig = await readConfigFile(require.resolve('../functional/config.js'));
const kibanaFunctionalConfig = await readConfigFile(resolveKibanaPath('test/functional/config.js'));
const kibanaFunctionalConfig = await readConfigFile(require.resolve('../../../test/functional/config.js'));
return {
testFiles: [require.resolve('./apis')],

5
x-pack/test/functional/config.js
View file

@ -7,7 +7,6 @@
/* eslint-disable kibana-custom/no-default-export */
import { resolve } from 'path';
import { resolveKibanaPath } from '@kbn/plugin-helpers';
import {
SecurityPageProvider,
@ -55,8 +54,8 @@ export default async function ({ readConfigFile }) {
// read the Kibana config file so that we can utilize some of
// its services and PageObjects
const kibanaConfig = await readConfigFile(resolveKibanaPath('test/functional/config.js'));
const kibanaAPITestsConfig = await readConfigFile(resolveKibanaPath('test/api_integration/config.js'));
const kibanaConfig = await readConfigFile(require.resolve('../../../test/functional/config.js'));
const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js'));
return {
// list paths to the files that contain your plugins tests

4
x-pack/test/saml_api_integration/config.js
View file

@ -4,11 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { resolveKibanaPath } from '@kbn/plugin-helpers/lib/index';
export default async function ({ readConfigFile }) {
// Read the Kibana API integration tests config file so that we can utilize its services.
const kibanaAPITestsConfig = await readConfigFile(resolveKibanaPath('test/api_integration/config.js'));
const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js'));
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.js'));
return {

3
x-pack/test/saml_api_integration/fixtures/saml_tools.js
View file

@ -12,7 +12,6 @@ import zlib from 'zlib';
import { promisify } from 'bluebird';
import { parseString } from 'xml2js';
import { SignedXml } from 'xml-crypto';
import { resolveKibanaPath } from '@kbn/plugin-helpers';
/**
* @file Defines a set of tools that allow us to parse and generate various SAML XML messages.
@ -25,7 +24,7 @@ const inflateRawAsync = promisify(zlib.inflateRaw);
const deflateRawAsync = promisify(zlib.deflateRaw);
const parseStringAsync = promisify(parseString);
const signingKey = fs.readFileSync(resolveKibanaPath('test/dev_certs/server.key'));
const signingKey = fs.readFileSync(require.resolve('../../../../test/dev_certs/server.key'));
const signatureAlgorithm = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
export async function getSAMLRequestId(urlWithSAMLRequestId) {