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' } } 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