Skip to content

Commit

Permalink
Replace 'ent-search-generic' with 'search-default' pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
seanstory committed Dec 17, 2024
1 parent 15dc9c7 commit 67a4a58
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const spoConnector: Connector = {
last_indexed_document_count: 1000,
pipeline: {
extract_binary_content: false,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down Expand Up @@ -99,7 +99,7 @@ export const mysqlConnector: Connector = {
last_indexed_document_count: 2000,
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('createConnectorDocument', () => {
name: 'indexName-name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down Expand Up @@ -103,7 +103,7 @@ describe('createConnectorDocument', () => {
name: 'indexName-name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/enterprise_search/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export const ENTERPRISE_SEARCH_DOCUMENTS_DEFAULT_DOC_COUNT = 25;

export const ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE = 'elastic-crawler';

export const DEFAULT_PIPELINE_NAME = 'ent-search-generic-ingestion';
export const DEFAULT_PIPELINE_NAME = 'search-default-ingestion';
export const DEFAULT_PIPELINE_VALUES: IngestPipelineParams = {
extract_binary_content: true,
name: DEFAULT_PIPELINE_NAME,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('IndexPipelinesConfigurationsLogic', () => {
});
it('fetchIndexPipelinesDataSuccess selects index ingest pipeline if found', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
[indexName]: {
Expand All @@ -68,23 +68,23 @@ describe('IndexPipelinesConfigurationsLogic', () => {
});
it('fetchIndexPipelinesDataSuccess selects first pipeline as default pipeline', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
};
FetchCustomPipelineApiLogic.actions.apiSuccess(pipelines);
await nextTick();

expect(IndexPipelinesConfigurationsLogic.values.selectedPipelineId).toEqual(
'ent-search-generic-ingest'
'search-default-ingest'
);
});
});

describe('selectors', () => {
it('pipelineNames returns names of pipelines', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
[indexName]: {
Expand All @@ -96,13 +96,13 @@ describe('IndexPipelinesConfigurationsLogic', () => {
await nextTick();

expect(IndexPipelinesConfigurationsLogic.values.pipelineNames).toEqual([
'ent-search-generic-ingest',
'search-default-ingest',
indexName,
]);
});
it('selectedPipeline returns full pipeline', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
foo: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { PipelinesLogic } from './pipelines_logic';

const DEFAULT_PIPELINE_VALUES = {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const mockConnector: Connector = {
name: 'test',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('addConnector lib function', () => {
_meta: {
pipeline: {
default_extract_binary_content: true,
default_name: 'ent-search-generic-ingestion',
default_name: 'search-default-ingestion',
default_reduce_whitespace: true,
default_run_ml_inference: true,
},
Expand Down Expand Up @@ -89,7 +89,7 @@ describe('addConnector lib function', () => {
name: 'index_name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down Expand Up @@ -134,7 +134,7 @@ describe('addConnector lib function', () => {
name: 'index_name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down Expand Up @@ -264,7 +264,7 @@ describe('addConnector lib function', () => {
name: '',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down

0 comments on commit 67a4a58

Please sign in to comment.