Move event bus pusher to its own common module

Author: marjisound

build.sbt

@@ -99,7 +99,6 @@ lazy val commontest = project
 
 lazy val common = project
   .dependsOn(commoneventconsumer)
-  .dependsOn(apiModels  % "test->test", apiModels  % "compile->compile")
   .settings(LocalDynamoDBCommon.settings)
   .settings(standardSettings: _*)
   .settings(
@@ -124,8 +123,7 @@ lazy val common = project
       "org.postgresql" % "postgresql" % "42.7.10",
       "ch.qos.logback" % "logback-core" % logbackVersion,
       "ch.qos.logback" % "logback-classic" % logbackVersion,
-      "net.logstash.logback" % "logstash-logback-encoder" % "8.1",
-      "software.amazon.awssdk" % "eventbridge" % "2.20.162",
+      "net.logstash.logback" % "logstash-logback-encoder" % "8.1"
     ),
     fork := true,
     startDynamoDBLocal := startDynamoDBLocal.dependsOn(Test / compile).value,
@@ -248,35 +246,43 @@ lazy val apiModels = {
   ))
 }
 
-def lambda(projectName: String, directoryName: String, mainClassName: Option[String] = None): Project =
-  Project(projectName, file(directoryName))
-  .enablePlugins(AssemblyPlugin)
-  .settings(
-    organization := "com.gu",
-    resolvers ++= Seq(
-      "Guardian GitHub Releases" at "https://guardian.github.com/maven/repo-releases",
-      "snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
-    ),
+lazy val commonEventBusPusher = project
+  .dependsOn(apiModels  % "test->test", apiModels  % "compile->compile")
+  .settings(Seq(
     libraryDependencies ++= Seq(
-      "com.amazonaws" % "aws-lambda-java-core" % "1.4.0",
-      "org.slf4j" % "slf4j-api" % slf4jVersion,
-      "com.gu" %% "simple-configuration-core" % simpleConfigurationVersion,
-      "com.gu" %% "simple-configuration-ssm" % simpleConfigurationVersion,
-      "ch.qos.logback" % "logback-classic" % logbackVersion,
-      "net.logstash.logback" % "logstash-logback-encoder" % "8.1",
-      specs2 % Test
+      "software.amazon.awssdk" % "eventbridge" % "2.20.162"
     ),
-    assemblyJarName := s"$projectName.jar",
-    assembly / assemblyMergeStrategy := {
-      case "META-INF/MANIFEST.MF" => MergeStrategy.discard
-      case _ => MergeStrategy.first
-    },
-    Test / run / fork := true,
-    scalacOptions := compilerOptions,
-    mainClass := mainClassName,
-    // Workaround Mockito causes deadlock on SBT classloaders: https://github.com/sbt/sbt/issues/3022
-    Test / parallelExecution := false
-  )
+  ))
+
+def lambda(projectName: String, directoryName: String, mainClassName: Option[String] = None): Project =
+  Project(projectName, file(directoryName))
+    .enablePlugins(AssemblyPlugin)
+    .settings(
+      organization := "com.gu",
+      resolvers ++= Seq(
+        "Guardian GitHub Releases" at "https://guardian.github.com/maven/repo-releases",
+        "snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
+      ),
+      libraryDependencies ++= Seq(
+        "com.amazonaws" % "aws-lambda-java-core" % "1.4.0",
+        "org.slf4j" % "slf4j-api" % slf4jVersion,
+        "com.gu" %% "simple-configuration-core" % simpleConfigurationVersion,
+        "com.gu" %% "simple-configuration-ssm" % simpleConfigurationVersion,
+        "ch.qos.logback" % "logback-classic" % logbackVersion,
+        "net.logstash.logback" % "logstash-logback-encoder" % "8.1",
+        specs2 % Test
+      ),
+      assemblyJarName := s"$projectName.jar",
+      assembly / assemblyMergeStrategy := {
+        case "META-INF/MANIFEST.MF" => MergeStrategy.discard
+        case _ => MergeStrategy.first
+      },
+      Test / run / fork := true,
+      scalacOptions := compilerOptions,
+      mainClass := mainClassName,
+      // Workaround Mockito causes deadlock on SBT classloaders: https://github.com/sbt/sbt/issues/3022
+      Test / parallelExecution := false
+    )
 
 lazy val schedulelambda = lambda("schedule", "schedulelambda")
   .dependsOn(commonscheduledynamodb)
