Merge pull request #1647 from guardian/aa/report-deployment

feat(report): Use new deployment mechanism

Author: akash1810

.github/workflows/report.yml

@@ -30,6 +30,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      # Seed the build number with last number from TeamCity.
+      # Set the value early, rather than `buildNumberOffset` in guardian/actions-riff-raff, to ensure each usage has the same number.
+      - name: Set BUILD_NUMBER environment variable
+        run: |
+          LAST_TEAMCITY_BUILD=4147
+          echo "BUILD_NUMBER=$(( $GITHUB_RUN_NUMBER + $LAST_TEAMCITY_BUILD ))" >> $GITHUB_ENV
+
       - uses: actions/checkout@v6.0.2
 
       - name: Setup JDK and sbt
@@ -56,16 +63,21 @@ jobs:
         run: sbt "project report" "compile" "test" "debian:packageBin"
 
       - name: Build project reportextractor
-        run: |
-          sbt "project reportextractor" "compile" "test" "assembly"
-          echo "Copying reportextractor jar to root directory"
-          cp reportextractor/target/scala-*/reportextractor.jar .
+        run: sbt "project reportextractor" "compile" "test" "assembly"
 
       - name: Build project eventconsumer
+        run: sbt "project commoneventconsumer" "compile" "test" "project eventconsumer" "compile" "test" "assembly"
+
+      - name: Move artifacts for easier discovery
         run: |
-          sbt "project commoneventconsumer" "compile" "test" "project eventconsumer" "compile" "test" "assembly"
-          echo "Copying eventconsumer jar to root directory"
-          cp eventconsumer/target/scala-*/eventconsumer.jar .
+          mkdir -p dist/report
+          mv report/target/report_1.0-latest_all.deb dist/report/report-$BUILD_NUMBER.deb
+          
+          mkdir -p dist/reportextractor
+          mv reportextractor/target/scala-*/reportextractor.jar dist/reportextractor/reportextractor.jar
+          
+          mkdir -p dist/eventconsumer
+          mv eventconsumer/target/scala-*/eventconsumer.jar dist/eventconsumer/eventconsumer.jar
 
       - name: Test Report
         uses: dorny/test-reporter@v2
@@ -83,15 +95,15 @@ jobs:
           roleArn: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           projectName: mobile-n10n:report
-          buildNumberOffset: 4147
+          buildNumber: ${{ env.BUILD_NUMBER }}
           configPath: report/conf/riff-raff.yaml
           contentDirectories: |
             report:
-              - report/target/report_1.0-latest_all.deb
+              - dist/report
             report-cfn:
               - cdk/cdk.out/Report-CODE.template.json
               - cdk/cdk.out/Report-PROD.template.json
             reportextractor:
-              - reportextractor.jar
+              - dist/reportextractor
             eventconsumer:
-              - eventconsumer.jar
+              - dist/eventconsumer

cdk/bin/cdk.ts

@@ -102,6 +102,7 @@ export const reportPropsCode: ReportProps = {
 	domainName: 'report.notifications.code.dev-guardianapis.com',
 	instanceMetricGranularity: '5Minute',
 	minAsgSize: 1,
+	buildIdentifier: process.env.BUILD_NUMBER ?? 'DEV',
 };
 new Report(app, 'Report-CODE', reportPropsCode);
 
@@ -114,5 +115,6 @@ export const reportPropsProd: ReportProps = {
 	domainName: 'report.notifications.guardianapis.com',
 	instanceMetricGranularity: '1Minute',
 	minAsgSize: 3,
+	buildIdentifier: process.env.BUILD_NUMBER ?? 'DEV',
 };
 new Report(app, 'Report-PROD', reportPropsProd);