Production deploy

.env.example

@@ -98,5 +98,8 @@ UNIFORM_CLIENT_AYLESBURY_VALE=👻
 UNIFORM_CLIENT_CHILTERN=👻
 UNIFORM_CLIENT_WYCOMBE=👻
 
+## Forthcoming Idox Nexus integration
+IDOX_NEXUS_CLIENT=👻
+
 ## End-to-end test team (borrows Lambeth's details)
 GOV_UK_PAY_SECRET_E2E=👻

.github/dependabot.yml

@@ -24,7 +24,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   # Hasura
   - package-ecosystem: "npm"
@@ -38,7 +38,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   - package-ecosystem: "docker"
     directory: "/hasura.planx.uk"
@@ -76,7 +76,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   # ShareDB
   - package-ecosystem: "npm"
@@ -90,7 +90,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   - package-ecosystem: "docker"
     directory: "/sharedb.planx.uk"
@@ -115,7 +115,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   - package-ecosystem: "docker"
     directory: "/api.planx.uk"
@@ -142,7 +142,7 @@ updates:
       - "theopensystemslab/planx"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
 
   # Infrastructure
   # - package-ecosystem: "npm"

.github/workflows/pizza-teardown.yml

@@ -17,7 +17,7 @@ jobs:
           action: destroy
           api_key: ${{ secrets.VULTR_API_KEY }}
           domain: ${{ env.DOMAIN }}
-          os_type: ubuntu
+          os_type: alpine
           plan: vc2-1c-1gb
           pull_request_id: ${{ env.PULLREQUEST_ID }}
           region: lhr

.github/workflows/pull-request.yml

@@ -307,7 +307,7 @@ jobs:
           action: create
           api_key: ${{ secrets.VULTR_API_KEY }}
           domain: ${{ env.DOMAIN }}
-          os_type: ubuntu
+          os_type: alpine
           plan: vc2-1c-1gb
           pull_request_id: ${{ env.PULLREQUEST_ID }}
           region: lhr
@@ -324,13 +324,19 @@ jobs:
           password: ${{ steps.create.outputs.default_password }}
           command_timeout: 20m
           script: |
-            apt-get update -y
-
+            apk update
+            apk add docker
+            addgroup root docker
+            rc-update add docker default
+            service docker start
+            apk add docker-cli-compose
+
+            apk add git
             git clone "${{ secrets.AUTHENTICATED_REPO_URL }}"
             cd planx-new
             git fetch origin "pull/${{ env.PULLREQUEST_ID }}/head" && git checkout FETCH_HEAD
 
-            apt-get install awscli -y
+            apk add aws-cli
             export AWS_ACCESS_KEY_ID=${{ secrets.PIZZA_AWS_ACCESS_KEY_ID }}
             export AWS_SECRET_ACCESS_KEY=${{ secrets.PIZZA_AWS_SECRET_ACCESS_KEY }}
             export AWS_REGION=eu-west-2
@@ -352,15 +358,21 @@ jobs:
           username: root
           password: ${{ secrets.SSH_PASSWORD }}
           command_timeout: 10m
+          # TODO: some of below script might be superfluous for server update (rather than create)
           script: |
-            apt-get update -y
+            apk update
+            apk add docker
+            addgroup root docker
+            rc-update add docker default
+            service docker start
+            apk add docker-cli-compose
 
             git clone "${{ secrets.AUTHENTICATED_REPO_URL }}"
             cd planx-new
             git add . && git stash
             git fetch origin "pull/${{ env.PULLREQUEST_ID }}/head" && git checkout FETCH_HEAD
 
-            apt-get install awscli -y
+            apk add aws-cli
             export AWS_ACCESS_KEY_ID=${{ secrets.PIZZA_AWS_ACCESS_KEY_ID }}
             export AWS_SECRET_ACCESS_KEY=${{ secrets.PIZZA_AWS_SECRET_ACCESS_KEY }}
             export AWS_REGION=eu-west-2

.gitignore

@@ -24,6 +24,7 @@ api.planx.uk/tmp/
 # Ignore certificate files
 **/*.chain
 **/*.cert
+**/*.crt
 **/*.key
 **/*.pfx
 **/*.pkcs12

api.planx.uk/lib/hasura/metadata/index.ts

@@ -12,6 +12,7 @@ interface ScheduledEvent {
 export interface CombinedResponse {
   bops?: ScheduledEventResponse;
   uniform?: ScheduledEventResponse;
+  idox?: ScheduledEventResponse;
   email?: ScheduledEventResponse;
   s3?: ScheduledEventResponse;
 }

api.planx.uk/modules/admin/session/digitalPlanningData.ts

@@ -40,7 +40,7 @@ export const getDigitalPlanningApplicationPayload = async (
     return res.send(data);
   } catch (error) {
     return next({
-      message: `Failed to make Digital Planning Application payload: ${error}`,
+      message: `Failed to make Digital Planning Application payload: ${error}. Stack: ${(error as Error).stack}`,
     });
   }
 };

api.planx.uk/modules/send/createSendEvents/controller.ts

@@ -10,7 +10,7 @@ const createSendEvents: CreateSendEventsController = async (
   res,
   next,
 ) => {
-  const { email, uniform, bops, s3 } = res.locals.parsedReq.body;
+  const { email, uniform, bops, s3, idox } = res.locals.parsedReq.body;
   const { sessionId } = res.locals.parsedReq.params;
 
   try {
@@ -47,6 +47,16 @@ const createSendEvents: CreateSendEventsController = async (
       combinedResponse["uniform"] = uniformEvent;
     }
 
+    if (idox) {
+      const idoxEvent = await createScheduledEvent({
+        webhook: `{{HASURA_PLANX_API_URL}}/idox/${idox.localAuthority}`,
+        schedule_at: new Date(now.getTime() + 60 * 1000),
+        payload: idox.body,
+        comment: `idox_nexus_submission_${sessionId}`,
+      });
+      combinedResponse["idox"] = idoxEvent;
+    }
+
     if (s3) {
       const s3Event = await createScheduledEvent({
         webhook: `{{HASURA_PLANX_API_URL}}/upload-submission/${s3.localAuthority}`,

api.planx.uk/modules/send/createSendEvents/types.ts

@@ -15,6 +15,7 @@ export const combinedEventsPayloadSchema = z.object({
     bops: eventSchema.optional(),
     uniform: eventSchema.optional(),
     s3: eventSchema.optional(),
+    idox: eventSchema.optional(),
   }),
   params: z.object({
     sessionId: z.string().uuid(),

api.planx.uk/modules/send/idox/nexus.test.ts

@@ -0,0 +1,24 @@
+import supertest from "supertest";
+import app from "../../../server";
+
+describe(`sending an application to Idox Nexus`, () => {
+  it("fails without authorization header", async () => {
+    await supertest(app)
+      .post("/idox/southwark")
+      .send({ payload: { sessionId: "123" } })
+      .expect(401);
+  });
+
+  it("errors if the payload body does not include a sessionId", async () => {
+    await supertest(app)
+      .post("/idox/southwark")
+      .set({ Authorization: process.env.HASURA_PLANX_API_KEY! })
+      .send({ payload: { somethingElse: "123" } })
+      .expect(400)
+      .then((res) => {
+        expect(res.body).toEqual({
+          error: "Missing application data to send to Idox Nexus",
+        });
+      });
+  });
+});