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

Fixes Failing test: X-Pack Alerting API Integration Tests.x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy·ts - alerting api integration security and spaces enabled Alerts alerts "before all" hook in "alerts" #84255

Merged
merged 6 commits into from
Nov 30, 2020
Merged

Fixes Failing test: X-Pack Alerting API Integration Tests.x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy·ts - alerting api integration security and spaces enabled Alerts alerts "before all" hook in "alerts" #84255

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b11b3d8
Unskipping update test
ymao1 Nov 23, 2020
24d8d00
Merge branch 'master' of https://github.com/elastic/kibana into flaky…
ymao1 Nov 24, 2020
42305b4
Changing order of tests
ymao1 Nov 24, 2020
eb8b906
Cleanup
ymao1 Nov 24, 2020
87c206d
Merge branch 'master' into flaky-test-tm
kibanamachine Nov 26, 2020
c268e5a
Merge branch 'master' into flaky-test-tm
kibanamachine Nov 30, 2020
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
9 changes: 9 additions & 0 deletions x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@
*/

import { FtrProviderContext } from '../../../common/ftr_provider_context';
import { setupSpacesAndUsers, tearDown } from '..';

// eslint-disable-next-line import/no-default-export
export default function actionsTests({ loadTestFile, getService }: FtrProviderContext) {
describe('Actions', () => {
before(async () => {
await setupSpacesAndUsers(getService);
});

after(async () => {
await tearDown(getService);
});

loadTestFile(require.resolve('./builtin_action_types/email'));
loadTestFile(require.resolve('./builtin_action_types/es_index'));
loadTestFile(require.resolve('./builtin_action_types/es_index_preconfigured'));
Expand Down
62 changes: 41 additions & 21 deletions x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,50 @@
*/

import { FtrProviderContext } from '../../../common/ftr_provider_context';
import { setupSpacesAndUsers, tearDown } from '..';

// eslint-disable-next-line import/no-default-export
export default function alertingTests({ loadTestFile }: FtrProviderContext) {
export default function alertingTests({ loadTestFile, getService }: FtrProviderContext) {
describe('Alerts', () => {
loadTestFile(require.resolve('./find'));
loadTestFile(require.resolve('./create'));
loadTestFile(require.resolve('./delete'));
loadTestFile(require.resolve('./disable'));
loadTestFile(require.resolve('./enable'));
loadTestFile(require.resolve('./execution_status'));
loadTestFile(require.resolve('./get'));
loadTestFile(require.resolve('./get_alert_state'));
loadTestFile(require.resolve('./get_alert_instance_summary'));
loadTestFile(require.resolve('./list_alert_types'));
loadTestFile(require.resolve('./mute_all'));
loadTestFile(require.resolve('./mute_instance'));
loadTestFile(require.resolve('./unmute_all'));
loadTestFile(require.resolve('./unmute_instance'));
loadTestFile(require.resolve('./update'));
loadTestFile(require.resolve('./update_api_key'));
loadTestFile(require.resolve('./alerts'));
loadTestFile(require.resolve('./event_log'));
describe('legacy alerts', () => {
before(async () => {
await setupSpacesAndUsers(getService);
});

// note that this test will destroy existing spaces
loadTestFile(require.resolve('./rbac_legacy'));
after(async () => {
await tearDown(getService);
});

loadTestFile(require.resolve('./rbac_legacy'));
});

describe('alerts', () => {
before(async () => {
await setupSpacesAndUsers(getService);
});

after(async () => {
await tearDown(getService);
});

loadTestFile(require.resolve('./find'));
loadTestFile(require.resolve('./create'));
loadTestFile(require.resolve('./delete'));
loadTestFile(require.resolve('./disable'));
loadTestFile(require.resolve('./enable'));
loadTestFile(require.resolve('./execution_status'));
loadTestFile(require.resolve('./get'));
loadTestFile(require.resolve('./get_alert_state'));
loadTestFile(require.resolve('./get_alert_instance_summary'));
loadTestFile(require.resolve('./list_alert_types'));
loadTestFile(require.resolve('./mute_all'));
loadTestFile(require.resolve('./mute_instance'));
loadTestFile(require.resolve('./unmute_all'));
loadTestFile(require.resolve('./unmute_instance'));
loadTestFile(require.resolve('./update'));
loadTestFile(require.resolve('./update_api_key'));
loadTestFile(require.resolve('./alerts'));
loadTestFile(require.resolve('./event_log'));
});
});
}
4 changes: 1 addition & 3 deletions x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ export default function alertTests({ getService }: FtrProviderContext) {
const es = getService('legacyEs');
const retry = getService('retry');
const esArchiver = getService('esArchiver');
const securityService = getService('security');
const spacesService = getService('spaces');
const supertestWithoutAuth = getService('supertestWithoutAuth');
const esTestIndexTool = new ESTestIndexTool(es, retry);

Expand All @@ -39,7 +37,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
await esArchiver.load('alerts_legacy');
await esTestIndexTool.setup();
await es.indices.create({ index: authorizationIndex });
await setupSpacesAndUsers(spacesService, securityService);
await setupSpacesAndUsers(getService);
});

after(async () => {
Expand Down
34 changes: 11 additions & 23 deletions x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
import { isCustomRoleSpecification } from '../../common/types';
import { Spaces, Users } from '../scenarios';

export async function setupSpacesAndUsers(
spacesService: ReturnType<FtrProviderContext['getService']>,
securityService: ReturnType<FtrProviderContext['getService']>
) {
export async function setupSpacesAndUsers(getService: FtrProviderContext['getService']) {
const securityService = getService('security');
const spacesService = getService('spaces');

for (const space of Spaces) {
await spacesService.create(space);
}
Expand All @@ -36,7 +36,10 @@ export async function setupSpacesAndUsers(
}
}

export async function tearDownUsers(securityService: ReturnType<FtrProviderContext['getService']>) {
export async function tearDown(getService: FtrProviderContext['getService']) {
const securityService = getService('security');
const esArchiver = getService('esArchiver');

for (const user of Users) {
await securityService.user.delete(user.username);

Expand All @@ -47,30 +50,15 @@ export async function tearDownUsers(securityService: ReturnType<FtrProviderConte
}
}
}

await esArchiver.unload('empty_kibana');
}

// eslint-disable-next-line import/no-default-export
export default function alertingApiIntegrationTests({
loadTestFile,
getService,
}: FtrProviderContext) {
const securityService = getService('security');
const spacesService = getService('spaces');
const esArchiver = getService('esArchiver');

export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
describe('alerting api integration security and spaces enabled', function () {
this.tags('ciGroup5');

before(async () => {
await setupSpacesAndUsers(spacesService, securityService);
});

after(async () => {
await tearDownUsers(securityService);

await esArchiver.unload('empty_kibana');
});

loadTestFile(require.resolve('./actions'));
loadTestFile(require.resolve('./alerting'));
});
Expand Down