addendum - ignore region configured for central endpoint + tests

Author: virajjasani

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

@@ -293,10 +293,11 @@ private <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT> void
       boolean overrideEndpoint = true;
       checkArgument(!fipsEnabled,
           "%s : %s", ERROR_ENDPOINT_WITH_FIPS, endpoint);
-      // No region was configured, try to determine it from the endpoint.
-      if (region == null) {
-        boolean endpointEndsWithCentral =
-            endpointStr.endsWith(CENTRAL_ENDPOINT);
+      boolean endpointEndsWithCentral =
+          endpointStr.endsWith(CENTRAL_ENDPOINT);
+      // No region was configured or the endpoint is central,
+      // determine the region from the endpoint.
+      if (region == null || endpointEndsWithCentral) {
         region = getS3RegionFromEndpoint(endpointStr,
             endpointEndsWithCentral);
         if (region != null) {

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java

@@ -160,11 +160,11 @@ public void testCentralEndpointWithRegion() throws Throwable {
     describe("Create a client with the central endpoint but also specify region");
     Configuration conf = getConfiguration();
 
-    S3Client client = createS3Client(conf, CENTRAL_ENDPOINT, US_WEST_2, US_WEST_2, false);
+    S3Client client = createS3Client(conf, CENTRAL_ENDPOINT, US_WEST_2, US_EAST_2, false);
 
     expectInterceptorException(client);
 
-    client = createS3Client(conf, CENTRAL_ENDPOINT, US_EAST_1, US_EAST_1, false);
+    client = createS3Client(conf, CENTRAL_ENDPOINT, US_EAST_1, US_EAST_2, false);
 
     expectInterceptorException(client);
   }
@@ -279,6 +279,23 @@ public void testWithVPCE() throws Throwable {
   public void testCentralEndpointCrossRegionAccess() throws Throwable {
     describe("Create bucket on different region and access it using central endpoint");
     final Configuration conf = getConfiguration();
+    removeBaseAndBucketOverrides(conf, ENDPOINT);
+
+    final Configuration newConf = new Configuration(conf);
+
+    newConf.set(ENDPOINT, CENTRAL_ENDPOINT);
+
+    newFS = new S3AFileSystem();
+    newFS.initialize(getFileSystem().getUri(), newConf);
+
+    assertOpsUsingNewFs();
+  }
+
+  @Test
+  public void testCentralEndpointWithNullRegionCrossRegionAccess() throws Throwable {
+    describe(
+        "Create bucket on different region and access it using central endpoint and null region");
+    final Configuration conf = getConfiguration();
     removeBaseAndBucketOverrides(conf, ENDPOINT, AWS_REGION);
 
     final Configuration newConf = new Configuration(conf);
@@ -288,6 +305,10 @@ public void testCentralEndpointCrossRegionAccess() throws Throwable {
     newFS = new S3AFileSystem();
     newFS.initialize(getFileSystem().getUri(), newConf);
 
+    assertOpsUsingNewFs();
+  }
+
+  private void assertOpsUsingNewFs() throws IOException {
     final String file = getMethodName();
     final Path basePath = methodPath();
     final Path srcDir = new Path(basePath, "srcdir");
@@ -328,7 +349,7 @@ private final class RegionInterceptor implements ExecutionInterceptor {
     public void beforeExecution(Context.BeforeExecution context,
         ExecutionAttributes executionAttributes)  {
 
-      if (endpoint != null && (!endpoint.endsWith(CENTRAL_ENDPOINT) || !US_EAST_2.equals(region))) {
+      if (endpoint != null && !endpoint.endsWith(CENTRAL_ENDPOINT)) {
         Assertions.assertThat(
                 executionAttributes.getAttribute(AwsExecutionAttribute.ENDPOINT_OVERRIDDEN))
             .describedAs("Endpoint not overridden").isTrue();