Skip to content

Add support for the Chinese Kinesis endpoint #71

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.

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

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -83,15 +83,18 @@ object SinkApp extends App {

val tracker = if (conf.hasPath("sink.monitoring.snowplow")) {
SnowplowTracking.initializeTracker(conf.getConfig("sink.monitoring.snowplow")).some
} else {
} else {
None
}

val maxConnectionTime = conf.getConfig("sink").getConfig("s3").getLong("max-timeout")

// TODO: make the conf file more like the Elasticsearch equivalent
val kinesisSinkRegion = conf.getConfig("sink").getConfig("kinesis").getString("region")
val kinesisSinkEndpoint = s"https://kinesis.${kinesisSinkRegion}.amazonaws.com"
val kinesisSinkEndpoint = kinesisSinkRegion match {
case "cn-north-1" => "kinesis.cn-north-1.amazonaws.com.cn" // adding AWS China kinesis endpoint
case _ => s"https://kinesis.${kinesisSinkRegion}.amazonaws.com"
}
val kinesisSink = conf.getConfig("sink").getConfig("kinesis").getConfig("out")
val kinesisSinkName = kinesisSink.getString("stream-name")

@@ -137,7 +140,10 @@ object SinkApp extends App {
val kinesis = connector.getConfig("kinesis")
val kinesisIn = kinesis.getConfig("in")
val kinesisRegion = kinesis.getString("region")
val kEndpoint = s"https://kinesis.${kinesisSinkRegion}.amazonaws.com"
val kEndpoint = kinesisRegion match {
case "cn-north-1" => "kinesis.cn-north-1.amazonaws.com.cn"
case _ => s"https://kinesis.${kinesisSinkRegion}.amazonaws.com"
}
val streamName = kinesisIn.getString("stream-name")
val initialPosition = kinesisIn.getString("initial-position")
val appName = kinesis.getString("app-name")
@@ -146,6 +152,7 @@ object SinkApp extends App {
val s3Region = s3.getString("region")
val s3Endpoint = s3Region match {
case "us-east-1" => "https://s3.amazonaws.com"
case "cn-north-1" => "https://s3.cn-north-1.amazonaws.com.cn"
case _ => s"https://s3-$s3Region.amazonaws.com"
}
val bucket = s3.getString("bucket")