luciano/amazon-kinesis-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated multilang to use stream name over stream arn if both are passed in

Browse source
This commit is contained in:
Ryan Pelaez 2023-06-12 09:11:13 -07:00
parent 3d71e0868e
commit 7ba4efb1d1
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java
View file

@ -74,15 +74,15 @@ public class KinesisClientLibConfigurator {
}); });
Validate.notBlank(configuration.getApplicationName(), "Application name is required"); Validate.notBlank(configuration.getApplicationName(), "Application name is required");
try { try {
Validate.notBlank(configuration.getStreamName(), "");
}catch (Exception e) {
Validate.notBlank(configuration.getStreamArn(), "Stream name or Stream Arn is required. (Stream Name takes precedence if both are passed in)");
Arn streamArnObj = Arn.fromString(configuration.getStreamArn()); Arn streamArnObj = Arn.fromString(configuration.getStreamArn());
String streamNameFromArn = streamArnObj.getResource().getResource(); String streamNameFromArn = streamArnObj.getResource().getResource();
Validate.notBlank(streamNameFromArn, "");
//Stream Arn takes precedence. Override existing configuration with the stream name found in the Arn
configuration.setStreamName(streamNameFromArn); configuration.setStreamName(streamNameFromArn);
}catch (Exception e) {
Validate.notBlank(configuration.getStreamName(), "Stream name or Stream Arn is required. (Stream Arn takes precedence if both are passed in)");
} }
Validate.isTrue(configuration.getKinesisCredentialsProvider().isDirty(), "A basic set of AWS credentials must be provided"); Validate.isTrue(configuration.getKinesisCredentialsProvider().isDirty(), "A basic set of AWS credentials must be provided");
return configuration; return configuration;

4
amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/MultiLangDaemonConfigTest.java
View file

@ -143,12 +143,12 @@ public class MultiLangDaemonConfigTest {
} }
@Test @Test
public void testConstructorUsingStreamArnOverStreamName() throws IOException { public void testConstructorUsingStreamNameOverStreamArn() throws IOException {
setup(TestStreamName, TestStreamArn); setup(TestStreamName, TestStreamArn);
MultiLangDaemonConfig deamonConfig = new MultiLangDaemonConfig(FILENAME, classLoader, configurator); MultiLangDaemonConfig deamonConfig = new MultiLangDaemonConfig(FILENAME, classLoader, configurator);
AssertConfigurationsMatch(deamonConfig, TestExe, TestApplicationName, TestStreamNameInArn); AssertConfigurationsMatch(deamonConfig, TestExe, TestApplicationName, TestStreamName);
} }
/** /**

4
amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java
View file

@ -308,7 +308,7 @@ public class KinesisClientLibConfiguratorTest {
@Test @Test
public void testWithMissingStreamNameAndMissingStreamArn() { public void testWithMissingStreamNameAndMissingStreamArn() {
thrown.expect(NullPointerException.class); thrown.expect(NullPointerException.class);
thrown.expectMessage("Stream name or Stream Arn is required. (Stream Arn takes precedence if both are passed in)"); thrown.expectMessage("Stream name or Stream Arn is required. (Stream Name takes precedence if both are passed in)");
String test = StringUtils.join(new String[] { String test = StringUtils.join(new String[] {
"applicationName = b", "applicationName = b",
@ -323,7 +323,7 @@ public class KinesisClientLibConfiguratorTest {
@Test @Test
public void testWithEmptyStreamNameAndMissingStreamArn() { public void testWithEmptyStreamNameAndMissingStreamArn() {
thrown.expect(IllegalArgumentException.class); thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Stream name or Stream Arn is required. (Stream Arn takes precedence if both are passed in)"); thrown.expectMessage("Stream name or Stream Arn is required. (Stream Name takes precedence if both are passed in)");
String test = StringUtils.join(new String[] { String test = StringUtils.join(new String[] {
"applicationName = b", "applicationName = b",