Skip to content

Commit

Permalink
Akka cleanup! ( +rabbitmq)
Browse files Browse the repository at this point in the history
  • Loading branch information
pondzix committed Nov 2, 2023
1 parent 4f6ace1 commit 7e9ef51
Show file tree
Hide file tree
Showing 40 changed files with 5 additions and 4,517 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
sbt 'project pubsub' assembly
sbt 'project sqs' assembly
sbt 'project stdout' assembly
sbt 'project rabbitmq' assembly
- name: Get current version
id: ver
run: |
Expand All @@ -43,7 +42,6 @@ jobs:
pubsub/target/scala-2.12/snowplow-stream-collector-google-pubsub-${{ steps.ver.outputs.project_version }}.jar
sqs/target/scala-2.12/snowplow-stream-collector-sqs-${{ steps.ver.outputs.project_version }}.jar
stdout/target/scala-2.12/snowplow-stream-collector-stdout-${{ steps.ver.outputs.project_version }}.jar
rabbitmq/target/scala-2.12/snowplow-stream-collector-stdout-${{ steps.ver.outputs.project_version }}.jar
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -58,11 +56,8 @@ jobs:
- kafka
- nsq
- stdout
- rabbitmq
include:
- suffix: ""
- suffix: -experimental
platform: rabbitmq
- platform: kinesis
run_snyk: ${{ !contains(github.ref, 'rc') }}
- platform: pubsub
Expand Down
55 changes: 2 additions & 53 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,6 @@
import com.typesafe.sbt.packager.docker._
import sbtbuildinfo.BuildInfoPlugin.autoImport._

lazy val commonDependencies = Seq(
// Java
Dependencies.Libraries.thrift,
Dependencies.Libraries.jodaTime,
Dependencies.Libraries.slf4j,
Dependencies.Libraries.log4jOverSlf4j,
Dependencies.Libraries.config,
// Scala
Dependencies.Libraries.scopt,
Dependencies.Libraries.akkaStream,
Dependencies.Libraries.akkaHttp,
Dependencies.Libraries.akkaStream,
Dependencies.Libraries.akkaSlf4j,
Dependencies.Libraries.akkaHttpMetrics,
Dependencies.Libraries.jnrUnixsocket,
Dependencies.Libraries.badRows,
Dependencies.Libraries.collectorPayload,
Dependencies.Libraries.pureconfig,
Dependencies.Libraries.Legacy.trackerCore,
Dependencies.Libraries.Legacy.trackerEmitterId,
// Unit tests
Dependencies.Libraries.akkaTestkit,
Dependencies.Libraries.akkaHttpTestkit,
Dependencies.Libraries.akkaStreamTestkit,
Dependencies.Libraries.specs2,
// Integration tests
Dependencies.Libraries.Legacy.testcontainers,
Dependencies.Libraries.Legacy.http4sClient,
Dependencies.Libraries.Legacy.catsRetry
)

lazy val commonExclusions = Seq(
"org.apache.tomcat.embed" % "tomcat-embed-core", // exclude for security vulnerabilities introduced by libthrift
// Avoid duplicate .proto files brought in by akka and google-cloud-pubsub.
Expand Down Expand Up @@ -109,15 +78,7 @@ lazy val allSettings = buildSettings ++
lazy val root = project
.in(file("."))
.settings(buildSettings ++ dynVerSettings)
.aggregate(core, kinesis, pubsub, kafka, nsq, stdout, sqs, rabbitmq, http4s)

lazy val core = project
.settings(moduleName := "snowplow-stream-collector-core")
.settings(buildSettings ++ BuildSettings.sbtAssemblySettings)
.settings(libraryDependencies ++= commonDependencies)
.settings(excludeDependencies ++= commonExclusions)
.settings(Defaults.itSettings)
.configs(IntegrationTest)
.aggregate(kinesis, pubsub, kafka, nsq, stdout, sqs, http4s)

lazy val http4s = project
.settings(moduleName := "snowplow-stream-collector-http4s-core")
Expand Down Expand Up @@ -320,16 +281,4 @@ lazy val rabbitmqSettings =
moduleName := "snowplow-stream-collector-rabbitmq",
Docker / packageName := "scala-stream-collector-rabbitmq-experimental",
libraryDependencies ++= Seq(Dependencies.Libraries.rabbitMQ)
)

lazy val rabbitmq = project
.settings(rabbitmqSettings)
.enablePlugins(JavaAppPackaging, SnowplowDockerPlugin, BuildInfoPlugin)
.dependsOn(core % "test->test;compile->compile")

lazy val rabbitmqDistroless = project
.in(file("distroless/rabbitmq"))
.settings(sourceDirectory := (rabbitmq / sourceDirectory).value)
.settings(rabbitmqSettings)
.enablePlugins(JavaAppPackaging, SnowplowDistrolessDockerPlugin, BuildInfoPlugin)
.dependsOn(core % "test->test;compile->compile")
)

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7e9ef51

Please sign in to comment.