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

[7.x] [Rollups] Update API integration test (#96071) #96508

Merged
merged 5 commits into from
Apr 13, 2021
Merged

[7.x] [Rollups] Update API integration test (#96071) #96508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7452036
[Rollups] Update API integration test (#96071)
alisonelizabeth Apr 1, 2021
07b2571
Merge branch '7.x' into backport/7.x/pr-96071
kibanamachine Apr 9, 2021
dea943d
Merge branch '7.x' into backport/7.x/pr-96071
kibanamachine Apr 11, 2021
8610236
Merge branch '7.x' into backport/7.x/pr-96071
kibanamachine Apr 13, 2021
7df2ec0
updated 7.x error handler
jloleysens Apr 13, 2021
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
17 changes: 7 additions & 10 deletions x-pack/plugins/rollup/server/routes/api/jobs/register_start_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,15 @@ export const registerStartRoute = ({
return response.ok({ body: data });
} catch (err) {
// There is an issue opened on ES to handle the following error correctly
// https://github.com/elastic/elasticsearch/issues/42908
// Until then we'll modify the response here.
if (
err?.meta &&
err.body?.task_failures[0]?.reason?.reason?.includes(
'Job must be [STOPPED] before deletion'
)
) {
// https://github.com/elastic/elasticsearch/issues/39845, which was addressed in 8.0
// but not backported to 7.x because it's breaking. So we need to modify the response
// here for 7.x.
if (err.meta?.body?.error?.reason?.includes('Cannot start task for Rollup Job')) {
err.meta.status = 400;
err.meta.statusCode = 400;
err.meta.displayName = 'Bad request';
err.message = err.body.task_failures[0].reason.reason;
err.body.error.status = 400;
err.body.status = 400;
err.meta.displayName = 'Bad Request';
}
return handleEsError({ error: err, response });
}
Expand Down
17 changes: 11 additions & 6 deletions x-pack/test/api_integration/apis/management/rollup/rollup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ export default function ({ getService }) {
cleanUp,
} = registerHelpers(getService);

// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/96002
describe.skip('jobs', () => {
describe('jobs', () => {
after(() => cleanUp());

describe('indices', () => {
Expand Down Expand Up @@ -57,10 +56,16 @@ export default function ({ getService }) {
expect(body.doesMatchIndices).to.be(true);
expect(body.doesMatchRollupIndices).to.be(false);
expect(body.dateFields).to.eql(['testCreatedField']);
expect(body.keywordFields).to.eql(['testTagField']);

// Allowing the test to account for future addition of doc_count
expect(body.numericFields.indexOf('testTotalField')).to.be.greaterThan(-1);
// '_tier' is an expected metadata field from ES
// Order is not guaranteed, so we assert against individual field names
['_tier', 'testTagField'].forEach((keywordField) => {
expect(body.keywordFields.includes(keywordField)).to.be(true);
});
// '_doc_count' is an expected metadata field from ES
// Order is not guaranteed, so we assert against individual field names
['_doc_count', 'testTotalField'].forEach((numericField) => {
expect(body.numericFields.includes(numericField)).to.be(true);
});
});

it("should not return any fields when the index pattern doesn't match any indices", async () => {
Expand Down