Skip to content

Commit

Permalink
Added some tests for resolving pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosdelest
carlosdelest committed Dec 14, 2023
1 parent 819adeb commit 3a96bf9
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 0 deletions.
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/ingest/IngestService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,10 @@ List<Pipeline> getPluginsPipelines(String id) {
return this.pluginPipelines.get(id);
}

void setPluginsPipelines(String id, List<Pipeline> pipelines) {
this.pluginPipelines = Map.of(id, pipelines);
}

public Map<String, Processor.Factory> getProcessorFactories() {
return processorFactories;
}
Expand Down
68 changes: 68 additions & 0 deletions server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2201,6 +2201,7 @@ public void testResolveRequestOrDefaultPipelineAndFinalPipeline() {
assertFalse(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// request pipeline:
Expand All @@ -2211,6 +2212,7 @@ public void testResolveRequestOrDefaultPipelineAndFinalPipeline() {
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// request pipeline with default pipeline:
Expand All @@ -2225,6 +2227,7 @@ public void testResolveRequestOrDefaultPipelineAndFinalPipeline() {
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// request pipeline with final pipeline:
Expand All @@ -2240,6 +2243,7 @@ public void testResolveRequestOrDefaultPipelineAndFinalPipeline() {
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getFinalPipeline(), equalTo("final-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}
}

Expand Down Expand Up @@ -2419,6 +2423,64 @@ public void testPutPipelineWithVersionedUpdateIncrementsVersion() throws Excepti
assertThat(updatedConfig.getVersion(), equalTo(existingVersion + 1));
}

public void testResolvePipelinesWithPluginsPipeline() {

ingestService.setPluginsPipelines("idx", List.of(new Pipeline("plugins-pipeline", null, null, Map.of(), new CompoundProcessor())));

// no index metadata - no pipeline:
{
Metadata metadata = Metadata.builder().build();
IndexRequest indexRequest = new IndexRequest("idx");
ingestService.resolvePipelinesAndUpdateIndexRequest(indexRequest, indexRequest, metadata);
assertFalse(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// request pipeline, no index metadata:
{
Metadata metadata = Metadata.builder().build();
IndexRequest indexRequest = new IndexRequest("idx").setPipeline("request-pipeline");
ingestService.resolvePipelinesAndUpdateIndexRequest(indexRequest, indexRequest, metadata);
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// request pipeline with default pipeline:
{
IndexMetadata.Builder builder = IndexMetadata.builder("idx")
.settings(settings(IndexVersion.current()).put(IndexSettings.DEFAULT_PIPELINE.getKey(), "default-pipeline"))
.numberOfShards(1)
.numberOfReplicas(0);
Metadata metadata = Metadata.builder().put(builder).build();
IndexRequest indexRequest = new IndexRequest("idx").setPipeline("request-pipeline");
ingestService.resolvePipelinesAndUpdateIndexRequest(indexRequest, indexRequest, metadata);
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo("idx"));
}

// request pipeline with final pipeline:
{
IndexMetadata.Builder builder = IndexMetadata.builder("idx")
.settings(settings(IndexVersion.current()).put(IndexSettings.FINAL_PIPELINE.getKey(), "final-pipeline"))
.numberOfShards(1)
.numberOfReplicas(0);
Metadata metadata = Metadata.builder().put(builder).build();
IndexRequest indexRequest = new IndexRequest("idx").setPipeline("request-pipeline");
ingestService.resolvePipelinesAndUpdateIndexRequest(indexRequest, indexRequest, metadata);
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("request-pipeline"));
assertThat(indexRequest.getFinalPipeline(), equalTo("final-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo("idx"));
}
}

public void testResolvePipelinesWithNonePipeline() {
// _none request pipeline:
{
Expand All @@ -2428,6 +2490,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertFalse(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// _none default pipeline:
Expand All @@ -2442,6 +2505,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertFalse(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// _none default pipeline with request pipeline:
Expand All @@ -2456,6 +2520,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertTrue(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("pipeline1"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// _none request pipeline with default pipeline:
Expand All @@ -2470,6 +2535,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertFalse(ingestService.hasPipeline(indexRequest));
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// _none request pipeline with final pipeline:
Expand All @@ -2485,6 +2551,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getFinalPipeline(), equalTo("final-pipeline"));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}

// _none final pipeline:
Expand All @@ -2500,6 +2567,7 @@ public void testResolvePipelinesWithNonePipeline() {
assertTrue(indexRequest.isPipelineResolved());
assertThat(indexRequest.getPipeline(), equalTo("pipeline1"));
assertThat(indexRequest.getFinalPipeline(), equalTo(NOOP_PIPELINE_NAME));
assertThat(indexRequest.getPluginsPipeline(), equalTo(NOOP_PIPELINE_NAME));
}
}

Expand Down

0 comments on commit 3a96bf9

Please sign in to comment.