Merge pull request #16321 from guardian/aa/tag-rendering-ecs

feat(cdk): Provision ECS infrastructure for tag page rendering CODE

Author: akash1810

.github/workflows/cicd.yml

@@ -4,11 +4,6 @@ on:
   push:
 
 jobs:
-  container:
-    permissions:
-      packages: write
-    uses: ./.github/workflows/container.yml
-
   production-container:
     permissions:
       contents: read
@@ -17,6 +12,14 @@ jobs:
     secrets:
       GU_RIFF_RAFF_ROLE_ARN: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
+  container:
+    permissions:
+      packages: write
+    needs: [production-container]
+    uses: ./.github/workflows/container.yml
+    with:
+      production-image-digest: ${{ needs.production-container.outputs.imageDigest }}
+
   prettier:
     uses: ./.github/workflows/prettier.yml
 

.github/workflows/container.yml

@@ -2,6 +2,11 @@
 # Commercial rely on a container image built from the main branch with the tag 'main'
 on:
   workflow_call:
+    inputs:
+      production-image-digest:
+        description: 'Digest of image pushed to AWS ECR to run on AWS ECS. Gets used by `cdk synth`.'
+        required: true
+        type: string
     outputs:
       container-image:
         description: 'The generated container image path'
@@ -30,6 +35,8 @@ jobs:
           echo 'export const GIT_COMMIT_HASH = "${{ github.sha }}";' > src/server/prout.ts
 
       - name: Generate production bundle
+        env:
+          IMAGE_DIGEST: ${{ inputs.production-image-digest }}
         run: make riffraff-bundle
         working-directory: dotcom-rendering
 

dotcom-rendering/cdk/bin/cdk.ts

@@ -1,5 +1,6 @@
 import { App } from 'aws-cdk-lib';
 import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
+import type { RenderingCDKStackProps } from '../lib/renderingStack';
 import { RenderingCDKStack } from '../lib/renderingStack';
 
 const cdkApp = new App();
@@ -96,13 +97,21 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
 });
 
 /** Tag pages */
-new RenderingCDKStack(cdkApp, 'TagPageRendering-CODE', {
+export const TagPageRenderingPropsCODE: RenderingCDKStackProps = {
 	guApp: 'tag-page-rendering',
 	stage: 'CODE',
 	domainName: 'tag-page-rendering.code.dev-guardianapis.com',
 	scaling: { minimumInstances: 1, maximumInstances: 3 },
 	instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
-});
+	imageIdentifier: process.env.IMAGE_DIGEST ?? 'DEV',
+};
+
+new RenderingCDKStack(
+	cdkApp,
+	'TagPageRendering-CODE',
+	TagPageRenderingPropsCODE,
+);
+
 new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
 	guApp: 'tag-page-rendering',
 	stage: 'PROD',