addressing additional conflicts

Signed-off-by: Amit Galitzky <[email protected]>
opensearch-project · Nov 15, 2023 · 5583855 · 5583855
1 parent 569f481
commit 5583855
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/src/main/java/org/opensearch/flowframework/model/WorkflowState.java b/src/main/java/org/opensearch/flowframework/model/WorkflowState.java
@@ -469,17 +469,17 @@ public List<ResourcesCreated> resourcesCreated() {
     @Override
     public String toString() {
         return "WorkflowState [workflowId="
-                + workflowId
-                + ", error="
-                + error
-                + ", state="
-                + state
-                + ", provisioningProgress="
-                + provisioningProgress
-                + ", userOutputs="
-                + userOutputs
-                + ", resourcesCreated="
-                + resourcesCreated
-                + "]";
+            + workflowId
+            + ", error="
+            + error
+            + ", state="
+            + state
+            + ", provisioningProgress="
+            + provisioningProgress
+            + ", userOutputs="
+            + userOutputs
+            + ", resourcesCreated="
+            + resourcesCreated
+            + "]";
     }
 }
diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java
@@ -31,7 +31,7 @@
 
 import static org.opensearch.flowframework.common.CommonValue.WORKFLOW_ID;
 import static org.opensearch.flowframework.common.CommonValue.WORKFLOW_URI;
-import static org.opensearch.flowframework.common.FlowFrameworkFeatureEnabledSetting.FLOW_FRAMEWORK_ENABLED;
+import static org.opensearch.flowframework.common.FlowFrameworkSettings.FLOW_FRAMEWORK_ENABLED;
 
 /**
  * Rest Action to facilitate requests to get a workflow status

diff --git a/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java
@@ -163,7 +163,6 @@ private void executeWorkflowAsync(String workflowId, List<ProcessNode> workflowS
         ActionListener<String> provisionWorkflowListener = ActionListener.wrap(response -> {
             logger.info("Provisioning completed successfully for workflow {}", workflowId);
             flowFrameworkIndicesHandler.updateFlowFrameworkSystemIndexDoc(
-                WORKFLOW_STATE_INDEX,
                 workflowId,
                 ImmutableMap.of(
                     STATE_FIELD,
@@ -181,7 +180,6 @@ private void executeWorkflowAsync(String workflowId, List<ProcessNode> workflowS
         }, exception -> {
             logger.error("Provisioning failed for workflow {} : {}", workflowId, exception);
             flowFrameworkIndicesHandler.updateFlowFrameworkSystemIndexDoc(
-                WORKFLOW_STATE_INDEX,
                 workflowId,
                 ImmutableMap.of(
                     STATE_FIELD,

diff --git a/src/main/java/org/opensearch/flowframework/transport/WorkflowRequest.java b/src/main/java/org/opensearch/flowframework/transport/WorkflowRequest.java
@@ -65,10 +65,10 @@ public WorkflowRequest(@Nullable String workflowId, @Nullable Template template)
      * @param maxWorkflows max number of workflows
      */
     public WorkflowRequest(
-            @Nullable String workflowId,
-            @Nullable Template template,
-            @Nullable TimeValue requestTimeout,
-            @Nullable Integer maxWorkflows
+        @Nullable String workflowId,
+        @Nullable Template template,
+        @Nullable TimeValue requestTimeout,
+        @Nullable Integer maxWorkflows
     ) {
         this(workflowId, template, false, requestTimeout, maxWorkflows);
     }
@@ -82,11 +82,11 @@ public WorkflowRequest(
      * @param maxWorkflows max number of workflows
      */
     public WorkflowRequest(
-            @Nullable String workflowId,
-            @Nullable Template template,
-            boolean dryRun,
-            @Nullable TimeValue requestTimeout,
-            @Nullable Integer maxWorkflows
+        @Nullable String workflowId,
+        @Nullable Template template,
+        boolean dryRun,
+        @Nullable TimeValue requestTimeout,
+        @Nullable Integer maxWorkflows
     ) {
         this.workflowId = workflowId;
         this.template = template;
@@ -167,4 +167,4 @@ public ActionRequestValidationException validate() {
         return null;
     }
 
-}
+}
diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java
@@ -80,7 +80,7 @@ public void testPlugin() throws IOException {
                 3,
                 ffp.createComponents(client, clusterService, threadPool, null, null, null, environment, null, null, null, null).size()
             );
-            assertEquals(4, ffp.getRestHandlers(null, null, null, null, null, null, null).size());
+            assertEquals(4, ffp.getRestHandlers(settings, null, null, null, null, null, null).size());
             assertEquals(4, ffp.getActions().size());
             assertEquals(1, ffp.getExecutorBuilders(settings).size());
             assertEquals(3, ffp.getSettings().size());