From d219616a79b8170e2337f7662727fcf6e191bd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Kluczy=C5=84ski?= Date: Sun, 27 May 2018 12:53:59 +0200 Subject: [PATCH] Bucket region name correction for for us-east-1 --- .gitignore | 3 +++ .../java/com/github/platform/team/plugin/AmazonS3Wagon.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 919486ec..e821d46a 100644 --- a/.gitignore +++ b/.gitignore @@ -195,3 +195,6 @@ gradle-app.setting # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 # gradle/wrapper/gradle-wrapper.properties + +# Maven +target/ \ No newline at end of file diff --git a/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java b/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java index 4f9e162a..8144023f 100644 --- a/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java +++ b/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java @@ -147,12 +147,13 @@ private static PutObjectRequest createDirectoryPutObjectRequest(String bucketNam } private static String getBucketRegion(AWSCredentialsProvider credentialsProvider, ClientConfiguration clientConfiguration, String bucketName) { - return AmazonS3Client.builder() + String bucketRegion = AmazonS3Client.builder() .withCredentials(credentialsProvider) .withClientConfiguration(clientConfiguration) .enableForceGlobalBucketAccess() .build() .getBucketLocation(bucketName); + return "US".equals(bucketRegion) ? "us-east-1" : bucketRegion; } @Override