Skip to content

Commit ff70e84

Browse files
authored
Allow group id for standard queues sqs sink (#6527)
Signed-off-by: Taylor Gray <tylgry@amazon.com>
1 parent d4bbcd9 commit ff70e84

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

data-prepper-plugins/sqs-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/sqs/SqsSinkConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class SqsSinkConfig {
4646
@JsonProperty("dlq")
4747
private PluginModel dlq;
4848

49-
@AssertTrue(message = "FIFO queues wth dynamic group id or dynamic deduplication id and more than one events per message is not valid OR standard queues do not support groupId or deduplication configuration")
49+
@AssertTrue(message = "FIFO queues wth dynamic group id or dynamic deduplication id and more than one events per message is not valid OR standard queues do not support deduplication configuration")
5050
boolean isValidConfig() {
5151
String deDupId = getDeDuplicationId();
5252
String groupId = getGroupId();
@@ -64,7 +64,7 @@ boolean isValidConfig() {
6464
return true;
6565
}
6666
} else {
67-
return (groupId == null && deDupId == null);
67+
return (deDupId == null);
6868
}
6969
}
7070

data-prepper-plugins/sqs-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/sqs/SqsSinkConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void TestDefaultConfig() {
4545
}
4646

4747
@Test
48-
private void TestCustomConfig() throws Exception {
48+
void TestCustomConfig() throws Exception {
4949
AwsConfig awsConfig = mock(AwsConfig.class);
5050
reflectivelySetField(sqsSinkConfig, "awsConfig", awsConfig);
5151
assertThat(sqsSinkConfig.getAwsConfig(), equalTo(awsConfig));
@@ -83,7 +83,7 @@ void TestValidConfigs() throws Exception {
8383
assertTrue(sqsSinkConfig.isValidConfig());
8484
String testGroupId = RandomStringUtils.randomAlphabetic(10);
8585
reflectivelySetField(sqsSinkConfig, "groupId", testGroupId);
86-
assertFalse(sqsSinkConfig.isValidConfig());
86+
assertTrue(sqsSinkConfig.isValidConfig());
8787
reflectivelySetField(sqsSinkConfig, "groupId", null);
8888
String testDeDupId = RandomStringUtils.randomAlphabetic(10);
8989
reflectivelySetField(sqsSinkConfig, "deDuplicationId", testDeDupId);

0 commit comments

Comments
 (0)