Merge branch 'main' into properties

CHANGELOG.md

@@ -14,8 +14,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ## [Unreleased 2.x](https://github.com/opensearch-project/flow-framework/compare/2.12...2.x)
 ### Features
-- Add HttpHost WorkflowStep ([#530](https://github.com/opensearch-project/flow-framework/pull/530))
-
 ### Enhancements
 - Substitute REST path or body parameters in Workflow Steps ([#525](https://github.com/opensearch-project/flow-framework/pull/525))
 - Added an optional workflow_step param to the get workflow steps API ([#538](https://github.com/opensearch-project/flow-framework/pull/538))

src/main/java/org/opensearch/flowframework/common/CommonValue.java

@@ -162,14 +162,6 @@ private CommonValue() {}
     public static final String APP_TYPE_FIELD = "app_type";
     /** To include field for an agent response */
     public static final String INCLUDE_OUTPUT_IN_AGENT_RESPONSE = "include_output_in_agent_response";
-    /** HttpHost */
-    public static final String HTTP_HOST_FIELD = "http_host";
-    /** Http scheme */
-    public static final String SCHEME_FIELD = "scheme";
-    /** Http hostname */
-    public static final String HOSTNAME_FIELD = "hostname";
-    /** Http port */
-    public static final String PORT_FIELD = "port";
 
     /*
      * Constants associated with resource provisioning / state

src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java

@@ -35,19 +35,15 @@
 import static org.opensearch.flowframework.common.CommonValue.EMBEDDING_DIMENSION;
 import static org.opensearch.flowframework.common.CommonValue.FRAMEWORK_TYPE;
 import static org.opensearch.flowframework.common.CommonValue.FUNCTION_NAME;
-import static org.opensearch.flowframework.common.CommonValue.HOSTNAME_FIELD;
-import static org.opensearch.flowframework.common.CommonValue.HTTP_HOST_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.MODEL_CONTENT_HASH_VALUE;
 import static org.opensearch.flowframework.common.CommonValue.MODEL_FORMAT;
 import static org.opensearch.flowframework.common.CommonValue.MODEL_GROUP_STATUS;
 import static org.opensearch.flowframework.common.CommonValue.MODEL_TYPE;
 import static org.opensearch.flowframework.common.CommonValue.NAME_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.OPENSEARCH_ML;
 import static org.opensearch.flowframework.common.CommonValue.PARAMETERS_FIELD;
-import static org.opensearch.flowframework.common.CommonValue.PORT_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.PROTOCOL_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.REGISTER_MODEL_STATUS;
-import static org.opensearch.flowframework.common.CommonValue.SCHEME_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.SUCCESS;
 import static org.opensearch.flowframework.common.CommonValue.TOOLS_FIELD;
 import static org.opensearch.flowframework.common.CommonValue.TYPE;
@@ -106,7 +102,6 @@ public WorkflowStepFactory(
         stepMap.put(ToolStep.NAME, ToolStep::new);
         stepMap.put(RegisterAgentStep.NAME, () -> new RegisterAgentStep(mlClient, flowFrameworkIndicesHandler));
         stepMap.put(DeleteAgentStep.NAME, () -> new DeleteAgentStep(mlClient));
-        stepMap.put(HttpHostStep.NAME, HttpHostStep::new);
     }
 
     /**
@@ -201,16 +196,7 @@ public enum WorkflowSteps {
         DELETE_AGENT(DeleteAgentStep.NAME, List.of(AGENT_ID), List.of(AGENT_ID), List.of(OPENSEARCH_ML), null),
 
         /** Create Tool Step */
-        CREATE_TOOL(ToolStep.NAME, List.of(TYPE), List.of(TOOLS_FIELD), List.of(OPENSEARCH_ML), null),
-
-        /** Http Host Step */
-        HTTP_HOST(
-            HttpHostStep.NAME,
-            List.of(SCHEME_FIELD, HOSTNAME_FIELD, PORT_FIELD),
-            List.of(HTTP_HOST_FIELD),
-            Collections.emptyList(),
-            null
-        );
+        CREATE_TOOL(ToolStep.NAME, List.of(TYPE), List.of(TOOLS_FIELD), List.of(OPENSEARCH_ML), null);
 
         private final String workflowStepName;
         private final List<String> inputs;

src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java

@@ -44,7 +44,7 @@ public void testParseWorkflowValidator() throws IOException {
 
         WorkflowValidator validator = new WorkflowValidator(workflowStepValidators);
 
-        assertEquals(15, validator.getWorkflowStepValidators().size());
+        assertEquals(14, validator.getWorkflowStepValidators().size());
 
         assertTrue(validator.getWorkflowStepValidators().keySet().contains("create_connector"));
         assertEquals(7, validator.getWorkflowStepValidators().get("create_connector").getInputs().size());
@@ -101,10 +101,6 @@ public void testParseWorkflowValidator() throws IOException {
         assertTrue(validator.getWorkflowStepValidators().keySet().contains("noop"));
         assertEquals(0, validator.getWorkflowStepValidators().get("noop").getInputs().size());
         assertEquals(0, validator.getWorkflowStepValidators().get("noop").getOutputs().size());
-
-        assertTrue(validator.getWorkflowStepValidators().keySet().contains("http_host"));
-        assertEquals(3, validator.getWorkflowStepValidators().get("http_host").getInputs().size());
-        assertEquals(1, validator.getWorkflowStepValidators().get("http_host").getOutputs().size());
     }
 
     public void testWorkflowStepFactoryHasValidators() throws IOException {