Skip to content

[8.17] Backport of #190, dynamic CI pr/build/e2e jobs for target branch. #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[8.17] Backport of #190, dynamic CI pr/build/e2e jobs for target branch. #201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e25b4de
Sync up with ES main on `PipelineConfiguration` class changes. (#190)
mashhurs Nov 21, 2024
6261c6a
Fixes PR CI jobs, adds build and E2E CI jobs.
mashhurs Dec 10, 2024
dbc6420
Fix the E2E test jobs.
mashhurs Dec 10, 2024
393fddf
Generate CI steps based on defined test matrix.
mashhurs Dec 11, 2024
144cef3
Apply suggestions from code review
mashhurs Dec 11, 2024
805a1d1
Replace the matrix with origin URL (after landing).
mashhurs Dec 12, 2024
d2bbfeb
Update Elasticsearch treeish to 8.17 after release.
mashhurs Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public IngestPipelineFactory withProcessors(final Map<String, Processor.Factory>

public Optional<IngestPipeline> create(final PipelineConfiguration pipelineConfiguration) {
try {
final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfigAsMap(), processorFactories, scriptService);
final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService);
final IngestPipeline ingestPipeline = new IngestPipeline(pipelineConfiguration, pipeline);
LOGGER.debug(() -> String.format("successfully created ingest pipeline `%s` from pipeline configuration", pipelineConfiguration.getId()));
return Optional.of(ingestPipeline);
Expand Down
4 changes: 2 additions & 2 deletions ...c/logstash/filters/elasticintegration/ElasticsearchPipelineConfigurationResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void testLoadConfigurationExists() throws Exception {
assertThat(resolvedPipelineConfiguration, isPresent());
resolvedPipelineConfiguration.ifPresent(pipelineConfiguration -> {
assertThat(pipelineConfiguration.getId(), is(equalTo("my-pipeline-id")));
final Map<String, Object> configAsMap = pipelineConfiguration.getConfigAsMap();
final Map<String, Object> configAsMap = pipelineConfiguration.getConfig();
assertThat(configAsMap, is(equalTo(EXPECTED_MY_PIPELINE_ID_CONFIG_MAP)));
});
});
Expand All @@ -77,7 +77,7 @@ void testLoadConfigurationPipelineWithSpecialCharacters() throws Exception {
assertThat(resolvedPipelineConfiguration, isPresent());
resolvedPipelineConfiguration.ifPresent(pipelineConfiguration -> {
assertThat(pipelineConfiguration.getId(), is(equalTo("special char pipeline")));
final Map<String, Object> configAsMap = pipelineConfiguration.getConfigAsMap();
final Map<String, Object> configAsMap = pipelineConfiguration.getConfig();
assertThat(configAsMap, is(equalTo(EXPECTED_MY_PIPELINE_ID_CONFIG_MAP)));
});
});
Expand Down
10 changes: 5 additions & 5 deletions ...java/co/elastic/logstash/filters/elasticintegration/PipelineConfigurationFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testParseNamedObjectWithOnePipeline() throws Exception {
final PipelineConfiguration loaded = PipelineConfigurationFactory.getInstance().parseNamedObject(json);
assertThat(loaded, is(notNullValue()));
assertThat(loaded.getId(), is(equalTo("pipeline-id-one")));
assertThat(loaded.getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
assertThat(loaded.getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
}

@Test
Expand Down Expand Up @@ -74,7 +74,7 @@ public void testParseNamedObjectsWithOnePipeline() throws Exception {

assertThat(loaded.get(0), is(notNullValue()));
assertThat(loaded.get(0).getId(), is(equalTo("pipeline-id-one")));
assertThat(loaded.get(0).getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
assertThat(loaded.get(0).getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_ONE_CONFIG_MAP)));
}

@Test
Expand All @@ -86,12 +86,12 @@ public void testParseNamedObjectWithTwoPipelines() throws Exception {

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


assertThat(loaded.get(1), is(notNullValue()));
assertThat(loaded.get(1).getId(), is(equalTo("pipeline-id-two")));
assertThat(loaded.get(1).getConfigAsMap(), is(equalTo(EXPECTED_PIPELINE_ID_TWO_CONFIG_MAP)));
assertThat(loaded.get(1).getConfig(), is(equalTo(EXPECTED_PIPELINE_ID_TWO_CONFIG_MAP)));
}

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

String elasticsearchApiFormattedJson(final String name) throws IOException {
Expand Down