@@ -304,7 +310,7 @@ lazy val schedulelambda = lambda("schedule", "schedulelambda")
   }
 
 lazy val football = lambda("football", "football")
-  .dependsOn(common)
+  .dependsOn(commonEventBusPusher)
   .settings(
     resolvers += "Guardian GitHub Releases" at "https://guardian.github.com/maven/repo-releases",
     libraryDependencies ++= Seq(
@@ -433,10 +439,11 @@ lazy val notificationworkerlambda = lambda("notificationworkerlambda", "notifica
       // Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
       ExclusionRule(organization = "com.typesafe.play")
     ),
-)
+  )
 
 lazy val fakebreakingnewslambda = lambda("fakebreakingnewslambda", "fakebreakingnewslambda", Some("fakebreakingnews.LocalRun"))
   .dependsOn(common)
+  .dependsOn(apiModels  % "test->test", apiModels  % "compile->compile")
   .settings(
     libraryDependencies ++= Seq(
       "com.squareup.okhttp3" % "okhttp" % okHttpVersion,
@@ -462,12 +469,14 @@ lazy val reportExtractor = lambda("reportextractor", "reportextractor", Some("co
 
 lazy val liveactivities = lambda("liveactivities", "liveactivities", Some("com.gu.liveactivities.LambdaLocalRun"))
   .dependsOn(common)
+  .dependsOn(commonEventBusPusher)
   .settings(LocalDynamoDBLiveActivities.settings)
   .settings(
     libraryDependencies ++= Seq(
       "com.turo" % "pushy" % "0.13.10",
       "com.squareup.okhttp3" % "okhttp" % okHttpVersion,
       "software.amazon.awssdk" % "dynamodb" % awsSdk2Version,
+      "software.amazon.awssdk" % "eventbridge" % "2.20.162",
       "org.scanamo" %% "scanamo" % "6.0.0",
       "org.scanamo" %% "scanamo-testkit" % "6.0.0" % "test"
     ),

…/main/scala/aws/LiveActivityPusher.scala …tions/event/bus/LiveActivityPusher.scalacommon/src/main/scala/aws/LiveActivityPusher.scala renamed to commonEventBusPusher/src/main/scala/com/gu/notifications/event/bus/LiveActivityPusher.scala common/src/main/scala/aws/LiveActivityPusher.scala renamed to commonEventBusPusher/src/main/scala/com/gu/notifications/event/bus/LiveActivityPusher.scala

@@ -1,4 +1,4 @@
-package aws
+package com.gu.notifications.event.bus
 
 import com.gu.mobile.notifications.client.models.liveActitivites._
 import org.slf4j.Logger

football/src/main/scala/com/gu/mobile/notifications/football/Lambda.scala

@@ -1,8 +1,6 @@
 package com.gu.mobile.notifications.football
 
-import aws.LiveActivityPusher
-
-import java.net.{URI, URL}
+import java.net.URI
 import java.time.ZonedDateTime
 import java.util.concurrent.TimeUnit
 import com.amazonaws.regions.Regions
@@ -20,6 +18,7 @@ import scala.util.Failure
 import com.gu.mobile.notifications.client.models.NotificationPayload
 import com.gu.mobile.notifications.client.models.liveActitivites.LiveActivityPayload
 import com.gu.mobile.notifications.football.models.MatchDataWithArticle
+import com.gu.notifications.event.bus.LiveActivityPusher
 
 import scala.concurrent.Future
 import org.scanamo.generic.auto._

liveactivities/src/main/scala/com/gu/liveactivities/Lambda.scala

@@ -1,8 +1,8 @@
 package com.gu.liveactivities
 
-import aws.LiveActivityPusher
 import com.gu.liveactivities.service.{Authentication, LiveActivityChannelRepository}
 import com.gu.liveactivities.util.{Configuration, IosConfiguration, Logging}
+import com.gu.notifications.event.bus.LiveActivityPusher
 import software.amazon.awssdk.auth.credentials.{AwsCredentialsProviderChain, DefaultCredentialsProvider, ProfileCredentialsProvider}
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
 import software.amazon.awssdk.regions.Region