HDDS-14795. Allow non-S3-compliant bucket name length if strict S3 is disabled (#10014)

Author: Russole

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java

@@ -71,31 +71,35 @@ public final class HddsClientUtils {
   private HddsClientUtils() {
   }
 
-  private static void doNameChecks(String resName, String resType) {
+  private static void doNameChecks(String resName, String resType, boolean isStrictS3) {
     if (resName == null) {
       throw new IllegalArgumentException(resType + " name is null");
     }
 
-    if (resName.length() < OzoneConsts.OZONE_MIN_BUCKET_NAME_LENGTH) {
-      throw new IllegalArgumentException(resType +
-          " name '" + resName + "' is too short, " +
-          VALID_LENGTH_MESSAGE);
-    }
-
-    if (resName.length() > OzoneConsts.OZONE_MAX_BUCKET_NAME_LENGTH) {
-      String nameToReport;
+    boolean applyS3LengthConstraint = !resType.equals("bucket") || isStrictS3;
 
-      if (resName.length() > MAX_BUCKET_NAME_LENGTH_IN_LOG) {
-        nameToReport = String.format(
-            "%s...",
-            resName.substring(0, MAX_BUCKET_NAME_LENGTH_IN_LOG));
-      } else {
-        nameToReport = resName;
+    if (applyS3LengthConstraint) {
+      if (resName.length() < OzoneConsts.OZONE_MIN_BUCKET_NAME_LENGTH) {
+        throw new IllegalArgumentException(resType +
+            " name '" + resName + "' is too short, " +
+            VALID_LENGTH_MESSAGE);
       }
 
-      throw new IllegalArgumentException(resType +
-          " name '" + nameToReport + "' is too long, " +
-          VALID_LENGTH_MESSAGE);
+      if (resName.length() > OzoneConsts.OZONE_MAX_BUCKET_NAME_LENGTH) {
+        String nameToReport;
+
+        if (resName.length() > MAX_BUCKET_NAME_LENGTH_IN_LOG) {
+          nameToReport = String.format(
+              "%s...",
+              resName.substring(0, MAX_BUCKET_NAME_LENGTH_IN_LOG));
+        } else {
+          nameToReport = resName;
+        }
+
+        throw new IllegalArgumentException(resType +
+            " name '" + nameToReport + "' is too long, " +
+            VALID_LENGTH_MESSAGE);
+      }
     }
 
     if (resName.charAt(0) == '.' || resName.charAt(0) == '-') {
@@ -191,7 +195,7 @@ public static void verifyResourceName(String resName, String resType, boolean is
           " name cannot be an IPv4 address or all numeric");
     }
 
-    doNameChecks(resName, resType);
+    doNameChecks(resName, resType, isStrictS3);
   }
 
   /**

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java

@@ -19,6 +19,7 @@
 
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newBucketInfoBuilder;
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newCreateBucketRequest;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -67,14 +68,34 @@ public void testPreExecute() throws Exception {
     doPreExecute(volumeName, bucketName);
   }
 
-  @Test
-  public void preExecuteRejectsInvalidBucketName() {
-    // Verify invalid bucket name throws exception
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "b1",
+      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+  })
+  public void preExecuteRejectsInvalidBucketNameLengthWhenStrictS3Enabled(
+      String bucketName) {
+    when(ozoneManager.isStrictS3()).thenReturn(true);
+
     OMException omException = assertThrows(OMException.class,
-        () -> doPreExecute("volume1", "b1"));
-    assertEquals(
-        "bucket name 'b1' is too short, valid length is 3-63 characters",
-        omException.getMessage());
+        () -> doPreExecute("volume1", bucketName));
+
+    assertThat(omException.getMessage())
+        .contains("bucket name")
+        .contains("valid length is 3-63 characters");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "b1",
+      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+  })
+  public void preExecuteAllowsInvalidLengthBucketNameWhenStrictS3Disabled(
+      String bucketName) throws Exception {
+
+    when(ozoneManager.isStrictS3()).thenReturn(false);
+
+    doPreExecute("volume1", bucketName);
   }
 
   @Test