Skip to content

Commit 386f597

Browse files
seanstoryJoseLuisGJ
authored andcommitted
Replace 'ent-search-generic' with 'search-default' pipeline (elastic#204670)
## Summary Part of elastic/search-team#8812 This PR replaces usage of `ent-search-generic-ingestion` pipeline with `search-default-ingestion` pipeline. The function of these two is identical, the only difference being their name. This merely removes a reference to "ent-search" (Enterprise Search) for 9.0 where Enterprise Search will no longer be available. ### Related PRs - Elasticsearch changes: elastic/elasticsearch#118899 - Connectors changes: elastic/connectors#3049
1 parent 5fba6eb commit 386f597

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

packages/kbn-search-connectors/lib/collect_connector_stats_test_data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const spoConnector: Connector = {
2929
last_indexed_document_count: 1000,
3030
pipeline: {
3131
extract_binary_content: false,
32-
name: 'ent-search-generic-ingestion',
32+
name: 'search-default-ingestion',
3333
reduce_whitespace: true,
3434
run_ml_inference: false,
3535
},
@@ -99,7 +99,7 @@ export const mysqlConnector: Connector = {
9999
last_indexed_document_count: 2000,
100100
pipeline: {
101101
extract_binary_content: true,
102-
name: 'ent-search-generic-ingestion',
102+
name: 'search-default-ingestion',
103103
reduce_whitespace: true,
104104
run_ml_inference: false,
105105
},

packages/kbn-search-connectors/lib/create_connector_document.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('createConnectorDocument', () => {
2121
name: 'indexName-name',
2222
pipeline: {
2323
extract_binary_content: true,
24-
name: 'ent-search-generic-ingestion',
24+
name: 'search-default-ingestion',
2525
reduce_whitespace: true,
2626
run_ml_inference: false,
2727
},
@@ -103,7 +103,7 @@ describe('createConnectorDocument', () => {
103103
name: 'indexName-name',
104104
pipeline: {
105105
extract_binary_content: true,
106-
name: 'ent-search-generic-ingestion',
106+
name: 'search-default-ingestion',
107107
reduce_whitespace: true,
108108
run_ml_inference: false,
109109
},

x-pack/plugins/enterprise_search/common/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export const ENTERPRISE_SEARCH_DOCUMENTS_DEFAULT_DOC_COUNT = 25;
235235

236236
export const ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE = 'elastic-crawler';
237237

238-
export const DEFAULT_PIPELINE_NAME = 'ent-search-generic-ingestion';
238+
export const DEFAULT_PIPELINE_NAME = 'search-default-ingestion';
239239
export const DEFAULT_PIPELINE_VALUES: IngestPipelineParams = {
240240
extract_binary_content: true,
241241
name: DEFAULT_PIPELINE_NAME,

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipelines_json_configurations_logic.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('IndexPipelinesConfigurationsLogic', () => {
5353
});
5454
it('fetchIndexPipelinesDataSuccess selects index ingest pipeline if found', async () => {
5555
const pipelines = {
56-
'ent-search-generic-ingest': {
56+
'search-default-ingest': {
5757
version: 1,
5858
},
5959
[indexName]: {
@@ -68,23 +68,23 @@ describe('IndexPipelinesConfigurationsLogic', () => {
6868
});
6969
it('fetchIndexPipelinesDataSuccess selects first pipeline as default pipeline', async () => {
7070
const pipelines = {
71-
'ent-search-generic-ingest': {
71+
'search-default-ingest': {
7272
version: 1,
7373
},
7474
};
7575
FetchCustomPipelineApiLogic.actions.apiSuccess(pipelines);
7676
await nextTick();
7777

7878
expect(IndexPipelinesConfigurationsLogic.values.selectedPipelineId).toEqual(
79-
'ent-search-generic-ingest'
79+
'search-default-ingest'
8080
);
8181
});
8282
});
8383

8484
describe('selectors', () => {
8585
it('pipelineNames returns names of pipelines', async () => {
8686
const pipelines = {
87-
'ent-search-generic-ingest': {
87+
'search-default-ingest': {
8888
version: 1,
8989
},
9090
[indexName]: {
@@ -96,13 +96,13 @@ describe('IndexPipelinesConfigurationsLogic', () => {
9696
await nextTick();
9797

9898
expect(IndexPipelinesConfigurationsLogic.values.pipelineNames).toEqual([
99-
'ent-search-generic-ingest',
99+
'search-default-ingest',
100100
indexName,
101101
]);
102102
});
103103
it('selectedPipeline returns full pipeline', async () => {
104104
const pipelines = {
105-
'ent-search-generic-ingest': {
105+
'search-default-ingest': {
106106
version: 1,
107107
},
108108
foo: {

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipelines_logic.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { PipelinesLogic } from './pipelines_logic';
2121

2222
const DEFAULT_PIPELINE_VALUES = {
2323
extract_binary_content: true,
24-
name: 'ent-search-generic-ingestion',
24+
name: 'search-default-ingestion',
2525
reduce_whitespace: true,
2626
run_ml_inference: true,
2727
};

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/header_actions/syncs_logic.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const mockConnector: Connector = {
126126
name: 'test',
127127
pipeline: {
128128
extract_binary_content: true,
129-
name: 'ent-search-generic-ingestion',
129+
name: 'search-default-ingestion',
130130
reduce_whitespace: true,
131131
run_ml_inference: true,
132132
},

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('addConnector lib function', () => {
5252
_meta: {
5353
pipeline: {
5454
default_extract_binary_content: true,
55-
default_name: 'ent-search-generic-ingestion',
55+
default_name: 'search-default-ingestion',
5656
default_reduce_whitespace: true,
5757
default_run_ml_inference: true,
5858
},
@@ -89,7 +89,7 @@ describe('addConnector lib function', () => {
8989
name: 'index_name',
9090
pipeline: {
9191
extract_binary_content: true,
92-
name: 'ent-search-generic-ingestion',
92+
name: 'search-default-ingestion',
9393
reduce_whitespace: true,
9494
run_ml_inference: true,
9595
},
@@ -134,7 +134,7 @@ describe('addConnector lib function', () => {
134134
name: 'index_name',
135135
pipeline: {
136136
extract_binary_content: true,
137-
name: 'ent-search-generic-ingestion',
137+
name: 'search-default-ingestion',
138138
reduce_whitespace: true,
139139
run_ml_inference: true,
140140
},
@@ -264,7 +264,7 @@ describe('addConnector lib function', () => {
264264
name: '',
265265
pipeline: {
266266
extract_binary_content: true,
267-
name: 'ent-search-generic-ingestion',
267+
name: 'search-default-ingestion',
268268
reduce_whitespace: true,
269269
run_ml_inference: true,
270270
},

0 commit comments

Comments
 (0)