Skip to content

Commit e5290fd

Browse files
authored
Sync up with ES main on PipelineConfiguration class changes. (#190)
* Sync up with ES main that PipelineConfiguration class getConfigAsMap() method renamed to getConfig(). * Request modifiable donfig when creating a pipeline.
1 parent 9dddfa1 commit e5290fd

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public IngestPipelineFactory withProcessors(final Map<String, Processor.Factory>
4646

4747
public Optional<IngestPipeline> create(final PipelineConfiguration pipelineConfiguration) {
4848
try {
49-
final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfigAsMap(), processorFactories, scriptService);
49+
final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService);
5050
final IngestPipeline ingestPipeline = new IngestPipeline(pipelineConfiguration, pipeline);
5151
LOGGER.debug(() -> String.format("successfully created ingest pipeline `%s` from pipeline configuration", pipelineConfiguration.getId()));
5252
return Optional.of(ingestPipeline);

src/test/java/co/elastic/logstash/filters/elasticintegration/ElasticsearchPipelineConfigurationResolverTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void testLoadConfigurationExists() throws Exception {
5959
assertThat(resolvedPipelineConfiguration, isPresent());
6060
resolvedPipelineConfiguration.ifPresent(pipelineConfiguration -> {
6161
assertThat(pipelineConfiguration.getId(), is(equalTo("my-pipeline-id")));
62-
final Map<String, Object> configAsMap = pipelineConfiguration.getConfigAsMap();
62+
final Map<String, Object> configAsMap = pipelineConfiguration.getConfig();
6363
assertThat(configAsMap, is(equalTo(EXPECTED_MY_PIPELINE_ID_CONFIG_MAP)));
6464
});
6565
});
@@ -77,7 +77,7 @@ void testLoadConfigurationPipelineWithSpecialCharacters() throws Exception {
7777
assertThat(resolvedPipelineConfiguration, isPresent());
7878
resolvedPipelineConfiguration.ifPresent(pipelineConfiguration -> {
7979
assertThat(pipelineConfiguration.getId(), is(equalTo("special char pipeline")));
80-
final Map<String, Object> configAsMap = pipelineConfiguration.getConfigAsMap();
80+
final Map<String, Object> configAsMap = pipelineConfiguration.getConfig();
8181
assertThat(configAsMap, is(equalTo(EXPECTED_MY_PIPELINE_ID_CONFIG_MAP)));
8282
});
8383
});

src/test/java/co/elastic/logstash/filters/elasticintegration/PipelineConfigurationFactoryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testParseNamedObjectWithOnePipeline() throws Exception {
4444
final PipelineConfiguration loaded = PipelineConfigurationFactory.getInstance().parseNamedObject(json);
4545
assertThat(loaded, is(notNullValue()));
4646
assertThat(loaded.getId(), is(equalTo("pipeline-id-one")));
47-
assertThat(loaded.getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
47+
assertThat(loaded.getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
4848
}
4949

5050
@Test
@@ -74,7 +74,7 @@ public void testParseNamedObjectsWithOnePipeline() throws Exception {
7474

7575
assertThat(loaded.get(0), is(notNullValue()));
7676
assertThat(loaded.get(0).getId(), is(equalTo("pipeline-id-one")));
77-
assertThat(loaded.get(0).getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
77+
assertThat(loaded.get(0).getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
7878
}
7979

8080
@Test
@@ -86,12 +86,12 @@ public void testParseNamedObjectWithTwoPipelines() throws Exception {
8686

8787
assertThat(loaded.get(0), is(notNullValue()));
8888
assertThat(loaded.get(0).getId(), is(equalTo("pipeline-id-one")));
89-
assertThat(loaded.get(0).getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
89+
assertThat(loaded.get(0).getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
9090

9191

9292
assertThat(loaded.get(1), is(notNullValue()));
9393
assertThat(loaded.get(1).getId(), is(equalTo("pipeline-id-two")));
94-
assertThat(loaded.get(1).getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_TWO_CONFIG_MAP)));
94+
assertThat(loaded.get(1).getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_TWO_CONFIG_MAP)));
9595
}
9696

9797
@Test
@@ -109,7 +109,7 @@ public void testParseConfigOnly() throws Exception {
109109
final PipelineConfiguration loaded = PipelineConfigurationFactory.getInstance().parseConfigOnly("bananas" , json);
110110
assertThat(loaded, is(notNullValue()));
111111
assertThat(loaded.getId(), is(equalTo("bananas")));
112-
assertThat(loaded.getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
112+
assertThat(loaded.getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
113113
}
114114

115115
String elasticsearchApiFormattedJson(final String name) throws IOException {

0 commit comments

Comments
 (0)