Fixed NPE for connector retrying policy (#3909) (#3910)

* Fixed NPE for connector when retrying



* Addressed PR comment



---------


(cherry picked from commit a67b4da)

Signed-off-by: Owais <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>

Author: opensearch-trigger-bot[bot]

plugin/src/main/java/org/opensearch/ml/action/models/UpdateModelTransportAction.java

@@ -283,6 +283,16 @@ private void updateRemoteOrTextEmbeddingModel(
             if (newConnectorId == null) {
                 if (updateModelInput.getConnector() != null) {
                     Connector connector = mlModel.getConnector();
+                    if (connector == null) {
+                        wrappedListener
+                            .onFailure(
+                                new OpenSearchStatusException(
+                                    "Cannot update connector settings for this model. The model was created with a connector_id and does not have an inline connector.",
+                                    RestStatus.BAD_REQUEST
+                                )
+                            );
+                        return;
+                    }
                     connector.update(updateModelInput.getConnector(), mlEngine::encrypt);
                     connector.validateConnectorURL(trustedConnectorEndpointsRegex);
                     updateModelInput.setUpdatedConnector(connector);

plugin/src/test/java/org/opensearch/ml/action/models/UpdateModelTransportActionTests.java

@@ -734,6 +734,30 @@ public void testUpdateLocalModelWithExternalRemoteInformation() {
         assertEquals("Trying to update the connector or connector_id field on a local model.", argumentCaptor.getValue().getMessage());
     }
 
+    @Test
+    public void testRetryConnectorWhenNotProvidedInRequestBody() {
+        MLModel testUpdateModelCacheModel = prepareMLModel("REMOTE_INTERNAL", MLModelState.DEPLOYED);
+        doAnswer(invocation -> {
+            ActionListener<MLModel> listener = invocation.getArgument(4);
+            listener.onResponse(testUpdateModelCacheModel);
+            return null;
+        }).when(mlModelManager).getModel(eq("test_model_id"), any(), any(), any(), isA(ActionListener.class));
+
+        doAnswer(invocation -> {
+            ActionListener<MLUpdateModelCacheNodesResponse> listener = invocation.getArgument(2);
+            listener.onResponse(updateModelCacheNodesResponse);
+            return null;
+        }).when(client).execute(any(), any(), isA(ActionListener.class));
+        testUpdateModelCacheModel.setConnector(null);
+        transportUpdateModelAction.doExecute(task, prepareRemoteRequest("REMOTE_INTERNAL"), actionListener);
+        ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
+        verify(actionListener).onFailure(argumentCaptor.capture());
+        assertEquals(
+            "Cannot update connector settings for this model. The model was created with a connector_id and does not have an inline connector.",
+            argumentCaptor.getValue().getMessage()
+        );
+    }
+
     @Test
     public void testUpdateLocalModelWithInternalRemoteInformation() {
         transportUpdateModelAction.doExecute(task, prepareRemoteRequest("REMOTE_INTERNAL"), actionListener);