From 02cdb44afb04e2d8a702ddb545403830be6e1064 Mon Sep 17 00:00:00 2001 From: colmsnowplow Date: Thu, 18 Apr 2024 12:47:17 +0100 Subject: [PATCH 1/2] Add sts dependency for service account auth on AWS --- build.sbt | 5 ++++- project/Dependencies.scala | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 97ae0bf..fb3658f 100644 --- a/build.sbt +++ b/build.sbt @@ -39,10 +39,12 @@ lazy val core = project Dependencies.Libraries.collectorPayload, Dependencies.Libraries.slf4j, Dependencies.Libraries.thrift, + Dependencies.Libraries.stsSdk % Runtime, // Scala (test only) Dependencies.Libraries.specs2Scalacheck, Dependencies.Libraries.specs2, - Dependencies.Libraries.specs2Cats + Dependencies.Libraries.specs2Cats, + ) ) @@ -71,6 +73,7 @@ lazy val sinks = project Dependencies.Libraries.fs2Pubsub, Dependencies.Libraries.fs2Kafka, Dependencies.Libraries.awsRegions, + Dependencies.Libraries.stsSdk % Runtime, "org.http4s" %% "http4s-ember-client" % "0.23.15", "org.http4s" %% "http4s-circe" % "0.23.15" // TODO move this diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cc11f28..94efc78 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -44,7 +44,7 @@ object Dependencies { val badRows = "2.1.1" val httpClient = "4.5.13" val thrift = "0.15.0" // override transitive dependency to mitigate security vulnerabilities - val http4s = "0.23.15" + val http4s = "0.23.15" } object Libraries { @@ -67,7 +67,8 @@ object Dependencies { val slf4j = "org.slf4j" % "slf4j-simple" % V.slf4j val kcl = "software.amazon.awssdk" % "kinesis" % V.awsSdk val awsRegions = "software.amazon.awssdk" % "regions" % V.awsSdk - val http4sClient = "org.http4s" %% "http4s-blaze-client" % V.http4s + val http4sClient = "org.http4s" %% "http4s-blaze-client" % V.http4s + val stsSdk = "software.amazon.awssdk" % "sts" % V.awsSdk // Scala (test only) val specs2 = "org.specs2" %% "specs2-core" % V.specs2 % Test From 6afed4ba02bf326aaeb06a13ae81cd1ac4885f54 Mon Sep 17 00:00:00 2001 From: colmsnowplow Date: Thu, 18 Apr 2024 13:06:00 +0100 Subject: [PATCH 2/2] Typo fix and cleanup --- README.md | 4 ++-- build.sbt | 5 ++--- project/Dependencies.scala | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 61d6bc4..579ac07 100644 --- a/README.md +++ b/README.md @@ -249,8 +249,8 @@ Aside from "output" configuration, all fields in the configuration file are opti // } // "type": "Kinesis" - // Required: Kinesis stream URI - // "uri": "my-kinesis-stream", + // Required: Kinesis stream name + // "streamName": "my-kinesis-stream", // Optional: Region where Kinesis stream runs // "region": "eu-central-1" diff --git a/build.sbt b/build.sbt index fb3658f..ef9f192 100644 --- a/build.sbt +++ b/build.sbt @@ -74,9 +74,8 @@ lazy val sinks = project Dependencies.Libraries.fs2Kafka, Dependencies.Libraries.awsRegions, Dependencies.Libraries.stsSdk % Runtime, - "org.http4s" %% "http4s-ember-client" % "0.23.15", - "org.http4s" %% "http4s-circe" % "0.23.15" - // TODO move this + Dependencies.Libraries.http4sEmber, + Dependencies.Libraries.http4sCirce ), //libraryDependencies += "org.typelevel" %% "cats-effect" % "3.4.6", // libraryDependencies += "org.http4s" %% "http4s-ember-client" % "0.23.15", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 94efc78..96305c8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -68,7 +68,9 @@ object Dependencies { val kcl = "software.amazon.awssdk" % "kinesis" % V.awsSdk val awsRegions = "software.amazon.awssdk" % "regions" % V.awsSdk val http4sClient = "org.http4s" %% "http4s-blaze-client" % V.http4s - val stsSdk = "software.amazon.awssdk" % "sts" % V.awsSdk + val stsSdk = "software.amazon.awssdk" % "sts" % V.awsSdk + val http4sEmber = "org.http4s" %% "http4s-ember-client" % V.http4s + val http4sCirce = "org.http4s" %% "http4s-circe" % V.http4s // Scala (test only) val specs2 = "org.specs2" %% "specs2-core" % V.specs2 % Test