forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
INGEST: Add Pipeline Processor (elastic#32473)
* INGEST: Add Pipeline Processor * Adds Processor capable of invoking other pipelines * Closes elastic#31842
- Loading branch information
1 parent
bc22d07
commit 36fa3cd
Showing
7 changed files
with
330 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/PipelineProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.ingest.common; | ||
|
||
import java.util.Map; | ||
import org.elasticsearch.ingest.AbstractProcessor; | ||
import org.elasticsearch.ingest.ConfigurationUtils; | ||
import org.elasticsearch.ingest.IngestDocument; | ||
import org.elasticsearch.ingest.IngestService; | ||
import org.elasticsearch.ingest.Pipeline; | ||
import org.elasticsearch.ingest.Processor; | ||
|
||
public class PipelineProcessor extends AbstractProcessor { | ||
|
||
public static final String TYPE = "pipeline"; | ||
|
||
private final String pipelineName; | ||
|
||
private final IngestService ingestService; | ||
|
||
private PipelineProcessor(String tag, String pipelineName, IngestService ingestService) { | ||
super(tag); | ||
this.pipelineName = pipelineName; | ||
this.ingestService = ingestService; | ||
} | ||
|
||
@Override | ||
public void execute(IngestDocument ingestDocument) throws Exception { | ||
Pipeline pipeline = ingestService.getPipeline(pipelineName); | ||
if (pipeline == null) { | ||
throw new IllegalStateException("Pipeline processor configured for non-existent pipeline [" + pipelineName + ']'); | ||
} | ||
ingestDocument.executePipeline(pipeline); | ||
} | ||
|
||
@Override | ||
public String getType() { | ||
return TYPE; | ||
} | ||
|
||
public static final class Factory implements Processor.Factory { | ||
|
||
private final IngestService ingestService; | ||
|
||
public Factory(IngestService ingestService) { | ||
this.ingestService = ingestService; | ||
} | ||
|
||
@Override | ||
public PipelineProcessor create(Map<String, Processor.Factory> registry, String processorTag, | ||
Map<String, Object> config) throws Exception { | ||
String pipeline = | ||
ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "pipeline"); | ||
return new PipelineProcessor(processorTag, pipeline, ingestService); | ||
} | ||
} | ||
} |
115 changes: 115 additions & 0 deletions
115
...s/ingest-common/src/test/java/org/elasticsearch/ingest/common/PipelineProcessorTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.elasticsearch.ingest.common; | ||
|
||
import java.util.Collections; | ||
import java.util.HashMap; | ||
import java.util.Map; | ||
import java.util.concurrent.CompletableFuture; | ||
import org.elasticsearch.ElasticsearchException; | ||
import org.elasticsearch.ingest.CompoundProcessor; | ||
import org.elasticsearch.ingest.IngestDocument; | ||
import org.elasticsearch.ingest.IngestService; | ||
import org.elasticsearch.ingest.Pipeline; | ||
import org.elasticsearch.ingest.Processor; | ||
import org.elasticsearch.ingest.RandomDocumentPicks; | ||
import org.elasticsearch.test.ESTestCase; | ||
|
||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.when; | ||
|
||
public class PipelineProcessorTests extends ESTestCase { | ||
|
||
public void testExecutesPipeline() throws Exception { | ||
String pipelineId = "pipeline"; | ||
IngestService ingestService = mock(IngestService.class); | ||
CompletableFuture<IngestDocument> invoked = new CompletableFuture<>(); | ||
IngestDocument testIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>()); | ||
Pipeline pipeline = new Pipeline( | ||
pipelineId, null, null, | ||
new CompoundProcessor(new Processor() { | ||
@Override | ||
public void execute(final IngestDocument ingestDocument) throws Exception { | ||
invoked.complete(ingestDocument); | ||
} | ||
|
||
@Override | ||
public String getType() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public String getTag() { | ||
return null; | ||
} | ||
}) | ||
); | ||
when(ingestService.getPipeline(pipelineId)).thenReturn(pipeline); | ||
PipelineProcessor.Factory factory = new PipelineProcessor.Factory(ingestService); | ||
Map<String, Object> config = new HashMap<>(); | ||
config.put("pipeline", pipelineId); | ||
factory.create(Collections.emptyMap(), null, config).execute(testIngestDocument); | ||
assertEquals(testIngestDocument, invoked.get()); | ||
} | ||
|
||
public void testThrowsOnMissingPipeline() throws Exception { | ||
IngestService ingestService = mock(IngestService.class); | ||
IngestDocument testIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>()); | ||
PipelineProcessor.Factory factory = new PipelineProcessor.Factory(ingestService); | ||
Map<String, Object> config = new HashMap<>(); | ||
config.put("pipeline", "missingPipelineId"); | ||
IllegalStateException e = expectThrows( | ||
IllegalStateException.class, | ||
() -> factory.create(Collections.emptyMap(), null, config).execute(testIngestDocument) | ||
); | ||
assertEquals( | ||
"Pipeline processor configured for non-existent pipeline [missingPipelineId]", e.getMessage() | ||
); | ||
} | ||
|
||
public void testThrowsOnRecursivePipelineInvocations() throws Exception { | ||
String innerPipelineId = "inner"; | ||
String outerPipelineId = "outer"; | ||
IngestService ingestService = mock(IngestService.class); | ||
IngestDocument testIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>()); | ||
Map<String, Object> outerConfig = new HashMap<>(); | ||
outerConfig.put("pipeline", innerPipelineId); | ||
PipelineProcessor.Factory factory = new PipelineProcessor.Factory(ingestService); | ||
Pipeline outer = new Pipeline( | ||
outerPipelineId, null, null, | ||
new CompoundProcessor(factory.create(Collections.emptyMap(), null, outerConfig)) | ||
); | ||
Map<String, Object> innerConfig = new HashMap<>(); | ||
innerConfig.put("pipeline", outerPipelineId); | ||
Pipeline inner = new Pipeline( | ||
innerPipelineId, null, null, | ||
new CompoundProcessor(factory.create(Collections.emptyMap(), null, innerConfig)) | ||
); | ||
when(ingestService.getPipeline(outerPipelineId)).thenReturn(outer); | ||
when(ingestService.getPipeline(innerPipelineId)).thenReturn(inner); | ||
outerConfig.put("pipeline", innerPipelineId); | ||
ElasticsearchException e = expectThrows( | ||
ElasticsearchException.class, | ||
() -> factory.create(Collections.emptyMap(), null, outerConfig).execute(testIngestDocument) | ||
); | ||
assertEquals( | ||
"Recursive invocation of pipeline [inner] detected.", e.getRootCause().getMessage() | ||
); | ||
} | ||
} |
113 changes: 113 additions & 0 deletions
113
...les/ingest-common/src/test/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
--- | ||
teardown: | ||
- do: | ||
ingest.delete_pipeline: | ||
id: "inner" | ||
ignore: 404 | ||
|
||
- do: | ||
ingest.delete_pipeline: | ||
id: "outer" | ||
ignore: 404 | ||
|
||
--- | ||
"Test Pipeline Processor with Simple Inner Pipeline": | ||
- do: | ||
ingest.put_pipeline: | ||
id: "inner" | ||
body: > | ||
{ | ||
"description" : "inner pipeline", | ||
"processors" : [ | ||
{ | ||
"set" : { | ||
"field": "foo", | ||
"value": "bar" | ||
} | ||
}, | ||
{ | ||
"set" : { | ||
"field": "baz", | ||
"value": "blub" | ||
} | ||
} | ||
] | ||
} | ||
- match: { acknowledged: true } | ||
|
||
- do: | ||
ingest.put_pipeline: | ||
id: "outer" | ||
body: > | ||
{ | ||
"description" : "outer pipeline", | ||
"processors" : [ | ||
{ | ||
"pipeline" : { | ||
"pipeline": "inner" | ||
} | ||
} | ||
] | ||
} | ||
- match: { acknowledged: true } | ||
|
||
- do: | ||
index: | ||
index: test | ||
type: test | ||
id: 1 | ||
pipeline: "outer" | ||
body: {} | ||
|
||
- do: | ||
get: | ||
index: test | ||
type: test | ||
id: 1 | ||
- match: { _source.foo: "bar" } | ||
- match: { _source.baz: "blub" } | ||
|
||
--- | ||
"Test Pipeline Processor with Circular Pipelines": | ||
- do: | ||
ingest.put_pipeline: | ||
id: "outer" | ||
body: > | ||
{ | ||
"description" : "outer pipeline", | ||
"processors" : [ | ||
{ | ||
"pipeline" : { | ||
"pipeline": "inner" | ||
} | ||
} | ||
] | ||
} | ||
- match: { acknowledged: true } | ||
|
||
- do: | ||
ingest.put_pipeline: | ||
id: "inner" | ||
body: > | ||
{ | ||
"description" : "inner pipeline", | ||
"processors" : [ | ||
{ | ||
"pipeline" : { | ||
"pipeline": "outer" | ||
} | ||
} | ||
] | ||
} | ||
- match: { acknowledged: true } | ||
|
||
- do: | ||
catch: /illegal_state_exception/ | ||
index: | ||
index: test | ||
type: test | ||
id: 1 | ||
pipeline: "outer" | ||
body: {} | ||
- match: { error.root_cause.0.type: "exception" } | ||
- match: { error.root_cause.0.reason: "java.lang.IllegalArgumentException: java.lang.IllegalStateException: Recursive invocation of pipeline [inner] detected." } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters