Fix the ip based test case

Signed-off-by: Ryan Liang <jiallian@amazon.com>
RyanL1997 · Sep 6, 2023 · 004efff · 004efff
1 parent f371e4f
commit 004efff
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java b/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java
@@ -79,20 +79,24 @@ public class OnBehalfOfJwtAuthenticationTest {
         + NEW_PASSWORD
         + "\" }";
 
+    private static final TestSecurityConfig.Role ROLE_WITH_OBO_PERM = new TestSecurityConfig.Role("obo_access_role").clusterPermissions(
+        "security:obo/create"
+    );
+
+    private static final TestSecurityConfig.Role ROLE_WITH_NO_OBO_PERM = new TestSecurityConfig.Role("obo_user_no_perm");
+
     protected final static TestSecurityConfig.User OBO_USER = new TestSecurityConfig.User(OBO_USER_NAME_WITH_PERM).roles(
-        new TestSecurityConfig.Role("obo_access_role").clusterPermissions("security:obo/create")
+        ROLE_WITH_OBO_PERM
     );
 
     protected final static TestSecurityConfig.User OBO_USER_NO_PERM = new TestSecurityConfig.User(OBO_USER_NAME_NO_PERM).roles(
-        new TestSecurityConfig.Role("obo_user_no_perm")
+        ROLE_WITH_NO_OBO_PERM
     );
 
-    private static final TestSecurityConfig.Role HOST_MAPPING_ROLE = new TestSecurityConfig.Role("host_mapping_role").clusterPermissions(
-        "security:obo/create"
-    );
+    private static final TestSecurityConfig.Role HOST_MAPPING_ROLE = new TestSecurityConfig.Role("host_mapping_role");
 
     protected final static TestSecurityConfig.User HOST_MAPPING_OBO_USER = new TestSecurityConfig.User(OBO_USER_NAME_WITH_HOST_MAPPING)
-        .roles(HOST_MAPPING_ROLE);
+        .roles(HOST_MAPPING_ROLE, ROLE_WITH_OBO_PERM);
 
     @ClassRule
     public static final LocalCluster cluster = new LocalCluster.Builder().clusterManager(ClusterManager.SINGLENODE)
@@ -173,9 +177,7 @@ public void shouldNotIncludeHostMappingInOBOToken() {
             .filter(s -> !s.isEmpty())
             .collect(Collectors.toUnmodifiableList());
 
-        Assert.assertTrue(roles.contains("host_mapping_role"));
-        Assert.assertFalse(roles.contains(HOST_MAPPING_IP));
-
+        Assert.assertFalse(roles.contains("host_mapping_role"));
     }
 
     private String generateOboToken(String username, String password) {