From 293957b3dbbf36eaa0aa137e1747bf3629660ee3 Mon Sep 17 00:00:00 2001 From: Ahmar Suhail Date: Tue, 26 Jul 2022 14:36:57 +0100 Subject: [PATCH 1/2] fixes access point name logic --- .../apache/hadoop/fs/s3a/auth/ITestCustomSigner.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java index cbba326d5ecae..39a465d8b0101 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java @@ -228,10 +228,13 @@ private String parseBucketFromHost(String host) { if (service.contains("s3-accesspoint") || service.contains("s3-outposts") || service.contains("s3-object-lambda")) { // If AccessPoint then bucketName is of format `accessPoint-accountId`; - String[] accessPointBits = hostBits[0].split("-"); - int lastElem = accessPointBits.length - 1; - String accountId = accessPointBits[lastElem]; - String accessPointName = String.join("", Arrays.copyOf(accessPointBits, lastElem)); + String[] accessPointBits = bucketName.split("-"); + String accountId = accessPointBits[accessPointBits.length - 1]; + // Extract the access point name from bucket name. eg: if bucket name is + // test-custom-signer-, get the access point name test-custom-signer by removing + // - from the bucket name. + String accessPointName = + bucketName.substring(0, bucketName.length() - (accountId.length() + 1)); Arn arn = Arn.builder() .withAccountId(accountId) .withPartition("aws") From fa39cb551bcc424ff773094f74a26d44fd15e882 Mon Sep 17 00:00:00 2001 From: Ahmar Suhail Date: Mon, 1 Aug 2022 13:24:12 +0100 Subject: [PATCH 2/2] removes unused import --- .../java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java index 39a465d8b0101..a829d470e7a66 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.security.PrivilegedExceptionAction; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Objects;