Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing esArchiver in favor of testDataLoader for bulk_get Saved Objects integration tests #140998

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -5,16 +5,14 @@
* 2.0.
*/

import { FtrProviderContext } from '../ftr_provider_context';

const SPACE_1 = {
export const SPACE_1 = {
id: 'space_1',
name: 'Space 1',
description: 'This is the first test space',
disabledFeatures: [],
};

const SPACE_2 = {
export const SPACE_2 = {
id: 'space_2',
name: 'Space 2',
description: 'This is the second test space',
@@ -64,36 +62,38 @@ const OBJECTS_TO_SHARE: Array<{
},
];

export function getTestDataLoader({ getService }: FtrProviderContext) {
// @ts-ignore
export function getTestDataLoader({ getService }) {
const spacesService = getService('spaces');
const kbnServer = getService('kibanaServer');
const supertest = getService('supertest');
const log = getService('log');

return {
before: async () => {
createFtrSpaces: async () => {
await Promise.all([await spacesService.create(SPACE_1), await spacesService.create(SPACE_2)]);
},

after: async () => {
deleteFtrSpaces: async () => {
await Promise.all([spacesService.delete(SPACE_1.id), spacesService.delete(SPACE_2.id)]);
},

beforeEach: async () => {
createFtrSavedObjectsData: async (
spaceData: Array<{ spaceName: string | null; dataUrl: string }>
) => {
log.debug('Loading test data for the following spaces: default, space_1 and space_2');
await Promise.all([
kbnServer.importExport.load(
'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json'
),
kbnServer.importExport.load(
'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json',
{ space: SPACE_1.id }
),
kbnServer.importExport.load(
'x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json',
{ space: SPACE_2.id }
),
]);

await Promise.all(
spaceData.map((spaceDataObj) => {
if (spaceDataObj.spaceName) {
return kbnServer.importExport.load(spaceDataObj.dataUrl, {
space: spaceDataObj.spaceName,
});
} else {
return kbnServer.importExport.load(spaceDataObj.dataUrl);
}
})
);

// Adjust spaces for the imported saved objects.
for (const { objects, spacesToAdd = [], spacesToRemove = [] } of OBJECTS_TO_SHARE) {
@@ -111,9 +111,9 @@ export function getTestDataLoader({ getService }: FtrProviderContext) {
}
},

afterEach: async () => {
deleteFtrSavedObjectsData: async () => {
const allSpacesIds = [
...(await spacesService.getAll()).map((space) => space.id),
...(await spacesService.getAll()).map((space: { id: string }) => space.id),
'non_existent_space',
];
log.debug(`Removing data from the following spaces: ${allSpacesIds.join(', ')}`);
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
{
"attributes": {
"title": "logstash-*"
},
"coreMigrationVersion": "8.4.0",
"id": "defaultspace-index-pattern-id",
"migrationVersion": {
"index-pattern": "8.0.0"
},
"originId": "cts_ip_1",
"references": [],
"type": "index-pattern",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyOCwxXQ=="
}

{
"attributes": {
"title": "Count of requests",
"uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
"version": 1,
"visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}",
"description": "",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"index\":\"defaultspace-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
}
},
"id": "defaultspace-isolatedtype-id",
"references": [],
"type": "isolatedtype",
"updated_at": "2017-09-21T18:51:23.794Z",
"version": "WzQ4NywxXQ=="
}

{
"attributes": {
"title": "Requests",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
}
},
"coreMigrationVersion": "8.4.0",
"id": "defaultspace-dashboard-id",
"migrationVersion": {
"dashboard": "8.4.0"
},
"type": "dashboard",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyMCwxXQ=="
}

{
"attributes": {
"title": "A share-capable (isolated) saved-object only in the default space"
},
"id": "only_default_space",
"type": "sharecapabletype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A shared saved-object in all spaces"
},
"id": "all_spaces",
"type": "sharedtype",
"references": [],
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5NywxXQ=="
}

{
"attributes": {
"title": "My favorite global object"
},
"id": "globaltype-id",
"references": [],
"type": "globaltype",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzQ4NywxXQ=="
}

{
"attributes": {
"title": "A shared saved-object in the default and space_1 spaces"
},
"id": "default_and_space_1",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A sharedtype saved-object with id: conflict_1"
},
"id": "conflict_1",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A sharedtype saved-object with id: conflict_2a"
},
"id": "conflict_2a",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A sharedtype saved-object with id: conflict_2b"
},
"id": "conflict_2b",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A sharedtype saved-object with id: conflict_3"
},
"id": "conflict_3",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A sharedtype saved-object with id: conflict_4a"
},
"id": "conflict_4a",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "Resolve outcome exactMatch"
},
"id": "exact-match",
"type": "resolvetype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "Resolve outcome aliasMatch"
},
"id": "alias-match-newid",
"type": "resolvetype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@


{
"attributes": {
"title": "logstash-*"
},
"coreMigrationVersion": "8.4.0",
"id": "space1-index-pattern-id",
"migrationVersion": {
"index-pattern": "8.0.0"
},
"references": [],
"type": "index-pattern",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyOSwxXQ=="
}

{
"attributes": {
"description": "",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"index\":\"space1-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
},
"title": "Count of requests",
"uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
"version": 1,
"visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
},
"id": "space1-isolatedtype-id",
"references": [],
"type": "isolatedtype",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzQ4NywxXQ=="
}

{
"attributes": {
"title": "Requests",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
},
"version": 1
},
"coreMigrationVersion": "8.4.0",
"id": "space1-dashboard-id",
"migrationVersion": {
"dashboard": "8.4.0"
},
"type": "dashboard",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyMCwxXQ=="
}

{
"attributes": {
"title": "A shared saved-object only in space_1"
},
"id": "only_space_1",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}

{
"attributes": {
"title": "A share-capable (isolated) saved-object only in space_1"
},
"id": "only_space_1",
"type": "sharecapabletype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"attributes": {
"title": "logstash-*"
},
"coreMigrationVersion": "8.4.0",
"id": "space2-index-pattern-id",
"migrationVersion": {
"index-pattern": "8.0.0"
},
"references": [],
"type": "index-pattern",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyOSwxXQ=="
}

{
"attributes": {
"description": "",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"index\":\"space2-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
},
"title": "Count of requests",
"version": 1
},
"id": "space2-isolatedtype-id",
"references": [],
"type": "isolatedtype",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzQ4NywxXQ=="
}

{
"attributes": {
"title": "Requests",
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
},
"version": 1
},
"coreMigrationVersion": "8.4.0",
"id": "space2-dashboard-id",
"migrationVersion": {
"dashboard": "8.4.0"
},
"type": "dashboard",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzUyMCwxXQ=="
}

{
"attributes": {
"title": "A shared saved-object only in space_2"
},
"id": "only_space_2",
"type": "sharedtype",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}
Loading