diff --git a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java index d2f743ab..f7a25afd 100644 --- a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java +++ b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java @@ -84,11 +84,6 @@ public class KinesisClientLibConfigurator { } Validate.isTrue(configuration.getKinesisCredentialsProvider().isDirty(), "A basic set of AWS credentials must be provided"); - //Verify Region is real - final String regionCode = String.valueOf(configuration.getKinesisClient().get("region")); - if (regionCode == null || Region.regions().stream().filter(x -> x.id().equalsIgnoreCase(regionCode)).count() == 0) { - throw new IllegalArgumentException(String.format("Unsupported region: %s", regionCode)); - } return configuration; } diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java index 4495ea66..2e8563fe 100644 --- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java @@ -101,11 +101,6 @@ public class MultiLangDaemonConfigTest { setup("", "arn:aws:kinesis:us-east-2:ACCOUNT_ID:BadFormatting:stream/" + TEST_STREAM_NAME_IN_ARN, TEST_REGION); } - @Test(expected = IllegalArgumentException.class) - public void testConstructorFailsBecauseInvalidRegion() throws Exception { - setup("", TEST_STREAM_ARN, "us-east-1000"); - } - @Test(expected = IllegalArgumentException.class) public void testConstructorFailsBecauseStreamNameAndArnAreEmpty() throws Exception { setup("", "", TEST_REGION); diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java index 6f67ef7d..4835815a 100644 --- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java @@ -69,7 +69,7 @@ public class KinesisClientLibConfiguratorTest { @Test public void testWithBasicSetup() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", - "applicationName = b", "AWSCredentialsProvider = " + credentialName1, "workerId = 123", "regionName = us-east-1" }, '\n')); + "applicationName = b", "AWSCredentialsProvider = " + credentialName1, "workerId = 123" }, '\n')); assertEquals(config.getApplicationName(), "b"); assertEquals(config.getStreamName(), "a"); assertEquals(config.getWorkerIdentifier(), "123"); @@ -81,7 +81,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithLongVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "applicationName = app", "streamName = 123", "AWSCredentialsProvider = " + credentialName1 + ", " + credentialName2, - "workerId = 123", "failoverTimeMillis = 100", "shardSyncIntervalMillis = 500", "regionName = us-east-1" }, '\n')); + "workerId = 123", "failoverTimeMillis = 100", "shardSyncIntervalMillis = 500" }, '\n')); assertEquals(config.getApplicationName(), "app"); assertEquals(config.getStreamName(), "123"); @@ -95,7 +95,7 @@ public class KinesisClientLibConfiguratorTest { long epochTimeInSeconds = 1617406032; MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "applicationName = app", "streamName = 123", "AWSCredentialsProvider = " + credentialName1 + ", " + credentialName2, - "initialPositionInStreamExtended = " + epochTimeInSeconds, "regionName = us-east-1"}, '\n')); + "initialPositionInStreamExtended = " + epochTimeInSeconds}, '\n')); assertEquals(config.getInitialPositionInStreamExtended().getTimestamp(), new Date(epochTimeInSeconds * 1000L)); assertEquals(config.getInitialPositionInStream(), InitialPositionInStream.AT_TIMESTAMP); @@ -135,7 +135,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithUnsupportedClientConfigurationVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join( new String[] { "AWSCredentialsProvider = " + credentialName1 + ", " + credentialName2, "workerId = id", - "kinesisClientConfig = {}", "streamName = stream", "applicationName = b", "regionName = us-east-1" }, + "kinesisClientConfig = {}", "streamName = stream", "applicationName = b" }, '\n')); assertEquals(config.getApplicationName(), "b"); @@ -149,7 +149,7 @@ public class KinesisClientLibConfiguratorTest { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = kinesis", "AWSCredentialsProvider = " + credentialName2 + ", " + credentialName1, "workerId = w123", "maxRecords = 10", "metricsMaxQueueSize = 20", "applicationName = kinesis", - "retryGetRecordsInSeconds = 2", "maxGetRecordsThreadPool = 1", "regionName = us-east-1" }, '\n')); + "retryGetRecordsInSeconds = 2", "maxGetRecordsThreadPool = 1" }, '\n')); assertEquals(config.getApplicationName(), "kinesis"); assertEquals(config.getStreamName(), "kinesis"); @@ -179,7 +179,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithStringVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 1", - "kinesisEndpoint = https://kinesis", "metricsLevel = SUMMARY", "regionName = us-east-1" }, '\n')); + "kinesisEndpoint = https://kinesis", "metricsLevel = SUMMARY" }, '\n')); assertEquals(config.getWorkerIdentifier(), "1"); assertEquals(config.getKinesisClient().get("endpointOverride"), URI.create("https://kinesis")); @@ -190,7 +190,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithSetVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 1", - "metricsEnabledDimensions = ShardId, WorkerIdentifier", "regionName = us-east-1" }, '\n')); + "metricsEnabledDimensions = ShardId, WorkerIdentifier" }, '\n')); Set expectedMetricsEnabledDimensions = ImmutableSet. builder() .add("ShardId", "WorkerIdentifier").build(); @@ -201,7 +201,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithInitialPositionInStreamTrimHorizon() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 123", - "initialPositionInStream = TriM_Horizon", "regionName = us-east-1" }, '\n')); + "initialPositionInStream = TriM_Horizon" }, '\n')); assertEquals(config.getInitialPositionInStream(), InitialPositionInStream.TRIM_HORIZON); } @@ -210,7 +210,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithInitialPositionInStreamLatest() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 123", - "initialPositionInStream = LateSt", "regionName = us-east-1" }, '\n')); + "initialPositionInStream = LateSt" }, '\n')); assertEquals(config.getInitialPositionInStream(), InitialPositionInStream.LATEST); } @@ -219,7 +219,7 @@ public class KinesisClientLibConfiguratorTest { public void testSkippingNonKCLVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 123", - "initialPositionInStream = TriM_Horizon", "abc = 1", "regionName = us-east-1" }, '\n')); + "initialPositionInStream = TriM_Horizon", "abc = 1" }, '\n')); assertEquals(config.getApplicationName(), "b"); assertEquals(config.getStreamName(), "a"); @@ -231,7 +231,7 @@ public class KinesisClientLibConfiguratorTest { public void testEmptyOptionalVariables() { MultiLangDaemonConfiguration config = getConfiguration(StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 123", - "initialPositionInStream = TriM_Horizon", "maxGetRecordsThreadPool = 1", "regionName = us-east-1" }, '\n')); + "initialPositionInStream = TriM_Horizon", "maxGetRecordsThreadPool = 1" }, '\n')); assertThat(config.getMaxGetRecordsThreadPool(), equalTo(1)); assertThat(config.getRetryGetRecordsInSeconds(), nullValue()); } @@ -241,7 +241,7 @@ public class KinesisClientLibConfiguratorTest { String test = StringUtils.join(new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = ABCD," + credentialName1, "workerId = 123", "initialPositionInStream = TriM_Horizon", "maxGetRecordsThreadPool = 0", - "retryGetRecordsInSeconds = 0", "regionName = us-east-1" }, '\n'); + "retryGetRecordsInSeconds = 0" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); try { @@ -255,7 +255,7 @@ public class KinesisClientLibConfiguratorTest { @Test public void testWithInvalidIntValue() { String test = StringUtils.join(new String[] { "streamName = a", "applicationName = b", - "AWSCredentialsProvider = " + credentialName1, "workerId = 123", "failoverTimeMillis = 100nf", "regionName = us-east-1" }, '\n'); + "AWSCredentialsProvider = " + credentialName1, "workerId = 123", "failoverTimeMillis = 100nf" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); try { @@ -268,7 +268,7 @@ public class KinesisClientLibConfiguratorTest { @Test public void testWithNegativeIntValue() { String test = StringUtils.join(new String[] { "streamName = a", "applicationName = b", - "AWSCredentialsProvider = " + credentialName1, "workerId = 123", "failoverTimeMillis = -12", "regionName = us-east-1" }, '\n'); + "AWSCredentialsProvider = " + credentialName1, "workerId = 123", "failoverTimeMillis = -12" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); // separate input stream with getConfiguration to explicitly catch exception from the getConfiguration statement @@ -296,7 +296,7 @@ public class KinesisClientLibConfiguratorTest { public void testWithMissingWorkerId() { String test = StringUtils.join( new String[] { "streamName = a", "applicationName = b", "AWSCredentialsProvider = " + credentialName1, - "failoverTimeMillis = 100", "shardSyncIntervalMillis = 500", "regionName = us-east-1" }, + "failoverTimeMillis = 100", "shardSyncIntervalMillis = 500" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); MultiLangDaemonConfiguration config = configurator.getConfiguration(input); @@ -375,7 +375,7 @@ public class KinesisClientLibConfiguratorTest { "AWSCredentialsProvider = " + credentialNameKinesis, "AWSCredentialsProviderDynamoDB = " + credentialNameDynamoDB, "AWSCredentialsProviderCloudWatch = " + credentialNameCloudWatch, "failoverTimeMillis = 100", - "shardSyncIntervalMillis = 500", "regionName = us-east-1" }, '\n'); + "shardSyncIntervalMillis = 500" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); // separate input stream with getConfiguration to explicitly catch exception from the getConfiguration statement @@ -404,7 +404,7 @@ public class KinesisClientLibConfiguratorTest { "AWSCredentialsProvider = " + credentialNameKinesis, "AWSCredentialsProviderDynamoDB = " + credentialName2, "AWSCredentialsProviderCloudWatch = " + credentialName2, "failoverTimeMillis = 100", - "shardSyncIntervalMillis = 500", "regionName = us-east-1" }, '\n'); + "shardSyncIntervalMillis = 500" }, '\n'); InputStream input = new ByteArrayInputStream(test.getBytes()); // separate input stream with getConfiguration to explicitly catch exception from the getConfiguration statement