Skip to content

[Backport 2.3] Fix SNS regex for validation on notification channel to support SNS FIFO topics. #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eirsep merged 1 commit into from
Mar 15, 2023
Merged

[Backport 2.3] Fix SNS regex for validation on notification channel to support SNS FIFO topics. #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/commons/notifications/model/Sns.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ data class Sns(val topicArn: String, val roleArn: String?) : BaseConfigData {
private val log by logger(Sns::class.java)

private val SNS_ARN_REGEX =
Pattern.compile("^arn:aws(-[^:]+)?:sns:([a-zA-Z0-9-]+):([0-9]{12}):([a-zA-Z0-9-_]+)$")
Pattern.compile("^arn:aws(-[^:]+)?:sns:([a-zA-Z0-9-]+):([0-9]{12}):([a-zA-Z_0-9+=,.@\\-_/]+)$")

/**
* reader to create instance of class from writable.
Expand Down
13 changes: 13 additions & 0 deletions src/test/kotlin/org/opensearch/commons/notifications/model/SnsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package org.opensearch.commons.notifications.model
import com.fasterxml.jackson.core.JsonParseException
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Test
import org.opensearch.commons.utils.createObjectFromJsonString
import org.opensearch.commons.utils.getJsonString
Expand Down Expand Up @@ -49,6 +50,18 @@ internal class SnsTests {
}
}

@Test
fun `test SNS correctly validates SNS FIFO topic ARN`() {
try {
Sns(
"arn:aws:sns:ap-southeast-2:333654771707:sns-fifo-alerting.fifo",
"arn:aws:iam::012345678912:role/iam-test"
)
} catch (e: Exception) {
fail("Expected fifo sns topic ARN to be validated successfully", e)
}
}

@Test
fun `SNS serialize and deserialize transport object should be equal`() {
val sampleSns = Sns("arn:aws:sns:us-east-1:012345678912:topic-test", "arn:aws:iam::012345678912:role/iam-test")
Expand Down