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.

Sign up for GitHub

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

Jump to bottom

savedObjectTagging: use importExport instead of esArchiver for FTR tests #135679

Merged
merged 4 commits into from
Jul 5, 2022
Merged

savedObjectTagging: use importExport instead of esArchiver for FTR tests #135679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
495a90d
migrate most of the datasets
pgayvallet Jul 5, 2022
d29f806
update the tagging_api suite
pgayvallet Jul 5, 2022
d387df2
update the security_and_spaces suite
pgayvallet Jul 5, 2022
1edc80d
adapt the functional suite
pgayvallet Jul 5, 2022
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
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('POST /internal/saved_objects_tagging/tags/_bulk_delete', () => {
before(async () => {
await createTestSpaces(ftrContext);
});

after(async () => {
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTags(ftrContext);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTags, createTestSpaces, deleteTags, deleteTestSpaces } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('GET /internal/saved_objects_tagging/tags/_find', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTestSpaces(ftrContext);
});

after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await createTags(ftrContext);
});

afterEach(async () => {
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
22 changes: 13 additions & 9 deletions ...st/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('GET /internal/saved_objects_tagging/assignments/_assignable_types', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTestSpaces(ftrContext);
});

after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await createTags(ftrContext);
});

afterEach(async () => {
await deleteTags(ftrContext);
});

const assignablePerUser = {
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ import { FtrProviderContext } from '../services';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const supertest = getService('supertestWithoutAuth');

describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
);
});

Expand Down
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('POST /api/saved_objects_tagging/tags/create', () => {
before(async () => {
await createTestSpaces(ftrContext);
});

after(async () => {
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTags(ftrContext);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('DELETE /api/saved_objects_tagging/tags/{id}', () => {
before(async () => {
await createTestSpaces(ftrContext);
});

after(async () => {
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTags(ftrContext);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('GET /api/saved_objects_tagging/tags/{id}', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTestSpaces(ftrContext);
});

after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await createTags(ftrContext);
});

afterEach(async () => {
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('GET /api/saved_objects_tagging/tags', () => {
before(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTestSpaces(ftrContext);
});

after(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await createTags(ftrContext);
});

afterEach(async () => {
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
50 changes: 50 additions & 0 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/test_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

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

export const createTestSpaces = async ({ getService }: FtrProviderContext) => {
const spaceService = getService('spaces');
await spaceService.create({
id: 'space_1',
name: 'Space 1',
description: 'This is the first test space',
});
await spaceService.create({
id: 'space_2',
name: 'Space 2',
description: 'This is the second test space',
});
};

export const deleteTestSpaces = async ({ getService }: FtrProviderContext) => {
const spaceService = getService('spaces');
await spaceService.delete('space_1');
await spaceService.delete('space_2');
};

export const createTags = async ({ getService }: FtrProviderContext) => {
const kibanaServer = getService('kibanaServer');
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/default_space.json'
);
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/space_1.json',
{ space: 'space_1' }
);
};

export const deleteTags = async ({ getService }: FtrProviderContext) => {
const kibanaServer = getService('kibanaServer');
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/default_space.json'
);
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/space_1.json',
{ space: 'space_1' }
);
};
22 changes: 13 additions & 9 deletions x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,27 @@
import expect from '@kbn/expect';
import { USERS, User, ExpectedResponse } from '../../../common/lib';
import { FtrProviderContext } from '../services';
import { createTestSpaces, deleteTestSpaces, createTags, deleteTags } from './test_utils';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
export default function (ftrContext: FtrProviderContext) {
const supertest = ftrContext.getService('supertestWithoutAuth');

describe('POST /api/saved_objects_tagging/tags/{id}', () => {
before(async () => {
await createTestSpaces(ftrContext);
});

after(async () => {
await deleteTestSpaces(ftrContext);
});

beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await createTags(ftrContext);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
);
await deleteTags(ftrContext);
});

const responses: Record<string, ExpectedResponse> = {
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import { FtrProviderContext } from '../services';

// eslint-disable-next-line import/no-default-export
export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const supertest = getService('supertest');

describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
beforeEach(async () => {
await esArchiver.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
await kibanaServer.importExport.load(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
);
});

afterEach(async () => {
await esArchiver.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
await kibanaServer.importExport.unload(
'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/data.json'
);
});

Expand Down
Loading