This is an automated email from the ASF dual-hosted git repository. dannycranmer pushed a commit to branch release-1.14 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1c653846088ff1ffa29d20a128a4b5d8cd0c5127 Author: Hong Teoh <[email protected]> AuthorDate: Mon Aug 8 10:52:32 2022 +0100 [FLINK-28094][kinesis] Removing references to Regions enum and instead using RegionUtils so that we include future AWS Regions as well --- .../streaming/connectors/kinesis/proxy/DynamoDBStreamsProxy.java | 6 ++---- .../org/apache/flink/streaming/connectors/kinesis/util/AWSUtil.java | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/proxy/DynamoDBStreamsProxy.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/proxy/DynamoDBStreamsProxy.java index 4e58d6cb7f3..65c4035fd33 100644 --- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/proxy/DynamoDBStreamsProxy.java +++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/proxy/DynamoDBStreamsProxy.java @@ -23,8 +23,7 @@ import org.apache.flink.streaming.connectors.kinesis.model.StreamShardHandle; import com.amazonaws.ClientConfiguration; import com.amazonaws.ClientConfigurationFactory; import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.regions.Region; -import com.amazonaws.regions.Regions; +import com.amazonaws.regions.RegionUtils; import com.amazonaws.services.dynamodbv2.streamsadapter.AmazonDynamoDBStreamsAdapterClient; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.model.DescribeStreamResult; @@ -91,8 +90,7 @@ public class DynamoDBStreamsProxy extends KinesisProxy { if (configProps.containsKey(AWS_ENDPOINT)) { adapterClient.setEndpoint(configProps.getProperty(AWS_ENDPOINT)); } else { - adapterClient.setRegion( - Region.getRegion(Regions.fromName(configProps.getProperty(AWS_REGION)))); + adapterClient.setRegion(RegionUtils.getRegion(configProps.getProperty(AWS_REGION))); } return adapterClient; diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/AWSUtil.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/AWSUtil.java index 87d8f152041..f6f2fda06ce 100644 --- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/AWSUtil.java +++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/AWSUtil.java @@ -102,8 +102,7 @@ public class AWSUtil { configProps.getProperty(AWSConfigConstants.AWS_ENDPOINT), configProps.getProperty(AWSConfigConstants.AWS_REGION))); } else { - builder.withRegion( - Regions.fromName(configProps.getProperty(AWSConfigConstants.AWS_REGION))); + builder.withRegion(configProps.getProperty(AWSConfigConstants.AWS_REGION)); } return builder.build(); }
