Merge branch 'main' into LIVE-6383-implement-batch-send

.github/workflows/event-consumer.yml

@@ -38,7 +38,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project eventconsumer" "compile" "test" "assembly"
+        run: sbt "project commoneventconsumer" "compile" "test" "project eventconsumer" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp eventconsumer/target/scala-*/eventconsumer.jar .

.github/workflows/fake-breaking-news.yml

@@ -40,7 +40,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project fakebreakingnewslambda" "compile" "test" "assembly"
+        run: sbt "project common" "compile" "test" "project api-models" "compile" "test" "project fakebreakingnewslambda" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp fakebreakingnewslambda/target/scala-*/fakebreakingnewslambda.jar .

.github/workflows/football.yml

@@ -38,7 +38,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project football" "compile" "test" "assembly"
+        run: sbt "project api-models" "compile" "test" "project football" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp football/target/scala-*/football.jar .

.github/workflows/notification-worker-lambdas.yml

@@ -51,7 +51,7 @@ jobs:
           mask-password: 'true'
 
       - name: Compile and test
-        run: sbt "project notificationworkerlambda" "compile" "test"
+        run: sbt "project common" "compile" "test" "project notificationworkerlambda" "compile" "test"
 
       - name: Build docker image
         run: sbt docker:publishLocal

.github/workflows/notification.yml

@@ -40,7 +40,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and package
-        run: sbt "project notification" "compile" "test" "debian:packageBin"
+        run: sbt "project common" "compile" "test" "project commonscheduledynamodb" "compile" "test" "project notification" "compile" "test" "debian:packageBin"
 
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v3

.github/workflows/registration.yml

@@ -55,7 +55,7 @@ jobs:
           npm run synth
 
       - name: Compile, test and package
-        run: sbt "project registration" "compile" "test" "debian:packageBin"
+        run: sbt "project common" "compile" "test" "project registration" "compile" "test" "debian:packageBin"
 
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v3

.github/workflows/report-extractor.yml

@@ -39,7 +39,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project reportextractor" "compile" "test" "assembly"
+        run: sbt "project common" "compile" "test" "project reportextractor" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp reportextractor/target/scala-*/reportextractor.jar .

.github/workflows/report.yml

@@ -40,7 +40,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and package
-        run: sbt "project report" "compile" "test" "debian:packageBin"
+        run: sbt "project common" "compile" "test" "project report" "compile" "test" "debian:packageBin"
 
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v3

.github/workflows/schedule-lambda.yml

@@ -38,7 +38,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project schedule" "compile" "test" "assembly"
+        run: sbt "project commonscheduledynamodb" "compile" "test" "project schedule" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp schedulelambda/target/scala-*/schedule.jar .

.github/workflows/slo-monitor.yml

@@ -45,7 +45,7 @@ jobs:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
       - name: Compile, test and assembly
-        run: sbt "project slomonitor" "compile" "test" "assembly"
+        run: sbt "project commoneventconsumer" "compile" "test" "project slomonitor" "compile" "test" "assembly"
 
       - name: Copy jar to root
         run: cp slomonitor/target/scala-*/slomonitor.jar .

build.sbt

@@ -21,7 +21,7 @@ ThisBuild / scalacOptions ++= compilerOptions
 
 val playJsonVersion = "2.10.3"
 val specsVersion: String = "4.8.3"
-val awsSdkVersion: String = "1.12.672"
+val awsSdkVersion: String = "1.12.677"
 val doobieVersion: String = "0.13.4"
 val catsVersion: String = "2.10.0"
 val okHttpVersion: String = "4.12.0"

notification/conf/notification.yaml

@@ -18,7 +18,7 @@ Mappings:
       NewsstandNotificationAlarmThreshold: 0
       NotificationAlarmPeriod: 1200
       ScheduleApp: schedule
-      InstanceType: "t4g.micro"
+      InstanceType: "t4g.small"
     PROD:
       CPUAlarmPeriodLower: 300
       CPUAlarmPeriodUpper: 60
@@ -30,7 +30,7 @@ Mappings:
       NewsstandNotificationAlarmThreshold: 1
       NotificationAlarmPeriod: 1200
       ScheduleApp: schedule
-      InstanceType: "t4g.micro"
+      InstanceType: "t4g.small"
 
 Outputs:
   LoadBalancerUrl: