From 9a50b805054715c7b090a9683db45620ac710fbd Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:32:18 -0800 Subject: [PATCH] [Backport 2.x] Fix max workflows setting test (#286) Fix max workflows setting test (#268) (cherry picked from commit 551e768c3b44a067aa5805938f487b8c0f1068ac) Signed-off-by: Daniel Widdis Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .../flowframework/rest/AbstractSearchWorkflowAction.java | 1 + .../java/org/opensearch/flowframework/workflow/NoOpStep.java | 3 +++ .../transport/CreateWorkflowTransportActionTests.java | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java index 43919bb1c..65ab14de0 100644 --- a/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java @@ -35,6 +35,7 @@ /** * Abstract class to handle search request. + * @param The type to search */ public abstract class AbstractSearchWorkflowAction extends BaseRestHandler { diff --git a/src/main/java/org/opensearch/flowframework/workflow/NoOpStep.java b/src/main/java/org/opensearch/flowframework/workflow/NoOpStep.java index bbf325e46..3a01d774b 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/NoOpStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/NoOpStep.java @@ -17,6 +17,9 @@ */ public class NoOpStep implements WorkflowStep { + /** Instantiate this class */ + public NoOpStep() {} + /** The name of this step, used as a key in the template and the {@link WorkflowStepFactory} */ public static final String NAME = "noop"; diff --git a/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java index 70c066c0e..a540bfdbe 100644 --- a/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java @@ -70,7 +70,7 @@ public void setUp() throws Exception { super.setUp(); threadPool = mock(ThreadPool.class); settings = Settings.builder() - .put("plugins.flow_framework.max_workflows.", 2) + .put("plugins.flow_framework.max_workflows", 2) .put("plugins.flow_framework.request_timeout", TimeValue.timeValueSeconds(10)) .build(); this.flowFrameworkIndicesHandler = mock(FlowFrameworkIndicesHandler.class); @@ -196,7 +196,7 @@ public void testMaxWorkflow() { createWorkflowTransportAction.doExecute(mock(Task.class), workflowRequest, listener); ArgumentCaptor exceptionCaptor = ArgumentCaptor.forClass(Exception.class); verify(listener, times(1)).onFailure(exceptionCaptor.capture()); - assertEquals(("Maximum workflows limit reached 1000"), exceptionCaptor.getValue().getMessage()); + assertEquals(("Maximum workflows limit reached 2"), exceptionCaptor.getValue().getMessage()); } public void testMaxWorkflowWithNoIndex() {