branch-3.1: [fix](oss)Support Aliyun OSS S3-Compatible Public Endpoint Format s3.oss-cn-xxx.aliyuncs.com apache#51894 (apache#53368)

picked from apache#51894

Author: CalvinKirs

fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java

@@ -64,9 +64,14 @@ public class OSSProperties extends AbstractS3CompatibleProperties {
      * - <a href="http://oss-cn-shenzhen-internal.aliyuncs.com">...</a> => region = cn-shenzhen
      * <p>
      * Group(1) captures the region name (e.g., cn-hangzhou).
+     *<p>
+     * Support S3 compatible endpoints:<a href="https://help.aliyun.com/zh/oss/developer-reference/
+     * use-amazon-s3-sdks-to-access-oss">...</a>
+     * - s3.cn-hangzhou.aliyuncs.com              => region = cn-hangzhou
+     * <p>
      */
     private static final Pattern ENDPOINT_PATTERN = Pattern
-            .compile("^(?:https?://)?oss-([a-z0-9-]+?)(?:-internal)?\\.aliyuncs\\.com$");
+            .compile("^(?:https?://)?(?:s3\\.)?oss-([a-z0-9-]+?)(?:-internal)?\\.aliyuncs\\.com$");
 
     protected OSSProperties(Map<String, String> origProps) {
         super(Type.OSS, origProps);

fe/fe-core/src/test/java/org/apache/doris/datasource/property/storage/OSSPropertiesTest.java

@@ -107,6 +107,14 @@ public void testGetRegion() throws UserException {
         Assertions.assertEquals("oss-cn-hangzhou.aliyuncs.com", ossProperties.getEndpoint());
         origProps.put("oss.endpoint", "oss-cn-hangzhou-internal.aliyuncs.com");
         Assertions.assertEquals("cn-hangzhou", ((OSSProperties) StorageProperties.createPrimary(origProps)).getRegion());
+        origProps.put("oss.endpoint", "s3.oss-cn-shanghai.aliyuncs.com");
+        Assertions.assertEquals("cn-shanghai", ((OSSProperties) StorageProperties.createPrimary(origProps)).getRegion());
+        origProps.put("oss.endpoint", "s3.oss-cn-hongkong-internal.aliyuncs.com");
+        Assertions.assertEquals("cn-hongkong", ((OSSProperties) StorageProperties.createPrimary(origProps)).getRegion());
+        origProps.put("oss.endpoint", "https://s3.oss-cn-hongkong-internal.aliyuncs.com");
+        Assertions.assertEquals("cn-hongkong", ((OSSProperties) StorageProperties.createPrimary(origProps)).getRegion());
+        origProps.put("oss.endpoint", "http://s3.oss-cn-hongkong.aliyuncs.com");
+        Assertions.assertEquals("cn-hongkong", ((OSSProperties) StorageProperties.createPrimary(origProps)).getRegion());
     }
 
     @Test