Skip to content

Commit

Permalink
removing api keys from the integ test log
Browse files Browse the repository at this point in the history 
Signed-off-by: Dhrubo Saha <[email protected]>
  • Loading branch information
@dhrubo-os
dhrubo-os committed Oct 15, 2024
1 parent 0f7481e commit 876f74d
Showing 1 changed file with 43 additions and 23 deletions.
66 changes: 43 additions & 23 deletions plugin/src/test/java/org/opensearch/ml/rest/RestMLRemoteInferenceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.junit.Rule;
import org.junit.rules.ExpectedException;
import org.opensearch.client.Response;
import org.opensearch.client.ResponseException;
import org.opensearch.ml.common.MLTaskState;
import org.opensearch.ml.utils.TestHelper;

Expand Down Expand Up @@ -76,39 +77,58 @@ public void setup() throws IOException, InterruptedException {
Thread.sleep(20000);
}

public void testCreateConnector() throws IOException {
Response response = createConnector(completionModelConnectorEntity);
Map responseMap = parseResponseToMap(response);
assertNotNull((String) responseMap.get("connector_id"));
}

public void testGetConnector() throws IOException {
Response response = createConnector(completionModelConnectorEntity);
Map responseMap = parseResponseToMap(response);
String connectorId = (String) responseMap.get("connector_id");
response = TestHelper.makeRequest(client(), "GET", "/_plugins/_ml/connectors/" + connectorId, null, "", null);
responseMap = parseResponseToMap(response);
assertEquals("OpenAI Connector", (String) responseMap.get("name"));
assertEquals("1", (String) responseMap.get("version"));
assertEquals("1", responseMap.get("version"));
assertEquals("The connector to public OpenAI model service for GPT 3.5", (String) responseMap.get("description"));
assertEquals("http", (String) responseMap.get("protocol"));
assertEquals("http", responseMap.get("protocol"));
}

public void testDeleteConnector() throws IOException {
Response response = createConnector(completionModelConnectorEntity);
Map responseMap = parseResponseToMap(response);
String connectorId = (String) responseMap.get("connector_id");
response = TestHelper.makeRequest(client(), "DELETE", "/_plugins/_ml/connectors/" + connectorId, null, "", null);
responseMap = parseResponseToMap(response);
assertEquals("deleted", (String) responseMap.get("result"));
public void testCreate_Get_DeleteConnector() throws IOException {
try {
Response response = createConnector(completionModelConnectorEntity);
Map responseMap = parseResponseToMap(response);
String connectorId = (String) responseMap.get("connector_id");
assertNotNull(connectorId); // Testing create connector

// Testing Get connector
response = TestHelper.makeRequest(client(), "GET", "/_plugins/_ml/connectors/" + connectorId, null, "", null);
responseMap = parseResponseToMap(response);
assertEquals("OpenAI Connector", responseMap.get("name"));
assertEquals("1", responseMap.get("version"));
assertEquals("The connector to public OpenAI model service for GPT 3.5", responseMap.get("description"));
assertEquals("http", responseMap.get("protocol"));

// Testing delete connector
response = TestHelper.makeRequest(client(), "DELETE", "/_plugins/_ml/connectors/" + connectorId, null, "", null);
responseMap = parseResponseToMap(response);
assertEquals("deleted", responseMap.get("result"));
} catch (ResponseException e) {
String sanitizedMessage = maskSensitiveInfo(e.getMessage());
logger.error("ResponseException: {}", sanitizedMessage); // Log sanitized message
throw new RuntimeException("Request failed: " + sanitizedMessage); // Re-throw sanitized exception
}

}

private String maskSensitiveInfo(String input) {
// Regex to remove the whole credential object and replace it with "***"
String regex = "\"credential\":\\{.*?}";
return input.replaceAll(regex, "\"credential\": \"***\"");
}


public void testSearchConnectors_beforeCreation() throws IOException {
String searchEntity = "{\n" + " \"query\": {\n" + " \"match_all\": {}\n" + " },\n" + " \"size\": 1000\n" + "}";
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/connectors/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 0.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(0.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchConnectors_afterCreation() throws IOException {
Expand All @@ -125,7 +145,7 @@ public void testSearchRemoteModels_beforeCreation() throws IOException {
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/models/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 0.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(0.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchRemoteModels_afterCreation() throws IOException {
Expand All @@ -134,15 +154,15 @@ public void testSearchRemoteModels_afterCreation() throws IOException {
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/models/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 1.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(1.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchModelGroups_beforeCreation() throws IOException {
String searchEntity = "{\n" + " \"query\": {\n" + " \"match_all\": {}\n" + " },\n" + " \"size\": 1000\n" + "}";
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/model_groups/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 0.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(0.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchModelGroups_afterCreation() throws IOException {
Expand All @@ -151,15 +171,15 @@ public void testSearchModelGroups_afterCreation() throws IOException {
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/model_groups/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 1.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(1.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchMLTasks_beforeCreation() throws IOException {
String searchEntity = "{\n" + " \"query\": {\n" + " \"match_all\": {}\n" + " },\n" + " \"size\": 1000\n" + "}";
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/tasks/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 0.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(0.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testSearchMLTasks_afterCreation() throws IOException {
Expand All @@ -169,7 +189,7 @@ public void testSearchMLTasks_afterCreation() throws IOException {
Response response = TestHelper
.makeRequest(client(), "GET", "/_plugins/_ml/tasks/_search", null, TestHelper.toHttpEntity(searchEntity), null);
Map responseMap = parseResponseToMap(response);
assertEquals((Double) 1.0, (Double) ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
assertEquals(1.0, ((Map) ((Map) responseMap.get("hits")).get("total")).get("value"));
}

public void testDeployRemoteModel() throws IOException, InterruptedException {
Expand All @@ -185,7 +205,7 @@ public void testDeployRemoteModel() throws IOException, InterruptedException {
String modelId = (String) responseMap.get("model_id");
response = deployRemoteModel(modelId);
responseMap = parseResponseToMap(response);
assertEquals("COMPLETED", (String) responseMap.get("status"));
assertEquals("COMPLETED", responseMap.get("status"));
taskId = (String) responseMap.get("task_id");
waitForTask(taskId, MLTaskState.COMPLETED);
}
Expand Down

0 comments on commit 876f74d

Please sign in to comment.