Skip to content

Fix tests for updated User XContent requirements #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
Merged

Fix tests for updated User XContent requirements #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ dependencies {
// Some other plugin dependencies that don't use version catalog conflict here
force("com.google.guava:guava:${versions.guava}")
force("org.slf4j:slf4j-api:${versions.slf4j}")
force("com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}")

if (System.getenv('REMOTE_METADATA_SDK_IMPL') == 'ddb-client') {
// OpenSearch Java client brings in different versions of the below dependencies.
Expand Down
15 changes: 10 additions & 5 deletions src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ public void testAddUserRoleFilterWithNullUser() {
public void testAddUserRoleFilterWithNullUserBackendRole() {
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
ParseUtils.addUserBackendRolesFilter(
new User(randomAlphaOfLength(5), null, ImmutableList.of(randomAlphaOfLength(5)), ImmutableList.of(randomAlphaOfLength(5))),
new User(
randomAlphaOfLength(5),
null,
ImmutableList.of(randomAlphaOfLength(5)),
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
),
searchSourceBuilder
);
assertEquals(
Expand All @@ -140,7 +145,7 @@ public void testAddUserRoleFilterWithEmptyUserBackendRole() {
randomAlphaOfLength(5),
ImmutableList.of(),
ImmutableList.of(randomAlphaOfLength(5)),
ImmutableList.of(randomAlphaOfLength(5))
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
),
searchSourceBuilder
);
Expand All @@ -161,7 +166,7 @@ public void testAddUserRoleFilterWithUserBackendRole() {
randomAlphaOfLength(5),
ImmutableList.of(backendRole1, backendRole2),
ImmutableList.of(randomAlphaOfLength(5)),
ImmutableList.of(randomAlphaOfLength(5))
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
),
searchSourceBuilder
);
Expand Down Expand Up @@ -420,7 +425,7 @@ public void testIsAdmin() {
randomAlphaOfLength(5),
ImmutableList.of(),
ImmutableList.of("all_access"),
ImmutableList.of(randomAlphaOfLength(5))
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
);
assertTrue(isAdmin(user1));
}
Expand All @@ -431,7 +436,7 @@ public void testIsAdminBackendRoleIsAllAccess() {
randomAlphaOfLength(5),
ImmutableList.of(backendRole1),
ImmutableList.of(randomAlphaOfLength(5)),
ImmutableList.of(randomAlphaOfLength(5))
ImmutableList.of(String.join("=", randomAlphaOfLength(5), randomAlphaOfLength(5)))
);
assertFalse(isAdmin(user1));
}
Expand Down
Loading