test: add test case to validate connector creation successful

Signed-off-by: Pavan Yekbote <[email protected]>
pyek-bot · Jan 22, 2025 · 14668fc · 14668fc
1 parent bfdffc0
commit 14668fc
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 2 deletions.
diff --git a/plugin/src/main/java/org/opensearch/ml/settings/MLCommonsSettings.java b/plugin/src/main/java/org/opensearch/ml/settings/MLCommonsSettings.java
@@ -156,6 +156,8 @@ private MLCommonsSettings() {}
     public static final Setting<Boolean> ML_COMMONS_OFFLINE_BATCH_INFERENCE_ENABLED = Setting
         .boolSetting("plugins.ml_commons.offline_batch_inference_enabled", true, Setting.Property.NodeScope, Setting.Property.Dynamic);
 
+    public static final String REKOGNITION_TRUST_ENDPOINT_REGEX = "^https://rekognition(-fips)?\\..*[a-z0-9-]\\.amazonaws\\.com$";
+
     public static final Setting<List<String>> ML_COMMONS_TRUSTED_CONNECTOR_ENDPOINTS_REGEX = Setting
         .listSetting(
             "plugins.ml_commons.trusted_connector_endpoints_regex",
@@ -170,7 +172,7 @@ private MLCommonsSettings() {}
                     "^https://bedrock\\..*[a-z0-9-]\\.amazonaws\\.com/.*$",
                     "^https://textract\\..*[a-z0-9-]\\.amazonaws\\.com$",
                     "^https://comprehend\\..*[a-z0-9-]\\.amazonaws\\.com$",
-                    "^https://rekognition(-fips)?\\..*[a-z0-9-]\\.amazonaws\\.com$"
+                    REKOGNITION_TRUST_ENDPOINT_REGEX
                 ),
             Function.identity(),
             Setting.Property.NodeScope,

diff --git a/...src/test/java/org/opensearch/ml/action/connector/TransportCreateConnectorActionTests.java b/...src/test/java/org/opensearch/ml/action/connector/TransportCreateConnectorActionTests.java
@@ -13,6 +13,7 @@
 import static org.opensearch.ml.common.CommonValue.ML_CONNECTOR_INDEX;
 import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_ACCESS_CONTROL_ENABLED;
 import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_TRUSTED_CONNECTOR_ENDPOINTS_REGEX;
+import static org.opensearch.ml.settings.MLCommonsSettings.REKOGNITION_TRUST_ENDPOINT_REGEX;
 import static org.opensearch.ml.task.MLPredictTaskRunnerTests.USER_STRING;
 import static org.opensearch.ml.utils.TestHelper.clusterSetting;
 
@@ -118,7 +119,8 @@ public class TransportCreateConnectorActionTests extends OpenSearchTestCase {
     private ArgumentCaptor<PutDataObjectRequest> putDataObjectRequestArgumentCaptor;
 
     private static final List<String> TRUSTED_CONNECTOR_ENDPOINTS_REGEXES = ImmutableList
-        .of("^https://runtime\\.sagemaker\\..*\\.amazonaws\\.com/.*$", "^https://api\\.openai\\.com/.*$", "^https://api\\.cohere\\.ai/.*$");
+        .of("^https://runtime\\.sagemaker\\..*\\.amazonaws\\.com/.*$", "^https://api\\.openai\\.com/.*$",
+                "^https://api\\.cohere\\.ai/.*$", REKOGNITION_TRUST_ENDPOINT_REGEX);
 
     @Before
     public void setup() {
@@ -539,4 +541,69 @@ public void test_execute_URL_notMatchingExpression_exception() {
             argumentCaptor.getValue().getMessage()
         );
     }
+
+
+    public void test_connector_creation_success_rekognition() {
+        TransportCreateConnectorAction action = new TransportCreateConnectorAction(
+                transportService,
+                actionFilters,
+                mlIndicesHandler,
+                client,
+                sdkClient,
+                mlEngine,
+                connectorAccessControlHelper,
+                settings,
+                clusterService,
+                mlModelManager,
+                mlFeatureEnabledSetting
+        );
+
+        doAnswer(invocation -> {
+            ActionListener<Boolean> listener = invocation.getArgument(0);
+            listener.onResponse(true);
+            return null;
+        }).when(mlIndicesHandler).initMLConnectorIndex(isA(ActionListener.class));
+
+        doAnswer(invocation -> {
+            ActionListener<IndexResponse> listener = invocation.getArgument(1);
+            listener.onResponse(indexResponse);
+            return null;
+        }).when(client).index(any(IndexRequest.class), isA(ActionListener.class));
+
+        List<ConnectorAction> actions = new ArrayList<>();
+        actions
+                .add(
+                        ConnectorAction
+                                .builder()
+                                .actionType(ConnectorAction.ActionType.PREDICT)
+                                .method("POST")
+                                .url("https://rekognition.test-region-1.amazonaws.com")
+                                .build()
+                );
+        actions
+                .add(
+                        ConnectorAction
+                                .builder()
+                                .actionType(ConnectorAction.ActionType.PREDICT)
+                                .method("POST")
+                                .url("https://rekognition-fips.test-region-1.amazonaws.com")
+                                .build()
+                );
+
+        Map<String, String> credential = ImmutableMap.of("access_key", "mockKey", "secret_key", "mockSecret");
+        MLCreateConnectorInput mlCreateConnectorInput = MLCreateConnectorInput
+                .builder()
+                .name(randomAlphaOfLength(5))
+                .description(randomAlphaOfLength(10))
+                .version("1")
+                .protocol(ConnectorProtocols.HTTP)
+                .credential(credential)
+                .actions(actions)
+                .build();
+
+        MLCreateConnectorRequest request = new MLCreateConnectorRequest(mlCreateConnectorInput);
+
+        action.doExecute(task, request, actionListener);
+        verify(actionListener).onResponse(any(MLCreateConnectorResponse.class));
+    }
 }