github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[kbnArchiver] convert archive names to root-relative paths (#101839)

Browse source 
* [kbnArchiver] convert archive names to root-relative paths

* ensure that newly multiline hooks are explicitly async

* missed a newly multiline hook

* fix exists check

* avoid extra lines by wrapping arrow body in {}

* one block more

* fix errant `name` variable

Co-authored-by: spalger <spalger@users.noreply.github.com>
This commit is contained in:
Spencer 2021-06-09 17:13:00 -07:00 • committed by GitHub
parent 3559d375b6
commit 7917e3c9d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 234 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

23
packages/kbn-test/src/kbn_archiver_cli.ts
View file

@ -43,13 +43,11 @@ export function runKbnArchiverCli() {
new RunWithCommands({
description: 'Import/export saved objects from archives, for testing',
globalFlags: {
string: ['config', 'space', 'kibana-url', 'dir'],
string: ['config', 'space', 'kibana-url'],
help: `
--space space id to operate on, defaults to the default space
--config optional path to an FTR config file that will be parsed and used for defaults
--kibana-url set the url that kibana can be reached at, uses the "servers.kibana" setting from --config by default
--dir directory that contains exports to be imported, or where exports will be saved, uses the "kbnArchiver.directory"
setting from --config by default
`,
},
async extendContext({ log, flags }) {
@ -79,23 +77,6 @@ export function runKbnArchiverCli() {
);
}
let importExportDir;
if (flags.dir) {
if (typeof flags.dir !== 'string') {
throw createFlagError('expected --dir to be a string');
}
importExportDir = flags.dir;
} else if (config) {
importExportDir = config.get('kbnArchiver.directory');
}
if (!importExportDir) {
throw createFlagError(
'--config does not include a kbnArchiver.directory, specify it or include --dir flag'
);
}
const space = flags.space;
if (!(space === undefined || typeof space === 'string')) {
throw createFlagError('--space must be a string');
@ -106,7 +87,7 @@ export function runKbnArchiverCli() {
kbnClient: new KbnClient({
log,
url: kibanaUrl,
importExportDir,
importExportBaseDir: process.cwd(),
}),
};
},

4
packages/kbn-test/src/kbn_client/kbn_client.ts
View file

@ -22,7 +22,7 @@ export interface KbnClientOptions {
certificateAuthorities?: Buffer[];
log: ToolingLog;
uiSettingDefaults?: UiSettingValues;
importExportDir?: string;
importExportBaseDir?: string;
}
export class KbnClient {
@ -67,7 +67,7 @@ export class KbnClient {
this.log,
this.requester,
this.savedObjects,
options.importExportDir
options.importExportBaseDir
);
}

26
packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
View file

@ -8,10 +8,11 @@
import { inspect } from 'util';
import Fs from 'fs/promises';
import { existsSync } from 'fs';
import Path from 'path';
import FormData from 'form-data';
import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-utils';
import { ToolingLog, isAxiosResponseError, createFailError, REPO_ROOT } from '@kbn/dev-utils';
import { KbnClientRequester, uriencode, ReqOptions } from './kbn_client_requester';
import { KbnClientSavedObjects } from './kbn_client_saved_objects';
@ -39,7 +40,7 @@ export class KbnClientImportExport {
public readonly log: ToolingLog,
public readonly requester: KbnClientRequester,
public readonly savedObjects: KbnClientSavedObjects,
public readonly dir?: string
public readonly baseDir: string = REPO_ROOT
) {}
private resolvePath(path: string) {
@ -47,18 +48,19 @@ export class KbnClientImportExport {
path = `${path}.json`;
}
if (!this.dir && !Path.isAbsolute(path)) {
const absolutePath = Path.resolve(this.baseDir, path);
if (!existsSync(absolutePath)) {
throw new Error(
'unable to resolve relative path to import/export without a configured dir, either path absolute path or specify --dir'
`unable to resolve path [${path}] to import/export, resolved relative to [${this.baseDir}]`
);
}
return this.dir ? Path.resolve(this.dir, path) : path;
return absolutePath;
}
async load(name: string, options?: { space?: string }) {
const src = this.resolvePath(name);
this.log.debug('resolved import for', name, 'to', src);
async load(path: string, options?: { space?: string }) {
const src = this.resolvePath(path);
this.log.debug('resolved import for', path, 'to', src);
const objects = await parseArchive(src);
this.log.info('importing', objects.length, 'saved objects', { space: options?.space });
@ -91,8 +93,8 @@ export class KbnClientImportExport {
}
}
async unload(name: string, options?: { space?: string }) {
const src = this.resolvePath(name);
async unload(path: string, options?: { space?: string }) {
const src = this.resolvePath(path);
this.log.debug('unloading docs from archive at', src);
const objects = await parseArchive(src);
@ -110,8 +112,8 @@ export class KbnClientImportExport {
this.log.success(deleted, 'saved objects deleted');
}
async save(name: string, options: { types: string[]; space?: string }) {
const dest = this.resolvePath(name);
async save(path: string, options: { types: string[]; space?: string }) {
const dest = this.resolvePath(path);
this.log.debug('saving export to', dest);
const resp = await this.req(options.space, {

12
test/api_integration/apis/kql_telemetry/kql_telemetry.ts
View file

@ -17,8 +17,16 @@ export default function ({ getService }: FtrProviderContext) {
const es = getService('es');
describe('telemetry API', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should increment the opt *in* counter in the .kibana/kql-telemetry document', async () => {
await supertest

5
test/api_integration/apis/saved_objects/bulk_create.ts
View file

@ -39,7 +39,10 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
KIBANA_VERSION = await getKibanaVersion(getService);
await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
{ space: SPACE_ID }
);
});
after(() => kibanaServer.spaces.delete(SPACE_ID));

10
test/api_integration/apis/saved_objects/bulk_get.ts
View file

@ -34,10 +34,16 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
KIBANA_VERSION = await getKibanaVersion(getService);
await kibanaServer.importExport.load('saved_objects/basic');
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200 with individual responses', async () =>
await supertest

12
test/api_integration/apis/saved_objects/bulk_update.ts
View file

@ -15,8 +15,16 @@ export default function ({ getService }: FtrProviderContext) {
const kibanaServer = getService('kibanaServer');
describe('bulkUpdate', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200', async () => {
const response = await supertest

10
test/api_integration/apis/saved_objects/create.ts
View file

@ -19,10 +19,16 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
KIBANA_VERSION = await getKibanaVersion(getService);
await kibanaServer.importExport.load('saved_objects/basic');
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200', async () => {
await supertest

12
test/api_integration/apis/saved_objects/delete.ts
View file

@ -14,8 +14,16 @@ export default function ({ getService }: FtrProviderContext) {
const kibanaServer = getService('kibanaServer');
describe('delete', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200 when deleting a doc', async () =>
await supertest

5
test/api_integration/apis/saved_objects/export.ts
View file

@ -24,7 +24,10 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
KIBANA_VERSION = await getKibanaVersion(getService);
await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
{ space: SPACE_ID }
);
});
after(() => kibanaServer.spaces.delete(SPACE_ID));

48
test/api_integration/apis/saved_objects/find.ts
View file

@ -18,12 +18,18 @@ export default function ({ getService }: FtrProviderContext) {
describe('find', () => {
before(async () => {
await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
{ space: SPACE_ID }
);
await kibanaServer.spaces.create({ id: `${SPACE_ID}-foo`, name: `${SPACE_ID}-foo` });
await kibanaServer.importExport.load('saved_objects/basic/foo-ns', {
space: `${SPACE_ID}-foo`,
});
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic/foo-ns.json',
{
space: `${SPACE_ID}-foo`,
}
);
});
after(async () => {
@ -255,10 +261,18 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('`has_reference` and `has_reference_operator` parameters', () => {
before(() => kibanaServer.importExport.load('saved_objects/references', { space: SPACE_ID }));
after(() =>
kibanaServer.importExport.unload('saved_objects/references', { space: SPACE_ID })
);
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json',
{ space: SPACE_ID }
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json',
{ space: SPACE_ID }
);
});
it('search for a reference', async () => {
await supertest
@ -319,12 +333,18 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('searching for special characters', () => {
before(() =>
kibanaServer.importExport.load('saved_objects/find_edgecases', { space: SPACE_ID })
);
after(() =>
kibanaServer.importExport.unload('saved_objects/find_edgecases', { space: SPACE_ID })
);
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json',
{ space: SPACE_ID }
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json',
{ space: SPACE_ID }
);
});
it('can search for objects with dashes', async () =>
await supertest

10
test/api_integration/apis/saved_objects/get.ts
View file

@ -19,9 +19,15 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
KIBANA_VERSION = await getKibanaVersion(getService);
await kibanaServer.importExport.load('saved_objects/basic');
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
it('should return 200', async () =>
await supertest

12
test/api_integration/apis/saved_objects/import.ts
View file

@ -43,8 +43,16 @@ export default function ({ getService }: FtrProviderContext) {
};
describe('with basic data existing', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 415 when no file passed in', async () => {
await supertest

12
test/api_integration/apis/saved_objects/resolve.ts
View file

@ -22,8 +22,16 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('with kibana index', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200', async () =>
await supertest

5
test/api_integration/apis/saved_objects/resolve_import_errors.ts
View file

@ -36,7 +36,10 @@ export default function ({ getService }: FtrProviderContext) {
describe('with basic data existing', () => {
before(async () => {
await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
{ space: SPACE_ID }
);
});
after(() => kibanaServer.spaces.delete(SPACE_ID));

12
test/api_integration/apis/saved_objects/update.ts
View file

@ -14,8 +14,16 @@ export default function ({ getService }: FtrProviderContext) {
const kibanaServer = getService('kibanaServer');
describe('update', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200', async () => {
await supertest
.put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)

24
test/api_integration/apis/saved_objects_management/find.ts
View file

@ -25,8 +25,16 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('with kibana index', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200 with individual responses', async () =>
await supertest
@ -85,8 +93,16 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('`hasReference` and `hasReferenceOperator` parameters', () => {
before(() => kibanaServer.importExport.load('saved_objects/references'));
after(() => kibanaServer.importExport.unload('saved_objects/references'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/references.json'
);
});
it('search for a reference', async () => {
await supertest

12
test/api_integration/apis/saved_objects_management/get.ts
View file

@ -18,8 +18,16 @@ export default function ({ getService }: FtrProviderContext) {
const existingObject = 'visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab';
const nonexistentObject = 'wigwags/foo';
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('should return 200 for object that exists and inject metadata', async () =>
await supertest

12
test/api_integration/apis/saved_objects_management/relationships.ts
View file

@ -43,8 +43,16 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('relationships', () => {
before(() => kibanaServer.importExport.load('management/saved_objects/relationships'));
after(() => kibanaServer.importExport.unload('management/saved_objects/relationships'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json'
);
});
const baseApiUrl = `/api/kibana/management/saved_objects/relationships`;
const defaultTypes = ['visualization', 'index-pattern', 'search', 'dashboard'];

12
test/api_integration/apis/shorten/index.js
View file

@ -13,8 +13,16 @@ export default function ({ getService }) {
const kibanaServer = getService('kibanaServer');
describe('url shortener', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
it('generates shortened urls', async () => {
const resp = await supertest

12
test/api_integration/apis/stats/stats.js
View file

@ -47,8 +47,16 @@ export default function ({ getService }) {
const kibanaServer = getService('kibanaServer');
describe('kibana stats api', () => {
before(() => kibanaServer.importExport.load('saved_objects/basic'));
after(() => kibanaServer.importExport.unload('saved_objects/basic'));
before(async () => {
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
after(async () => {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
});
describe('basic', () => {
it('should return the stats without cluster_uuid with no query string params', () => {

8
test/api_integration/apis/suggestions/suggestions.js
View file

@ -14,13 +14,17 @@ export default function ({ getService }) {
describe('Suggestions API', function () {
before(async () => {
await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
await kibanaServer.importExport.load('index_patterns/basic_kibana');
await kibanaServer.importExport.load(
'test/api_integration/fixtures/kbn_archiver/index_patterns/basic_kibana.json'
);
});
after(async () => {
await esArchiver.unload(
'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
);
await kibanaServer.importExport.unload('index_patterns/basic_kibana');
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/index_patterns/basic_kibana.json'
);
});
it('should return 200 with special characters', () =>

1
test/common/services/kibana_server/kibana_server.ts
View file

@ -22,7 +22,6 @@ export function KibanaServerProvider({ getService }: FtrProviderContext): KbnCli
url,
certificateAuthorities: config.get('servers.kibana.certificateAuthorities'),
uiSettingDefaults: defaults,
importExportDir: config.get('kbnArchiver.directory'),
});
if (defaults) {

2
test/functional/apps/discover/_data_grid.ts
View file

@ -24,7 +24,7 @@ export default function ({
before(async function () {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace(defaultSettings);
await PageObjects.common.navigateToApp('discover');

2
test/functional/apps/discover/_data_grid_context.ts
View file

@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('discover data grid context tests', () => {
before(async () => {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
await kibanaServer.uiSettings.update(defaultSettings);

2
test/functional/apps/discover/_data_grid_doc_table.ts
View file

@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace(defaultSettings);
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();

2
test/functional/apps/discover/_data_grid_field_data.ts
View file

@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
this.tags('includeFirefox');
before(async function () {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
await kibanaServer.uiSettings.update(defaultSettings);

2
test/functional/apps/discover/_discover.ts
View file

@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
// and load a set of makelogs data
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');

2
test/functional/apps/discover/_discover_fields_api.ts
View file

@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace(defaultSettings);
log.debug('discover');

2
test/functional/apps/discover/_doc_table.ts
View file

@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
// and load a set of makelogs data
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');

2
test/functional/apps/discover/_field_data.ts
View file

@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
this.tags('includeFirefox');
before(async function () {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace({
defaultIndex: 'logstash-*',

2
test/functional/apps/discover/_field_data_with_fields_api.ts
View file

@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
this.tags('includeFirefox');
before(async function () {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace({
defaultIndex: 'logstash-*',

2
test/functional/apps/discover/_filter_editor.ts
View file

@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
// and load a set of makelogs data
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');

2
test/functional/apps/discover/_inspector.ts
View file

@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
// delete .kibana index and update configDoc
await kibanaServer.uiSettings.replace({

4
test/functional/apps/discover/_large_string.ts
View file

@ -23,7 +23,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
await security.testUser.setRoles(['kibana_admin', 'kibana_large_strings']);
await kibanaServer.importExport.load('testlargestring');
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/testlargestring.json'
);
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/hamlet');
await kibanaServer.uiSettings.replace({ defaultIndex: 'testlargestring' });
});

2
test/functional/apps/discover/_saved_queries.ts
View file

@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
// and load a set of makelogs data
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');

2
test/functional/apps/discover/_shared_links.ts
View file

@ -38,7 +38,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load('discover');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.uiSettings.replace({

2
test/functional/apps/visualize/legacy/index.ts
View file

@ -23,7 +23,7 @@ export default function ({ getPageObjects, getService, loadTestFile }: FtrProvid
await browser.setWindowSize(1280, 800);
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
await kibanaServer.importExport.load('visualize');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
await kibanaServer.uiSettings.replace({
defaultIndex: 'logstash-*',
[UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b',

4
test/functional/page_objects/visualize_page.ts
View file

@ -49,7 +49,9 @@ export class VisualizePageObject extends FtrService {
public async initTests(isNewLibrary = false) {
await this.kibanaServer.savedObjects.clean({ types: ['visualization'] });
await this.kibanaServer.importExport.load('visualize');
await this.kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/visualize.json'
);
await this.kibanaServer.uiSettings.replace({
defaultIndex: 'logstash-*',

1
x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js
View file

@ -227,7 +227,6 @@ export default ({ getService, getPageObjects }) => {
url: process.env.TEST_KIBANA_URLDATA,
certificateAuthorities: config.get('servers.kibana.certificateAuthorities'),
uiSettingDefaults: kibanaServer.uiSettings,
importExportDir: config.get('kbnArchiver.directory'),
});
const esArchiver = new EsArchiver({