Adds lastUpdateTime to Old Connectors

Previoulsy we didnt consider the old connectors to have time fields at all, But given offline discussion if we add time fields to old connectors users could get more information moving forward without breaking any backward features. The solution to this was setting the last updated time in the update connector api; now moving forward any connector gets attached a last updated time field. I updated the testUpdateConnectorDoesNotUpdateHTTPCOnnectorTimeFields method to check that lastUpdateTime has a timestamp but that createdTime has no time field. Signed-off-by: Brian Flores <iflorbri@amazon.com>
brianf-aws · Sep 26, 2024 · 481f5c2 · 481f5c2
1 parent 7f06d73
commit 481f5c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/plugin/src/main/java/org/opensearch/ml/action/connector/TransportCreateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/action/connector/TransportCreateConnectorAction.java
@@ -135,12 +135,11 @@ private void indexConnector(Connector connector, ActionListener<MLCreateConnecto
                     listener.onResponse(response);
                 }, listener::onFailure);
 
-                IndexRequest indexRequest = new IndexRequest(ML_CONNECTOR_INDEX);
-
                 Instant currentTime = Instant.now();
                 connector.setCreatedTime(currentTime);
                 connector.setLastUpdateTime(currentTime);
 
+                IndexRequest indexRequest = new IndexRequest(ML_CONNECTOR_INDEX);
                 indexRequest.source(connector.toXContent(XContentBuilder.builder(XContentType.JSON.xContent()), ToXContent.EMPTY_PARAMS));
                 indexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
                 client.index(indexRequest, ActionListener.runBefore(indexResponseListener, context::restore));

diff --git a/plugin/src/main/java/org/opensearch/ml/action/connector/UpdateConnectorTransportAction.java b/plugin/src/main/java/org/opensearch/ml/action/connector/UpdateConnectorTransportAction.java
@@ -37,7 +37,6 @@
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.ml.common.MLModel;
-import org.opensearch.ml.common.connector.HttpConnector;
 import org.opensearch.ml.common.transport.connector.MLUpdateConnectorAction;
 import org.opensearch.ml.common.transport.connector.MLUpdateConnectorRequest;
 import org.opensearch.ml.engine.MLEngine;
@@ -96,9 +95,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Update
                     connector.update(mlUpdateConnectorAction.getUpdateContent(), mlEngine::encrypt);
                     connector.validateConnectorURL(trustedConnectorEndpointsRegex);
 
-                    if (connector instanceof HttpConnector && ((HttpConnector) connector).getLastUpdateTime() != null) {
-                        connector.setLastUpdateTime(Instant.now());
-                    }
+                    connector.setLastUpdateTime(Instant.now());
 
                     UpdateRequest updateRequest = new UpdateRequest(ML_CONNECTOR_INDEX, connectorId);
                     updateRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);

diff --git a/...src/test/java/org/opensearch/ml/action/connector/UpdateConnectorTransportActionTests.java b/...src/test/java/org/opensearch/ml/action/connector/UpdateConnectorTransportActionTests.java
@@ -249,7 +249,8 @@ public void testUpdateConnectorDoesNotUpdateHttpConnectorTimeFields() {
 
         updateConnectorTransportAction.doExecute(task, updateRequest, actionListener);
 
-        assertNull(connector.getLastUpdateTime());
+        assertNull(connector.getCreatedTime());
+        assertNotNull(connector.getLastUpdateTime());
     }
 
     @Test