pr review updates for ChenSammi

Author: Fabian Morgan

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java

@@ -3977,7 +3977,7 @@ public OmMultipartUploadList listMultipartUploads(String volumeName,
     auditMap.put(OzoneConsts.PREFIX, prefix);
 
     try {
-      if (getAclsEnabled() && isStsS3Request()) {
+      if (getAclsEnabled()) {
         omMetadataReader.checkAcls(
             ResourceType.BUCKET, StoreType.OZONE, ACLType.READ, realVolumeName, realBucketName, null);
         omMetadataReader.checkAcls(

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListMultipartUploadsAcls.java

@@ -137,17 +137,6 @@ void testSkipsAclChecksWhenAclsAreDisabledEvenForStsRequest() throws Exception {
         eq(REAL_VOLUME), eq(REAL_BUCKET), eq(PREFIX), eq(""), eq(""), eq(10), eq(false));
   }
 
-  @Test
-  void testSkipsAclChecksWhenNotStsRequestEvenIfAclsAreEnabled() throws Exception {
-    OzoneManager.setS3Auth(null);
-    OzoneManager.setStsTokenIdentifier(null);
-    when(omSpy.getAclsEnabled()).thenReturn(true);
-
-    omSpy.listMultipartUploads(REQUESTED_VOLUME, REQUESTED_BUCKET, PREFIX, "", "", 10, false);
-
-    verify(omMetadataReader, never()).checkAcls(any(), any(), any(), any(), any(), any());
-  }
-
   @Test
   void testAclsEnabledAndStsRequestChecksBucketReadThenListUsingResolvedNames() throws Exception {
     setupStsS3Request();
@@ -204,17 +193,6 @@ void testListAclAccessDeniedSkipsKeyManagerAndIncrementsFailMetric() throws Exce
     verify(metrics, never()).incNumListMultipartUploads();
   }
 
-  @Test
-  void testNonStsRequestSkipsAclChecks() throws Exception {
-    OzoneManager.setS3Auth(S3Authentication.newBuilder().setAccessId(STS_ACCESS_ID).build());
-    OzoneManager.setStsTokenIdentifier(null);
-    when(omSpy.getAclsEnabled()).thenReturn(true);
-
-    omSpy.listMultipartUploads(REQUESTED_VOLUME, REQUESTED_BUCKET, PREFIX, "", "", 10, false);
-
-    verify(omMetadataReader, never()).checkAcls(any(), any(), any(), any(), any(), any());
-  }
-
   private void setupStsS3Request() {
     OzoneManager.setS3Auth(S3Authentication.newBuilder().setAccessId(STS_ACCESS_ID).build());
     OzoneManager.setStsTokenIdentifier(mock(STSTokenIdentifier.class));