Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-18368. Fixes ITestCustomSigner for access point names with '-' (#4634) 

Contributed By: Ahmar Suhail <ahmarsu@amazon.co.uk>
This commit is contained in:
ahmarsuhail 2022-08-01 21:19:42 +01:00 committed by GitHub
parent 13fbfd5dea
commit 123d1aa884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java
View File

@ -20,7 +20,6 @@ package org.apache.hadoop.fs.s3a.auth;
import java.io.IOException; import java.io.IOException;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -228,10 +227,13 @@ public class ITestCustomSigner extends AbstractS3ATestBase {
if (service.contains("s3-accesspoint") || service.contains("s3-outposts") if (service.contains("s3-accesspoint") || service.contains("s3-outposts")
|| service.contains("s3-object-lambda")) { || service.contains("s3-object-lambda")) {
// If AccessPoint then bucketName is of format `accessPoint-accountId`; // If AccessPoint then bucketName is of format `accessPoint-accountId`;
String[] accessPointBits = hostBits[0].split("-"); String[] accessPointBits = bucketName.split("-");
int lastElem = accessPointBits.length - 1; String accountId = accessPointBits[accessPointBits.length - 1];
String accountId = accessPointBits[lastElem]; // Extract the access point name from bucket name. eg: if bucket name is
String accessPointName = String.join("", Arrays.copyOf(accessPointBits, lastElem)); // test-custom-signer-<accountId>, get the access point name test-custom-signer by removing
// -<accountId> from the bucket name.
String accessPointName =
bucketName.substring(0, bucketName.length() - (accountId.length() + 1));
Arn arn = Arn.builder() Arn arn = Arn.builder()
.withAccountId(accountId) .withAccountId(accountId)
.withPartition("aws") .withPartition("aws")