From b1bdc689c7dae406cb6a586dd323325b7fc7bd3c Mon Sep 17 00:00:00 2001 From: Shinobi47 Date: Wed, 1 Apr 2020 18:38:12 +0200 Subject: [PATCH] Fix region retrieving in AWSAuthentication --- .../elasticsearch/config/AWSAuthentication.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/internetitem/logback/elasticsearch/config/AWSAuthentication.java b/src/main/java/com/internetitem/logback/elasticsearch/config/AWSAuthentication.java index 62c8da1..d660492 100644 --- a/src/main/java/com/internetitem/logback/elasticsearch/config/AWSAuthentication.java +++ b/src/main/java/com/internetitem/logback/elasticsearch/config/AWSAuthentication.java @@ -18,7 +18,7 @@ import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; import com.amazonaws.http.HttpMethodName; -import com.amazonaws.regions.DefaultAwsRegionProviderChain; +import com.amazonaws.regions.Regions; import com.amazonaws.util.StringInputStream; /** @@ -34,7 +34,7 @@ public class AWSAuthentication implements Authentication { public AWSAuthentication() { signer = new AWS4Signer(false); signer.setServiceName("es"); - signer.setRegionName(new DefaultAwsRegionProviderChain().getRegion()); + signer.setRegionName(getCurrentRegion()); AWSCredentialsProvider credsProvider = new DefaultAWSCredentialsProviderChain(); credentials = credsProvider.getCredentials(); } @@ -44,6 +44,13 @@ public void addAuth(HttpURLConnection urlConnection, String body) { signer.sign(new URLConnectionSignableRequest(urlConnection, body), credentials); } + + private String getCurrentRegion() { + if(Regions.getCurrentRegion() != null) { + return Regions.getCurrentRegion().getName(); + } + return null; + } /** * Wrapper for signing a HttpURLConnection