Skip to content

Commit f75ae1a

Browse files
nathaliellenaanathaliellenaa
authored
Fix failing UTs and increment version to 3.3.0-SNAPSHOT (opensearch-project#4132)
* Fix failing tests Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Reorder fields Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Add custom_attributes field Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Add 3.3 snapshot Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Remove custom_attributes field Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Fix more failing tests Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> * Fix failing test Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com> --------- Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>
1 parent 1db44b4 commit f75ae1a

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
ext {
1212
opensearch_group = "org.opensearch"
1313
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
14-
opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT")
14+
opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT")
1515
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1616
asm_version = "9.7"
1717

‎common/src/test/java/org/opensearch/ml/common/MLModelGroupTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void toXContent() throws IOException {
6363
.assertEquals(
6464
"{\"name\":\"test\",\"latest_version\":1,\"description\":\"this is test group\","
6565
+ "\"backend_roles\":[\"role1\",\"role2\"],"
66-
+ "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
66+
+ "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null,\"custom_attribute_names\":[]},"
6767
+ "\"access\":\"PUBLIC\"}",
6868
content
6969
);
@@ -166,7 +166,7 @@ public void toXContent_WithTenantId() throws IOException {
166166
.assertEquals(
167167
"{\"name\":\"test\",\"latest_version\":1,\"description\":\"this is test group\","
168168
+ "\"backend_roles\":[\"role1\",\"role2\"],"
169-
+ "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
169+
+ "\"owner\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null,\"custom_attribute_names\":[]},"
170170
+ "\"access\":\"PUBLIC\",\"tenant_id\":\"test_tenant\"}",
171171
content
172172
);

‎common/src/test/java/org/opensearch/ml/common/transport/model/MLModelGetResponseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void toXContentTest() throws IOException {
6767
+ "\"algorithm\":\"KMEANS\","
6868
+ "\"model_version\":\"1.0.0\","
6969
+ "\"model_content\":\"content\","
70-
+ "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},\"model_state\":\"TRAINED\"}",
70+
+ "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null,\"custom_attribute_names\":[]},\"model_state\":\"TRAINED\"}",
7171
jsonStr
7272
);
7373
}

‎common/src/test/java/org/opensearch/ml/common/transport/task/MLTaskGetResponseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void toXContentTest() throws IOException {
8686
+ "\"create_time\":123,"
8787
+ "\"last_update_time\":123,"
8888
+ "\"error\":\"error\","
89-
+ "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
89+
+ "\"user\":{\"name\":\"\",\"backend_roles\":[],\"roles\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null,\"custom_attribute_names\":[]},"
9090
+ "\"is_async\":true}",
9191
jsonStr
9292
);

‎plugin/src/test/java/org/opensearch/ml/action/memorycontainer/memory/MemoryOperationsServiceAdditionalTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import java.util.ArrayList;
1515
import java.util.Arrays;
16+
import java.util.Collections;
1617
import java.util.HashMap;
1718
import java.util.List;
1819

@@ -94,7 +95,7 @@ public void testCreateFactMemoriesFromList_WithUser() {
9495

9596
String indexName = "memory-index";
9697
String sessionId = "session-123";
97-
User user = new User("testuser", null, null, null);
98+
User user = new User("testuser", null, null, Collections.emptyList());
9899

99100
java.time.Instant now = java.time.Instant.now();
100101
List<org.opensearch.action.index.IndexRequest> indexRequests = new ArrayList<>();

‎plugin/src/test/java/org/opensearch/ml/action/profile/MLProfileResponseTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void testToXContent() throws IOException {
103103
+ "\"task_type\":\"TRAINING\",\"function_name\":\"AD_LIBSVM\",\"state\":\"CREATED\",\"input_type\":"
104104
+ "\"DATA_FRAME\",\"progress\":0.4,\"output_index\":\"test_index\",\"worker_node\":[\"test_node\"],"
105105
+ "\"create_time\":123,\"last_update_time\":123,\"error\":\"error\",\"user\":{\"name\":\"\","
106-
+ "\"backend_roles\":[],\"roles\":[],\"custom_attribute_names\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null},"
106+
+ "\"backend_roles\":[],\"roles\":[],\"user_requested_tenant\":null,\"user_requested_tenant_access\":null,\"custom_attribute_names\":[]},"
107107
+ "\"is_async\":false}},\"models\":{\"model1\":{\"model_state\":\"DEPLOYED\",\"predictor\":\"test_predictor\","
108108
+ "\"worker_nodes\":[\"node1\",\"node2\"],\"model_inference_stats\":{\"count\":10,\"max\":20.0,"
109109
+ "\"min\":5.0,\"average\":11.0}}}}}}",

‎plugin/src/test/java/org/opensearch/ml/helper/MemoryContainerHelperTests.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.mockito.Mockito.when;
1717

1818
import java.util.Arrays;
19+
import java.util.Map;
1920
import java.util.concurrent.CompletableFuture;
2021

2122
import org.junit.Before;
@@ -215,7 +216,7 @@ public void testCheckMemoryContainerAccessWithNullUser() {
215216
public void testCheckMemoryContainerAccessWithAdminUser() {
216217
// User constructor: name, backend_roles, roles, custom_attributes
217218
// The "all_access" should be in roles (third parameter), not backend_roles
218-
User adminUser = new User("admin", Arrays.asList("backend-role"), Arrays.asList("all_access"), null);
219+
User adminUser = new User("admin", Arrays.asList("backend-role"), Arrays.asList("all_access"), Map.of());
219220
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").build();
220221

221222
assertTrue(helper.checkMemoryContainerAccess(adminUser, container));
@@ -224,8 +225,8 @@ public void testCheckMemoryContainerAccessWithAdminUser() {
224225
@Test
225226
public void testCheckMemoryContainerAccessAsOwner() {
226227
// User constructor: name, backend_roles, roles, custom_attributes
227-
User owner = new User("owner-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), null);
228-
User accessingUser = new User("owner-user", Arrays.asList("backend-role2"), Arrays.asList("role2"), null);
228+
User owner = new User("owner-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), Map.of());
229+
User accessingUser = new User("owner-user", Arrays.asList("backend-role2"), Arrays.asList("role2"), Map.of());
229230

230231
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(owner).build();
231232

@@ -235,8 +236,8 @@ public void testCheckMemoryContainerAccessAsOwner() {
235236
@Test
236237
public void testCheckMemoryContainerAccessWithMatchingBackendRole() {
237238
// User constructor: name, backend_roles, roles, custom_attributes
238-
User owner = new User("owner-user", Arrays.asList("backend-role1", "backend-role2"), Arrays.asList("role1"), null);
239-
User accessingUser = new User("different-user", Arrays.asList("backend-role2", "backend-role3"), Arrays.asList("role2"), null);
239+
User owner = new User("owner-user", Arrays.asList("backend-role1", "backend-role2"), Arrays.asList("role1"), Map.of());
240+
User accessingUser = new User("different-user", Arrays.asList("backend-role2", "backend-role3"), Arrays.asList("role2"), Map.of());
240241

241242
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(owner).build();
242243

@@ -246,8 +247,8 @@ public void testCheckMemoryContainerAccessWithMatchingBackendRole() {
246247
@Test
247248
public void testCheckMemoryContainerAccessDenied() {
248249
// User constructor: name, backend_roles, roles, custom_attributes
249-
User owner = new User("owner-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), null);
250-
User accessingUser = new User("different-user", Arrays.asList("backend-role2"), Arrays.asList("role2"), null);
250+
User owner = new User("owner-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), Map.of());
251+
User accessingUser = new User("different-user", Arrays.asList("backend-role2"), Arrays.asList("role2"), Map.of());
251252

252253
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(owner).build();
253254

@@ -257,7 +258,7 @@ public void testCheckMemoryContainerAccessDenied() {
257258
@Test
258259
public void testCheckMemoryContainerAccessWithNullOwner() {
259260
// User constructor: name, backend_roles, roles, custom_attributes
260-
User accessingUser = new User("some-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), null);
261+
User accessingUser = new User("some-user", Arrays.asList("backend-role1"), Arrays.asList("role1"), Map.of());
261262

262263
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(null).build();
263264

@@ -338,8 +339,8 @@ public void testValidateMemoryIndexExistsFailureEmptyIndex() {
338339
@Test
339340
public void testCheckMemoryContainerAccessWithNullBackendRoles() {
340341
// User constructor: name, backend_roles, roles, custom_attributes
341-
User owner = new User("owner-user", null, Arrays.asList("role1"), null);
342-
User accessingUser = new User("different-user", Arrays.asList("backend-role1"), Arrays.asList("role2"), null);
342+
User owner = new User("owner-user", null, Arrays.asList("role1"), Map.of());
343+
User accessingUser = new User("different-user", Arrays.asList("backend-role1"), Arrays.asList("role2"), Map.of());
343344

344345
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(owner).build();
345346

@@ -349,8 +350,8 @@ public void testCheckMemoryContainerAccessWithNullBackendRoles() {
349350
@Test
350351
public void testCheckMemoryContainerAccessBothNullBackendRoles() {
351352
// User constructor: name, backend_roles, roles, custom_attributes
352-
User owner = new User("owner-user", null, Arrays.asList("role1"), null);
353-
User accessingUser = new User("different-user", null, Arrays.asList("role2"), null);
353+
User owner = new User("owner-user", null, Arrays.asList("role1"), Map.of());
354+
User accessingUser = new User("different-user", null, Arrays.asList("role2"), Map.of());
354355

355356
MLMemoryContainer container = MLMemoryContainer.builder().name("test-container").owner(owner).build();
356357

0 commit comments

Comments
 (0)