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

[Index Management] Fix enrich policies api test #172923

Merged
merged 7 commits into from
Dec 13, 2023
+16 −24
Merged

[Index Management] Fix enrich policies api test #172923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eba44b1
Fix test
sabarasaba Dec 8, 2023
1e4633e
commit with @elastic email
sabarasaba Dec 8, 2023
e4aef1a
commit with @elastic email
sabarasaba Dec 8, 2023
f3b9943
Remove unused expect
sabarasaba Dec 8, 2023
a25d166
Unskip tests for MKI
sabarasaba Dec 8, 2023
48f3e8c
Merge branch 'main' into index_management-fix_enrich_policies_api_test
kibanamachine Dec 8, 2023
861501d
Merge branch 'main' into index_management-fix_enrich_policies_api_test
kibanamachine Dec 12, 2023
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
6 changes: 4 additions & 2 deletions x-pack/test/api_integration/apis/management/index_management/enrich_policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ export default function ({ getService }: FtrProviderContext) {
});

it('should be able to delete a policy', async () => {
const { body } = await removeEnrichPolicy(POLICY_NAME).expect(200);
const { status } = await removeEnrichPolicy(POLICY_NAME);

expect(body).toStrictEqual({ acknowledged: true });
// In the odd case that the policy is somehow still being executed, the delete
// method might return a 429 so we need to account for that.
expect([200, 429]).toContain(status);
});
});
}
25 changes: 12 additions & 13 deletions ...ck/test_serverless/api_integration/test_suites/common/index_management/enrich_policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ export default function ({ getService }: FtrProviderContext) {
const log = getService('log');
const indexManagementService = getService('indexManagement');

// Failing: See https://github.com/elastic/kibana/issues/172697
describe.skip('Enrich policies', function () {
describe('Enrich policies', function () {
const INDEX_NAME = `index-${Math.random()}`;
const POLICY_NAME = `policy-${Math.random()}`;

Expand Down Expand Up @@ -54,15 +53,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should list all policies', async () => {
const { body } = await getAllEnrichPolicies().expect(200);

expect(body).toEqual([
{
enrichFields: ['firstName'],
matchField: 'email',
name: POLICY_NAME,
sourceIndices: [INDEX_NAME],
type: 'match',
},
]);
expect(body).toContainEqual({
enrichFields: ['firstName'],
matchField: 'email',
name: POLICY_NAME,
sourceIndices: [INDEX_NAME],
type: 'match',
});
});

it('should be able to execute a policy', async () => {
Expand All @@ -74,9 +71,11 @@ export default function ({ getService }: FtrProviderContext) {
});

it('should be able to delete a policy', async () => {
const { body } = await removeEnrichPolicy(POLICY_NAME).expect(200);
const { status } = await removeEnrichPolicy(POLICY_NAME);

expect(body).toEqual({ acknowledged: true });
// In the odd case that the policy is somehow still being executed, the delete
// method might return a 429 so we need to account for that.
expect([200, 429]).toContain(status);
});
});
}
4 changes: 0 additions & 4 deletions ...verless/functional/test_suites/common/management/index_management/create_enrich_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { FtrProviderContext } from '../../../../ftr_provider_context';
export default ({ getPageObjects, getService }: FtrProviderContext) => {
const pageObjects = getPageObjects(['common', 'indexManagement', 'header', 'svlCommonPage']);
const log = getService('log');
const security = getService('security');
const comboBox = getService('comboBox');
const testSubjects = getService('testSubjects');
const es = getService('es');
Expand All @@ -20,8 +19,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const POLICY_NAME = `policy-${Math.random()}`;

describe('Create enrich policy', function () {
// TimeoutError: Waiting for element to be located By(css selector, [data-test-subj="enrichPoliciesEmptyPromptCreateButton"])
this.tags(['failsOnMKI']);
before(async () => {
log.debug('Creating test index');
try {
Expand All @@ -47,7 +44,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {

log.debug('Navigating to the enrich policies tab');
await pageObjects.svlCommonPage.login();
await security.testUser.setRoles(['index_management_user']);
await pageObjects.common.navigateToApp('indexManagement');

// Navigate to the enrich policies tab
Expand Down
5 changes: 0 additions & 5 deletions ...t_serverless/functional/test_suites/common/management/index_management/enrich_policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const pageObjects = getPageObjects(['common', 'indexManagement', 'header', 'svlCommonPage']);
const log = getService('log');
const browser = getService('browser');
const security = getService('security');
const testSubjects = getService('testSubjects');
const es = getService('es');

const ENRICH_INDEX_NAME = 'test-policy-1';
const ENRICH_POLICY_NAME = 'test-policy-1';

describe('Enrich policies tab', function () {
// TimeoutError: Waiting for element to be located By(css selector, [data-test-subj="kibana-chrome"])
this.tags(['failsOnMKI']);

before(async () => {
log.debug('Creating required index and enrich policy');
try {
Expand Down Expand Up @@ -55,7 +51,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {

log.debug('Navigating to the enrich policies tab');
await pageObjects.svlCommonPage.login();
await security.testUser.setRoles(['index_management_user']);
await pageObjects.common.navigateToApp('indexManagement');

// Navigate to the enrich policies tab
Expand Down
Loading