import cfn yaml into cdk

.github/workflows/ci.yaml

@@ -49,11 +49,9 @@ jobs:
           buildNumberOffset: 2740
           configPath: riff-raff.yaml
           contentDirectories: |
-            mobile-purchases-feast-cloudformation:
+            mobile-purchases-cloudformation:
               - cdk/cdk.out/MobilePurchasesFeast-CODE.template.json
               - cdk/cdk.out/MobilePurchasesFeast-PROD.template.json
-            mobile-purchases-cloudformation:
-              - cloudformation.yaml
             mobile-purchases-dynamo-cloudformation:
               - dynamo.cloudformation.yaml
             mobile-purchases-exports-cloudformation:

cdk/bin/cdk.ts

@@ -1,7 +1,7 @@
 import "source-map-support/register";
 import { GuRoot } from "@guardian/cdk/lib/constructs/root";
-import { MobilePurchasesFeast } from "../lib/mobile-purchases-feast";
+import { MobilePurchases } from "../lib/mobile-purchases";
 
 const app = new GuRoot();
-new MobilePurchasesFeast(app, "MobilePurchasesFeast-CODE", { stack: "mobile", stage: "CODE", env: { region: "eu-west-1" } });
-new MobilePurchasesFeast(app, "MobilePurchasesFeast-PROD", { stack: "mobile", stage: "PROD", env: { region: "eu-west-1" } });
+new MobilePurchases(app, "MobilePurchases-CODE", { stack: "mobile", stage: "CODE", env: { region: "eu-west-1" } });
+new MobilePurchases(app, "MobilePurchases-PROD", { stack: "mobile", stage: "PROD", env: { region: "eu-west-1" } });

cdk/lib/mobile-purchases-feast.test.ts → cdk/lib/mobile-purchases.test.ts

@@ -1,11 +1,11 @@
 import { App } from "aws-cdk-lib";
 import { Template } from "aws-cdk-lib/assertions";
-import { MobilePurchasesFeast } from "./mobile-purchases-feast";
+import { MobilePurchases } from "./mobile-purchases";
 
-describe("The MobilePurchasesFeast stack", () => {
+describe("The MobilePurchases stack", () => {
   it("matches the snapshot", () => {
     const app = new App();
-    const stack = new MobilePurchasesFeast(app, "MobilePurchasesFeast", { stack: "mobile", stage: "TEST" });
+    const stack = new MobilePurchases(app, "MobilePurchases", { stack: "mobile", stage: "TEST" });
     const template = Template.fromStack(stack);
     expect(template.toJSON()).toMatchSnapshot();
   });

cdk/lib/mobile-purchases.ts

@@ -0,0 +1,17 @@
+import type { GuStackProps } from "@guardian/cdk/lib/constructs/core";
+import { GuStack } from "@guardian/cdk/lib/constructs/core";
+import type { App } from "aws-cdk-lib";
+import path from "path";
+import {CfnInclude} from "aws-cdk-lib/cloudformation-include";
+
+export class MobilePurchases extends GuStack {
+  constructor(scope: App, id: string, props: GuStackProps) {
+    super(scope, id, props);
+
+    // ---- Existing CFN template ---- //
+    const yamlTemplateFilePath = path.join(__dirname, "../..", "cloudformation.yaml");
+    new CfnInclude(this, "YamlTemplate", {
+      templateFile: yamlTemplateFilePath,
+    });
+  }
+}

riff-raff.yaml

@@ -10,17 +10,12 @@ templates:
       prefixStack: false
 
 deployments:
-  mobile-purchases-feast-cloudformation:
-    type: cloud-formation
-    parameters:
-      templateStagePaths:
-        CODE: MobilePurchasesFeast-CODE.template.json
-        PROD: MobilePurchasesFeast-PROD.template.json
-
   mobile-purchases-cloudformation:
     type: cloud-formation
     parameters:
-      templatePath: cloudformation.yaml
+      templateStagePaths:
+        CODE: MobilePurchases-CODE.template.json
+        PROD: MobilePurchases-PROD.template.json
 
   mobile-purchases-dynamo-cloudformation:
     type: cloud-formation