From 15ac0904692a2b34bc341b3674f4dbc016e3f55a Mon Sep 17 00:00:00 2001 From: Taylor Gray Date: Thu, 4 Aug 2022 17:04:22 -0500 Subject: [PATCH 1/2] Add @JsonProperty to workers and readBatchDelay in PipelineModel Signed-off-by: Taylor Gray --- .../amazon/dataprepper/model/configuration/PipelineModel.java | 2 ++ .../model/configuration/PipelinesDataFlowModelTest.java | 4 ++-- .../src/test/resources/pipelines_data_flow_serialized.yaml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java b/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java index f37922d86c..e8cb877798 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java +++ b/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java @@ -67,9 +67,11 @@ else if (preppers != null) { @JsonProperty("sink") private final List sinks; + @JsonProperty("workers") @JsonInclude(JsonInclude.Include.NON_NULL) private final Integer workers; + @JsonProperty("delay") @JsonInclude(JsonInclude.Include.NON_NULL) private final Integer readBatchDelay; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java b/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java index c16dd5a31a..c5e422a935 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java +++ b/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java @@ -36,13 +36,13 @@ void setup() { } @Test - void testSerializing_PipelinesDataFlowModel_empty_Plugins() throws JsonProcessingException { + void testSerializing_PipelinesDataFlowModel_empty_Plugins_with_nonEmpty_delay_and_workers() throws JsonProcessingException { String pipelineName = "test-pipeline"; final PluginModel source = new PluginModel("testSource", null); final List preppers = Collections.singletonList(new PluginModel("testPrepper", null)); final List sinks = Collections.singletonList(new PluginModel("testSink", null)); - final PipelineModel pipelineModel = new PipelineModel(source, null, preppers, sinks, null, null); + final PipelineModel pipelineModel = new PipelineModel(source, null, preppers, sinks, 8, 50); final PipelinesDataFlowModel pipelinesDataFlowModel = new PipelinesDataFlowModel(Collections.singletonMap(pipelineName, pipelineModel)); diff --git a/data-prepper-api/src/test/resources/pipelines_data_flow_serialized.yaml b/data-prepper-api/src/test/resources/pipelines_data_flow_serialized.yaml index 983eb97acf..378555d699 100644 --- a/data-prepper-api/src/test/resources/pipelines_data_flow_serialized.yaml +++ b/data-prepper-api/src/test/resources/pipelines_data_flow_serialized.yaml @@ -5,3 +5,5 @@ test-pipeline: - testPrepper: null sink: - testSink: null + workers: 8 + delay: 50 From 1fbd812bcf4cdb50912fd2dc3c72ba50317c5ebb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 22:13:16 +0000 Subject: [PATCH 2/2] Bump software.amazon.awssdk:bom from 2.17.209 to 2.17.266 Bumps [software.amazon.awssdk:bom](https://github.com/aws/aws-sdk-java-v2) from 2.17.209 to 2.17.266. - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.209...2.17.266) --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 47817ea5f2..68775af1a5 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,7 @@ subprojects { configure(subprojects.findAll {it.name != 'data-prepper-api'}) { dependencies { - implementation platform('software.amazon.awssdk:bom:2.17.209') + implementation platform('software.amazon.awssdk:bom:2.17.266') implementation 'jakarta.validation:jakarta.validation-api:3.0.1' } }