pr review updates for mneethiraj: remove additional s3 prefix

Author: Fabian Morgan

hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestAssumeRoleRequest.java

@@ -62,7 +62,7 @@ public void testConstructorAndGetters() {
     assertEquals(permissions, grant.getPermissions());
     assertEquals(s3Actions, grant.getS3Actions());
     // Ensure the s3 actions are not modifiable
-    assertThrows(UnsupportedOperationException.class, () -> grant.getS3Actions().add("s3:GetObject"));
+    assertThrows(UnsupportedOperationException.class, () -> grant.getS3Actions().add("GetObject"));
 
     assertEquals("host", assumeRoleRequest1.getHost());
     assertNull(assumeRoleRequest1.getIp());
@@ -94,8 +94,8 @@ public void testGrantsWithS3Actions() {
     final Set<IAccessAuthorizer.ACLType> permissions = Collections.singleton(IAccessAuthorizer.ACLType.READ);
 
     final Set<String> s3Actions = new LinkedHashSet<>();
-    s3Actions.add("s3:GetObject");
-    s3Actions.add("s3:PutObject");
+    s3Actions.add("GetObject");
+    s3Actions.add("PutObject");
 
     final AssumeRoleRequest.OzoneGrant grantWithActions = new AssumeRoleRequest.OzoneGrant(
         objects, permissions, s3Actions);

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestRequestContext.java

@@ -61,7 +61,7 @@ public void testToBuilderWithNoModifications() {
     final String serviceId = "testServiceId";
     final String ownerName = "testOwner";
     final String sessionPolicy = "{\"Statement\":[{\"Effect\":\"Allow\"}]}";
-    final String s3IamAction = "s3:GetObject";
+    final String s3Action = "GetObject";
 
     final RequestContext original = RequestContext.newBuilder()
         .setHost(host)
@@ -72,7 +72,7 @@ public void testToBuilderWithNoModifications() {
         .setOwnerName(ownerName)
         .setRecursiveAccessCheck(true)
         .setSessionPolicy(sessionPolicy)
-        .setS3Action(s3IamAction)
+        .setS3Action(s3Action)
         .build();
 
     // Use toBuilder to create a new builder
@@ -90,7 +90,7 @@ public void testToBuilderWithNoModifications() {
     assertTrue(original.isRecursiveAccessCheck(), "RecursiveAccessCheck should be preserved");
     assertEquals(original.getSessionPolicy(), requestCtxFromToBuilder.getSessionPolicy(),
         "SessionPolicy should be preserved");
-    assertEquals(original.getS3Action(), requestCtxFromToBuilder.getS3Action(), "S3 IAM action should be preserved");
+    assertEquals(original.getS3Action(), requestCtxFromToBuilder.getS3Action(), "S3 action should be preserved");
   }
 
   @Test
@@ -116,7 +116,7 @@ public void testToBuilderWithModifications() {
         .setOwnerName("owner2")
         .setRecursiveAccessCheck(true)
         .setSessionPolicy("{\"Statement\":[]}")
-        .setS3Action("s3:DeleteObject")
+        .setS3Action("DeleteObject")
         .build();
 
     // Verify original is unchanged
@@ -135,6 +135,6 @@ public void testToBuilderWithModifications() {
     assertEquals("owner2", modified.getOwnerName(), "Modified owner should be updated");
     assertTrue(modified.isRecursiveAccessCheck(), "Modified recursive flag should be updated");
     assertEquals("{\"Statement\":[]}", modified.getSessionPolicy(), "Modified session policy should be updated");
-    assertEquals("s3:DeleteObject", modified.getS3Action(), "Modified S3 action should be updated");
+    assertEquals("DeleteObject", modified.getS3Action(), "Modified S3 action should be updated");
   }
 }