more riff-raff tweaks

Author: Jakeii

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

@@ -72,11 +72,17 @@ jobs:
       - 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-lambda-build
-          path: ab-testing/dictionary-deploy-lambda/dist
+          path: ab-testing/dictionary-deploy-lambda/dist/lambda.zip
 
   ui-ci:
     name: UI CI
@@ -139,7 +145,7 @@ jobs:
         uses: actions/download-artifact@v6.0.0
         with:
           name: ab-testing-lambda-build
-          path: ab-testing/dictionary-deploy-lambda/dist
+          path: ab-testing/dictionary-deploy-lambda/dist/lambda.zip
 
       - name: CDK Test
         run: pnpm cdk:test
@@ -155,11 +161,11 @@ jobs:
           projectName: dotcom:ab-testing
           configPath: ab-testing/cdk.out/riff-raff.yaml
           contentDirectories: |
-            ab-testing:
+            ab-testing-config-artifacts:
               - ab-testing/dist
-            ab-testing-dictionary-deploy-lambda:
-              - ab-testing/dictionary-deploy-lambda/dist
-            admin/ab-testing:
+            ab-testing-deploy:
+              - ab-testing/dictionary-deploy-lambda/dist/lambda.zip
+            ab-testing-ui-artifact:
               - ab-testing/frontend/output/ab-tests.html
             cdk.out:
               - ab-testing/cdk.out

ab-testing/cdk/bin/cdk.ts

@@ -30,11 +30,9 @@ const {
 	riffRaffYaml: { deployments },
 } = riffRaff;
 
-const abTestingArtifactDeployment = "ab-testing-dictionary-artifact";
-
-deployments.set(abTestingArtifactDeployment, {
-	app: abTestingArtifactDeployment,
-	contentDirectory: "dictionary-deploy-lambda/artifacts",
+deployments.set("config/ab-testing", {
+	app: "ab-testing-config-artifact",
+	contentDirectory: "ab-testing-config-artifacts",
 	type: "aws-s3",
 	regions: new Set(["eu-west-1"]),
 	stacks: new Set(["frontend"]),
@@ -46,9 +44,9 @@ deployments.set(abTestingArtifactDeployment, {
 	},
 });
 
-deployments.set("ab-testing-ui-artifact", {
+deployments.set("admin/ab-testing", {
 	app: "ab-testing-ui-artifact",
-	contentDirectory: "admin/ab-testing",
+	contentDirectory: "ab-testing-ui-artifact",
 	type: "aws-s3",
 	regions: new Set(["eu-west-1"]),
 	stacks: new Set(["frontend"]),
@@ -60,8 +58,9 @@ deployments.set("ab-testing-ui-artifact", {
 	},
 });
 
+// We need the test artifacts in place before deploying the lambda that uses them
 deployments
-	.get(`lambda-update-eu-west-1-frontend-${appName}`)
-	?.dependencies?.push(abTestingArtifactDeployment);
+	.get(`cfn-eu-west-1-frontend-dictionary-deploy-lambda`)
+	?.dependencies?.push("config/ab-testing");
 
 riffRaff.synth();

ab-testing/dictionary-deploy-lambda/src/deploy.ts

@@ -4,7 +4,7 @@ import { fetchDictionaryArtifact } from "./fetch-artifact.ts";
 const ARTIFACT_BUCKET_NAME = process.env.ARTIFACT_BUCKET_NAME ?? "";
 const STAGE = process.env.STAGE ?? "CODE";
 
-const CONFIG_PREFIX = `/${STAGE}/config/ab-tests`;
+const CONFIG_PREFIX = `/${STAGE}/config/ab-testing`;
 
 type ServiceInfo = {
 	activeVersion: { number: number };