You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2017/12/18 07:25:24 UTC
[2/5] flink git commit: [FLINK-8249] [kinesis] Fix setting region on
KinesisProducerConfiguration
[FLINK-8249] [kinesis] Fix setting region on KinesisProducerConfiguration
This closes #5160.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3397bd66
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3397bd66
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3397bd66
Branch: refs/heads/master
Commit: 3397bd66abdc529a2d5940a09f9feee035fd0b90
Parents: d12158e
Author: eskabetxe <bo...@boto.pro>
Authored: Wed Dec 13 12:43:27 2017 +0100
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Sun Dec 17 20:27:24 2017 -0800
----------------------------------------------------------------------
.../connectors/kinesis/util/KinesisConfigUtil.java | 1 +
.../connectors/kinesis/util/KinesisConfigUtilTest.java | 10 ++++++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3397bd66/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
index dae7f52..a6b0f04 100644
--- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
+++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
@@ -189,6 +189,7 @@ public class KinesisConfigUtil {
validateAwsConfiguration(config);
KinesisProducerConfiguration kpc = KinesisProducerConfiguration.fromProperties(config);
+ kpc.setRegion(config.getProperty(AWSConfigConstants.AWS_REGION));
kpc.setCredentialsProvider(AWSUtil.getCredentialsProvider(config));
http://git-wip-us.apache.org/repos/asf/flink/blob/3397bd66/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
index 792d3a7..dab6ea2 100644
--- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
+++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
@@ -114,6 +114,16 @@ public class KinesisConfigUtilTest {
assertEquals("2", replacedConfig.getProperty(KinesisConfigUtil.COLLECTION_MAX_COUNT));
}
+ @Test
+ public void testCorrectlySetRegionInProducerConfiguration() {
+ String region = "us-east-1";
+ Properties testConfig = new Properties();
+ testConfig.setProperty(AWSConfigConstants.AWS_REGION, region);
+ KinesisProducerConfiguration kpc = KinesisConfigUtil.getValidatedProducerConfiguration(testConfig);
+
+ assertEquals("incorrect region", region, kpc.getRegion());
+ }
+
// ----------------------------------------------------------------------
// validateAwsConfiguration() tests
// ----------------------------------------------------------------------