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

[Enterprise Search] Add language analyzer to connector index creation (#137256)

Browse source
This commit is contained in:
Sander Philipse 2022-07-27 12:57:04 +02:00 • committed by GitHub
parent 37d5dd6637
commit 58f7eaf0f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.test.ts
View file

@ -14,6 +14,7 @@ import { ErrorCode } from '../../../common/types/error_codes';
import { setupConnectorsIndices } from '../../index_management/setup_indices';
import { fetchCrawlerByIndexName } from '../crawler/fetch_crawlers';
import { textAnalysisSettings } from '../indices/text_analysis';
import { addConnector } from './add_connector';
import { fetchConnectorByIndexName } from './fetch_connectors';
@ -52,7 +53,7 @@ describe('addConnector lib function', () => {
await expect(
addConnector(mockClient as unknown as IScopedClusterClient, {
index_name: 'index_name',
language: 'en',
language: 'fr',
})
).resolves.toEqual({ id: 'fakeId', index_name: 'index_name' });
expect(mockClient.asCurrentUser.index).toHaveBeenCalledWith({
@ -60,7 +61,7 @@ describe('addConnector lib function', () => {
api_key_id: null,
configuration: {},
index_name: 'index_name',
language: 'en',
language: 'fr',
last_seen: null,
last_sync_error: null,
last_sync_status: null,
@ -73,7 +74,10 @@ describe('addConnector lib function', () => {
},
index: CONNECTORS_INDEX,
});
expect(mockClient.asCurrentUser.indices.create).toHaveBeenCalledWith({ index: 'index_name' });
expect(mockClient.asCurrentUser.indices.create).toHaveBeenCalledWith({
index: 'index_name',
settings: textAnalysisSettings('fr'),
});
});
it('should reject if index already exists', async () => {
@ -156,7 +160,10 @@ describe('addConnector lib function', () => {
},
index: CONNECTORS_INDEX,
});
expect(mockClient.asCurrentUser.indices.create).toHaveBeenCalledWith({ index: 'index_name' });
expect(mockClient.asCurrentUser.indices.create).toHaveBeenCalledWith({
index: 'index_name',
settings: textAnalysisSettings(undefined),
});
});
it('should create index if no connectors index exists', async () => {
@ -196,6 +203,7 @@ describe('addConnector lib function', () => {
});
expect(mockClient.asCurrentUser.indices.create).toHaveBeenCalledWith({
index: 'search-index_name',
settings: textAnalysisSettings('en'),
});
});
it('should not create index if status code is not 404', async () => {

6
x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.ts
View file

@ -14,6 +14,7 @@ import { setupConnectorsIndices } from '../../index_management/setup_indices';
import { isIndexNotFoundException } from '../../utils/identify_exceptions';
import { fetchCrawlerByIndexName } from '../crawler/fetch_crawlers';
import { textAnalysisSettings } from '../indices/text_analysis';
import { deleteConnectorById } from './delete_connector';
@ -51,7 +52,10 @@ const createConnector = async (
document,
index: CONNECTORS_INDEX,
});
await client.asCurrentUser.indices.create({ index });
await client.asCurrentUser.indices.create({
index,
settings: textAnalysisSettings(language ?? undefined),
});
await client.asCurrentUser.indices.refresh({ index: CONNECTORS_INDEX });
return { id: result._id, index_name: document.index_name };