Merge branch 'main' into gl/sc-tag-page-mockup

Author: Georges-GNM

.github/workflows/ab-testing-ci.yml

@@ -73,7 +73,7 @@ jobs:
           path: ab-testing/frontend/output/ab-tests.html
           if-no-files-found: error
 
-  lambda-ci:
+  deploy-lambda-ci:
     name: Lambda CI
     runs-on: ubuntu-latest
     defaults:
@@ -99,13 +99,42 @@ jobs:
       - name: Save build
         uses: actions/upload-artifact@v5
         with:
-          name: ab-testing-lambda-build
+          name: ab-testing-deploy-lambda-build
           path: ab-testing/deploy-lambda/dist/lambda.zip
 
+  notification-lambda-ci:
+    name: Notification Lambda CI
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ab-testing/notification-lambda
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Node environment
+        uses: ./.github/actions/setup-node-env
+
+      - name: Build Lambda
+        run: pnpm build
+
+      - name: Zip app artifact
+        run: |
+          cd dist
+          zip -r lambda.zip .
+          zip -j lambda.zip ../package.json
+
+      - name: Save build
+        uses: actions/upload-artifact@v5
+        with:
+          name: ab-testing-notification-lambda-build
+          path: ab-testing/notification-lambda/dist/lambda.zip
+
   riff-raff:
     name: Riff-Raff Artifacts
     runs-on: ubuntu-latest
-    needs: [config-ci, ui-ci, lambda-ci]
+    needs: [config-ci, ui-ci, deploy-lambda-ci, notification-lambda-ci]
     permissions:
       id-token: write
       contents: read
@@ -136,12 +165,18 @@ jobs:
           name: ui-build
           path: ab-testing/frontend/output/ab-tests.html
 
-      - name: Fetch Lambda build
+      - name: Fetch Deploy Lambda build
         uses: actions/[email protected]
         with:
-          name: ab-testing-lambda-build
+          name: ab-testing-deploy-lambda-build
           path: ab-testing/deploy-lambda/dist/lambda.zip
 
+      - name: Fetch Notification Lambda build
+        uses: actions/[email protected]
+        with:
+          name: ab-testing-notification-lambda-build
+          path: ab-testing/notification-lambda/dist/lambda.zip
+
       - name: CDK Test
         run: pnpm --filter @guardian/ab-testing-cdk test
 
@@ -160,6 +195,8 @@ jobs:
               - ab-testing/config/dist
             ab-testing-deployment-lambda:
               - ab-testing/deploy-lambda/dist/lambda.zip
+            ab-testing-notification-lambda:
+              - ab-testing/notification-lambda/dist/lambda.zip
             ab-testing-ui-artifact:
               - ab-testing/frontend/output/ab-tests.html
             cdk.out:

ab-testing/cdk/bin/cdk.ts

@@ -2,6 +2,7 @@ import "source-map-support/register.js";
 import { App } from "aws-cdk-lib";
 import { AbTestingConfig } from "../lib/abTestingConfig.ts";
 import { AbTestingDeploymentLambda } from "../lib/deploymentLambda.ts";
+import { AbTestingNotificationLambda } from "../lib/notificationLambda.ts";
 import { riffRaffYamlFile } from "../lib/riffRaffYamlFile.ts";
 
 const app = new App();
@@ -41,6 +42,22 @@ new AbTestingConfig(app, "AbTestingConfigProd", {
 	},
 });
 
+new AbTestingNotificationLambda(app, "AbTestingNotificationLambdaCode", {
+	stack,
+	stage: "CODE",
+	env: {
+		region,
+	},
+});
+
+new AbTestingNotificationLambda(app, "AbTestingNotificationLambdaProd", {
+	stack,
+	stage: "PROD",
+	env: {
+		region,
+	},
+});
+
 const riffRaff = riffRaffYamlFile({ app, stack, region });
 
 riffRaff.synth();

ab-testing/cdk/lib/__snapshots__/abTestingConfig.test.ts.snap

@@ -4,6 +4,12 @@ exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
     "gu:cdk:constructs": [],
     "gu:cdk:version": "62.0.1"
   },
+  "Parameters": {
+    "BuildId": {
+      "Type": "String",
+      "Description": "The riff-raff build id, automatically generated and provided by riff-raff"
+    }
+  },
   "Resources": {
     "InvokeDictionaryDeployLambda": {
       "Type": "Custom::FastlyEdgeDictionaryDeploy",
@@ -24,7 +30,10 @@ exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
             ]
           ]
         },
-        "ServiceTimeout": "300"
+        "ServiceTimeout": "300",
+        "BuildId": {
+          "Ref": "BuildId"
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete"
@@ -39,6 +48,12 @@ exports[`The ID5 Baton Lambda stack > matches the PROD snapshot 1`] = `
     "gu:cdk:constructs": [],
     "gu:cdk:version": "62.0.1"
   },
+  "Parameters": {
+    "BuildId": {
+      "Type": "String",
+      "Description": "The riff-raff build id, automatically generated and provided by riff-raff"
+    }
+  },
   "Resources": {
     "InvokeDictionaryDeployLambda": {
       "Type": "Custom::FastlyEdgeDictionaryDeploy",
@@ -59,7 +74,10 @@ exports[`The ID5 Baton Lambda stack > matches the PROD snapshot 1`] = `
             ]
           ]
         },
-        "ServiceTimeout": "300"
+        "ServiceTimeout": "300",
+        "BuildId": {
+          "Ref": "BuildId"
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete"

ab-testing/cdk/lib/__snapshots__/deploymentLambda.test.ts.snap

@@ -1,4 +1,4 @@
-exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
+exports[`The AB testing deployment lambda stack > matches the CODE snapshot 1`] = `
 {
   "Metadata": {
     "gu:cdk:constructs": [
@@ -320,7 +320,7 @@ exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
 }
 `;
 
-exports[`The ID5 Baton Lambda stack > matches the PROD snapshot 1`] = `
+exports[`The AB testing deployment lambda stack > matches the PROD snapshot 1`] = `
 {
   "Metadata": {
     "gu:cdk:constructs": [