github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Removing Boom wrappers from filter api errors (#128497)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
James Gowdy 2022-03-28 12:13:18 +01:00 • committed by GitHub
parent c1b7448e54
commit 817d732fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

151
x-pack/plugins/ml/server/models/filter/filter_manager.ts
View file

@ -45,108 +45,89 @@ export class FilterManager {
constructor(private _mlClient: MlClient) {}
async getFilter(filterId: string) {
try {
const {
filters: [filter],
} = await this._mlClient.getFilters({ filter_id: filterId });
if (filter === undefined) {
// could be an empty list rather than a 404 if a wildcard was used,
// so throw our own 404
throw Boom.notFound(`Filter with the id "${filterId}" not found`);
}
const { jobs } = await this._mlClient.getJobs();
const filtersInUse = this.buildFiltersInUse(jobs);
return {
...filter,
used_by: filtersInUse[filter.filter_id],
item_count: 0,
} as FilterStats;
} catch (error) {
throw Boom.badRequest(error);
const {
filters: [filter],
} = await this._mlClient.getFilters({ filter_id: filterId });
if (filter === undefined) {
// could be an empty list rather than a 404 if a wildcard was used,
// so throw our own 404
throw Boom.notFound(`Filter with the id "${filterId}" not found`);
}
const { jobs } = await this._mlClient.getJobs();
const filtersInUse = this.buildFiltersInUse(jobs);
return {
...filter,
used_by: filtersInUse[filter.filter_id],
item_count: 0,
} as FilterStats;
}
async getAllFilters() {
try {
const body = await this._mlClient.getFilters({ size: 1000 });
return body.filters;
} catch (error) {
throw Boom.badRequest(error);
}
const body = await this._mlClient.getFilters({ size: 1000 });
return body.filters;
}
async getAllFilterStats() {
try {
const [JOBS, FILTERS] = [0, 1];
const results = await Promise.all([
this._mlClient.getJobs(),
this._mlClient.getFilters({ size: 1000 }),
]);
const [JOBS, FILTERS] = [0, 1];
const results = await Promise.all([
this._mlClient.getJobs(),
this._mlClient.getFilters({ size: 1000 }),
]);
// Build a map of filter_ids against jobs and detectors using that filter.
let filtersInUse: FiltersInUse = {};
if (results[JOBS] && (results[JOBS] as estypes.MlGetJobsResponse).jobs) {
filtersInUse = this.buildFiltersInUse((results[JOBS] as estypes.MlGetJobsResponse).jobs);
}
// For each filter, return just
// filter_id
// description
// item_count
// jobs using the filter
const filterStats: FilterStats[] = [];
if (results[FILTERS] && (results[FILTERS] as estypes.MlGetFiltersResponse).filters) {
(results[FILTERS] as estypes.MlGetFiltersResponse).filters.forEach((filter: Filter) => {
const stats: FilterStats = {
filter_id: filter.filter_id,
description: filter.description,
item_count: filter.items.length,
used_by: filtersInUse[filter.filter_id],
};
filterStats.push(stats);
});
}
return filterStats;
} catch (error) {
throw Boom.badRequest(error);
// Build a map of filter_ids against jobs and detectors using that filter.
let filtersInUse: FiltersInUse = {};
if (results[JOBS] && (results[JOBS] as estypes.MlGetJobsResponse).jobs) {
filtersInUse = this.buildFiltersInUse((results[JOBS] as estypes.MlGetJobsResponse).jobs);
}
// For each filter, return just
// filter_id
// description
// item_count
// jobs using the filter
const filterStats: FilterStats[] = [];
if (results[FILTERS] && (results[FILTERS] as estypes.MlGetFiltersResponse).filters) {
(results[FILTERS] as estypes.MlGetFiltersResponse).filters.forEach((filter: Filter) => {
const stats: FilterStats = {
filter_id: filter.filter_id,
description: filter.description,
item_count: filter.items.length,
used_by: filtersInUse[filter.filter_id],
};
filterStats.push(stats);
});
}
return filterStats;
}
async newFilter(filter: FormFilter) {
const { filterId, ...body } = filter;
try {
// Returns the newly created filter.
return await this._mlClient.putFilter({ filter_id: filterId, body });
} catch (error) {
throw Boom.badRequest(error);
}
// Returns the newly created filter.
return await this._mlClient.putFilter({ filter_id: filterId, body });
}
async updateFilter(filterId: string, filter: UpdateFilter) {
try {
const body: FilterRequest = { filter_id: filterId };
if (filter.description !== undefined) {
body.description = filter.description;
}
if (filter.addItems !== undefined) {
body.add_items = filter.addItems;
}
if (filter.removeItems !== undefined) {
body.remove_items = filter.removeItems;
}
// Returns the newly updated filter.
const resp = await this._mlClient.updateFilter({
filter_id: filterId,
body,
});
return resp;
} catch (error) {
throw Boom.badRequest(error);
const body: FilterRequest = { filter_id: filterId };
if (filter.description !== undefined) {
body.description = filter.description;
}
if (filter.addItems !== undefined) {
body.add_items = filter.addItems;
}
if (filter.removeItems !== undefined) {
body.remove_items = filter.removeItems;
}
// Returns the newly updated filter.
const resp = await this._mlClient.updateFilter({
filter_id: filterId,
body,
});
return resp;
}
async deleteFilter(filterId: string) {

6
x-pack/test/api_integration/apis/ml/filters/get_filters.ts
View file

@ -87,14 +87,14 @@ export default ({ getService }: FtrProviderContext) => {
expect(body.items).to.eql(requestBody.items);
});
it(`should return 400 if filterId does not exist`, async () => {
it(`should return 404 if filterId does not exist`, async () => {
const { body, status } = await supertest
.get(`/api/ml/filters/filter_id_dne`)
.auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
.set(COMMON_REQUEST_HEADERS);
ml.api.assertResponseStatusCode(400, status, body);
ml.api.assertResponseStatusCode(404, status, body);
expect(body.error).to.eql('Bad Request');
expect(body.error).to.eql('Not Found');
expect(body.message).to.contain('resource_not_found_exception');
});
});

2
x-pack/test/api_integration/apis/ml/filters/update_filters.ts
View file

@ -110,7 +110,7 @@ export default ({ getService }: FtrProviderContext) => {
.auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
.set(COMMON_REQUEST_HEADERS)
.send(updateFilterRequestBody);
ml.api.assertResponseStatusCode(400, status, body);
ml.api.assertResponseStatusCode(404, status, body);
expect(body.message).to.contain('resource_not_found_exception');
});