maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "[Rollup] Api integration test wildcard + search (#32884)"

Browse source 
This reverts commit 6374c9676f.
This commit is contained in:
spalger 2019-03-13 11:02:37 -07:00
parent 228d69c708
commit 5c3ac275a6
8 changed files with 12 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/rollup/public/search/rollup_search_strategy.js
View file

@ -18,7 +18,7 @@ function getAllFetchParams(searchRequests, Promise) {
});
}
function serializeAllFetchParams(fetchParams, searchRequests) {
async function serializeAllFetchParams(fetchParams, searchRequests) {
const searchRequestsWithFetchParams = [];
const failedSearchRequests = [];

4
x-pack/plugins/rollup/server/lib/jobs_compatibility.js
View file

@ -53,12 +53,12 @@ export function mergeJobConfigurations(jobs = []) {
const aggName = agg.agg;
const aggDoesntExist = !allAggs[aggName];
const fieldDoesntExist = allAggs[aggName] && !allAggs[aggName][fieldName];
const isDateHistogramAgg = aggName === 'date_histogram';
const aggIsntDateHistogram = aggName !== 'date_histogram';
// If we currently don't have this aggregation, add it.
// Special case for date histogram, since there can only be one
// date histogram field.
if(aggDoesntExist || (fieldDoesntExist && !isDateHistogramAgg)) {
if(aggDoesntExist || (fieldDoesntExist && aggIsntDateHistogram)) {
allAggs[aggName] = allAggs[aggName] || {};
allAggs[aggName][fieldName] = { ...agg };
}

7
x-pack/test/api_integration/apis/management/rollup/constants.js
View file

@ -5,12 +5,11 @@
*/
export const API_BASE_PATH = '/api/rollup';
export const INDEX_PATTERNS_EXTENSION_BASE_PATH = '/api/index_patterns/rollup';
export const ROLLUP_INDEX_NAME = 'rollup_index';
export const INDEX_TO_ROLLUP_MAPPINGS = {
properties: {
testTotalField: { type: 'long' },
testTagField: { type: 'keyword' },
testCreatedField: { type: 'date' },
testTotalField: { 'type': 'long' },
testTagField: { 'type': 'keyword' },
testCreatedField: { 'type': 'date' },
}
};

2
x-pack/test/api_integration/apis/management/rollup/index.js
View file

@ -7,7 +7,5 @@
export default function ({ loadTestFile }) {
describe('rollup', () => {
loadTestFile(require.resolve('./rollup'));
loadTestFile(require.resolve('./index_patterns_extensions'));
loadTestFile(require.resolve('./rollup_search'));
});
}

104
x-pack/test/api_integration/apis/management/rollup/index_patterns_extensions.js
View file

@ -1,104 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import expect from 'expect.js';
import querystring from 'querystring';
import { registerHelpers } from './rollup.test_helpers';
import { INDEX_TO_ROLLUP_MAPPINGS, INDEX_PATTERNS_EXTENSION_BASE_PATH } from './constants';
import { getRandomString } from './lib';
export default function ({ getService }) {
const supertest = getService('supertest');
const es = getService('es');
const {
createIndexWithMappings,
getJobPayload,
createJob,
cleanUp,
} = registerHelpers({ supertest, es });
describe('index patterns extension', () => {
describe('Fields for wildcards', () => {
const BASE_URI = `${INDEX_PATTERNS_EXTENSION_BASE_PATH}/_fields_for_wildcard`;
describe('query params validation', () => {
let uri;
let body;
let params;
it('"pattern" is required', async () => {
uri = `${BASE_URI}`;
({ body } = await supertest.get(uri).expect(400));
expect(body.message).to.contain('"pattern" is required');
});
it('"params" is required', async () => {
params = { pattern: 'foo' };
uri = `${BASE_URI}?${querystring.stringify(params)}`;
({ body } = await supertest.get(uri).expect(400));
expect(body.message).to.contain('"params" is required');
});
it('"params" must be an object', async () => {
params = { pattern: 'foo', params: 'bar' };
uri = `${BASE_URI}?${querystring.stringify(params)}`;
({ body } = await supertest.get(uri).expect(400));
expect(body.message).to.contain('"params" must be an object');
});
it('"params" must be an object that only accepts a "rollup_index" property', async () => {
params = { pattern: 'foo', params: JSON.stringify({ someProp: 'bar' }) };
uri = `${BASE_URI}?${querystring.stringify(params)}`;
({ body } = await supertest.get(uri).expect(400));
expect(body.message).to.contain('"someProp" is not allowed');
});
it('"meta_fields" must be an Array', async () => {
params = {
pattern: 'foo',
params: JSON.stringify({ rollup_index: 'bar' }),
meta_fields: 'stringValue'
};
uri = `${BASE_URI}?${querystring.stringify(params)}`;
({ body } = await supertest.get(uri).expect(400));
expect(body.message).to.contain('"meta_fields" must be an array');
});
it('should return 404 the rollup index to query does not exist', async () => {
uri = `${BASE_URI}?${querystring.stringify({ pattern: 'foo', params: JSON.stringify({ rollup_index: 'bar' }) })}`;
({ body } = await supertest.get(uri).expect(404));
expect(body.message).to.contain('no such index [bar]');
});
});
it('should return the correct fields', async () => {
// Create a Rollup job on an index with the INDEX_TO_ROLLUP_MAPPINGS
const indexName = await createIndexWithMappings();
const rollupIndex = getRandomString();
const payload = getJobPayload(indexName, undefined, rollupIndex);
await createJob(payload);
// Query for wildcard
const params = {
pattern: indexName,
params: JSON.stringify({ rollup_index: rollupIndex })
};
const uri = `${BASE_URI}?${querystring.stringify(params)}`;
const { body } = await supertest.get(uri).expect(200);
// Verify that the fields for wildcard correspond to our declared mappings
const propertiesWithMappings = Object.keys(INDEX_TO_ROLLUP_MAPPINGS.properties);
const fieldsForWildcard = body.fields.map(field => field.name);
expect(fieldsForWildcard.sort()).eql(propertiesWithMappings.sort());
// Cleanup
await cleanUp();
});
});
});
}

8
x-pack/test/api_integration/apis/management/rollup/rollup.js
View file

@ -23,10 +23,10 @@ export default function ({ getService }) {
cleanUp,
} = registerHelpers({ supertest, es });
describe('jobs', () => {
describe('Rollup jobs', () => {
after(() => cleanUp());
describe('indices', () => {
describe('Rollup indices', () => {
it('should return an empty object when there are no rollup indices', async () => {
const uri = `${API_BASE_PATH}/indices`;
@ -74,7 +74,7 @@ export default function ({ getService }) {
});
});
describe('crud', () => {
describe('Crud', () => {
describe('list', () => {
it('should return an empty array when there are no jobs', async () => {
const { body } = await supertest
@ -206,7 +206,7 @@ export default function ({ getService }) {
});
});
describe('actions', () => {
describe('Actions', () => {
describe('start', () => {
let job;

4
x-pack/test/api_integration/apis/management/rollup/rollup.test_helpers.js
View file

@ -17,11 +17,11 @@ export const registerHelpers = ({ supertest, es }) => {
return createIndex(indexName, { mappings });
};
const getJobPayload = (indexName, id = getRandomString(), rollupIndex = ROLLUP_INDEX_NAME) => ({
const getJobPayload = (indexName, id = getRandomString()) => ({
job: {
id,
index_pattern: indexName,
rollup_index: rollupIndex,
rollup_index: ROLLUP_INDEX_NAME,
cron: '0 0 0 ? * 7',
page_size: 1000,
groups: {

55
x-pack/test/api_integration/apis/management/rollup/rollup_search.js
View file

@ -1,55 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import expect from 'expect.js';
import { registerHelpers } from './rollup.test_helpers';
import { API_BASE_PATH } from './constants';
import { getRandomString } from './lib';
export default function ({ getService }) {
const supertest = getService('supertest');
const es = getService('es');
const {
createIndexWithMappings,
getJobPayload,
createJob,
cleanUp,
} = registerHelpers({ supertest, es });
describe('search', () => {
const URI = `${API_BASE_PATH}/search`;
it('return a 404 if the rollup index does not exist', async () => {
const { body } = await supertest
.post(URI)
.set('kbn-xsrf', 'xxx')
.send([{ index: 'unknown', query: {} } ])
.expect(404);
expect(body.message).to.contain('no such index [unknown]');
});
it('should return a 200 when searching on existing rollup index', async () => {
// Create a Rollup job on an index with the INDEX_TO_ROLLUP_MAPPINGS
const indexName = await createIndexWithMappings();
const rollupIndex = getRandomString();
await createJob(getJobPayload(indexName, undefined, rollupIndex));
const { body } = await supertest
.post(URI)
.set('kbn-xsrf', 'xxx')
.send([{ index: rollupIndex, query: { size: 0 } } ])
.expect(200);
// make sure total hits is an integer and not an object
expect(body[0].hits.total).to.equal(0);
await cleanUp();
});
});
}