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

[ingest pipeline mgmt] sort list of ip location databases for consistent output #197361

Merged
merged 5 commits into from
Oct 24, 2024
Merged

[ingest pipeline mgmt] sort list of ip location databases for consistent output #197361

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
98592b8
sort results, otherwise they're semi-random
mattkime Oct 23, 2024
8dacfa9
move sort and log
mattkime Oct 23, 2024
e10a6cc
reverse test value
mattkime Oct 23, 2024
0dc493b
cleanup
mattkime Oct 23, 2024
2380521
Merge branch 'main' into ingest_pipeline_api_flaky_test_fix
mattkime Oct 23, 2024
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
5 changes: 3 additions & 2 deletions x-pack/plugins/ingest_pipelines/server/routes/api/database/list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import sortBy from 'lodash/sortBy';
import { deserializeGeoipDatabase, type GeoipDatabaseFromES } from './serialization';
import { API_BASE_PATH } from '../../../../common/constants';
import { RouteDependencies } from '../../../types';
Expand All @@ -21,9 +22,9 @@ export const registerListDatabaseRoute = ({
databases: GeoipDatabaseFromES[];
};

const geoipDatabases = data.databases;
const body = sortBy(data.databases.map(deserializeGeoipDatabase), 'name');

return res.ok({ body: geoipDatabases.map(deserializeGeoipDatabase) });
return res.ok({ body });
} catch (error) {
const esErrorResponse = handleEsError({ error, response: res });
if (esErrorResponse.status === 404) {
Expand Down
17 changes: 7 additions & 10 deletions x-pack/test/api_integration/apis/management/ingest_pipelines/databases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ export default function ({ getService }: FtrProviderContext) {
const ipinfoDatabaseName = 'asn';
const normalizedIpinfoDatabaseName = 'asn';

// Failing: See https://github.com/elastic/kibana/issues/196765
// Failing: See https://github.com/elastic/kibana/issues/196765
describe.skip('Manage databases', function () {
describe('Manage databases', function () {
after(async () => {
await ingestPipelines.api.deleteGeoipDatabases();
});
Expand Down Expand Up @@ -64,21 +62,20 @@ export default function ({ getService }: FtrProviderContext) {
});
});

// FLAKY: https://github.com/elastic/kibana/issues/196765
describe.skip('List', () => {
describe('List', () => {
it('returns existing databases', async () => {
const { body } = await supertest.get(url).set('kbn-xsrf', 'xxx').expect(200);
expect(body).to.eql([
{
id: normalizedIpinfoDatabaseName,
name: ipinfoDatabaseName,
type: 'ipinfo',
},
{
id: normalizedMaxmindDatabaseName,
name: maxmindDatabaseName,
type: 'maxmind',
},
{
id: normalizedIpinfoDatabaseName,
name: ipinfoDatabaseName,
type: 'ipinfo',
},
]);
});
});
Expand Down