Release/0.55.0

CHANGELOG.md

@@ -4,16 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.55.0](https://github.com/isomerpages/isomercms-backend/compare/v0.54.0...v0.55.0)
+
+- fix(siteCreate): add redirect rules [`#1036`](https://github.com/isomerpages/isomercms-backend/pull/1036)
+- chore: remove extra and unused submodules [`#1031`](https://github.com/isomerpages/isomercms-backend/pull/1031)
+- release/0.54.0 [`#1033`](https://github.com/isomerpages/isomercms-backend/pull/1033)
+
 #### [v0.54.0](https://github.com/isomerpages/isomercms-backend/compare/v0.53.0...v0.54.0)
 
+> 14 November 2023
+
 - fix: use cTimeMs instead of birthtime due to EFS [`#1035`](https://github.com/isomerpages/isomercms-backend/pull/1035)
 - fix(pagination): total length [`#1032`](https://github.com/isomerpages/isomercms-backend/pull/1032)
 - fix(staging-lite): apps were created for wrong br [`#1014`](https://github.com/isomerpages/isomercms-backend/pull/1014)
 - fix(cm): extra timeout [`#1027`](https://github.com/isomerpages/isomercms-backend/pull/1027)
 - fix(pagination): images fix pagination [`#1026`](https://github.com/isomerpages/isomercms-backend/pull/1026)
 - fix(media): change media sorting to addedTime descending [`#1019`](https://github.com/isomerpages/isomercms-backend/pull/1019)
 - 0.53.0 [`#1024`](https://github.com/isomerpages/isomercms-backend/pull/1024)
-- fix(mediafileservice): disable sneky cloudmersive [`#1025`](https://github.com/isomerpages/isomercms-backend/pull/1025)
 - release(0.52.0): merge to prod [`#1013`](https://github.com/isomerpages/isomercms-backend/pull/1013)
 - Release/0.51.0 [`#1002`](https://github.com/isomerpages/isomercms-backend/pull/1002)
 - * refactor(formsg-site-clone): remove and add to site creation (#971) [`#992`](https://github.com/isomerpages/isomercms-backend/pull/992)
@@ -87,6 +94,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 9 November 2023
 
+- fix(mediafileservice): disable sneky cloudmersive [`#1025`](https://github.com/isomerpages/isomercms-backend/pull/1025)
 - fix(file ext): fix casing + better logging [`#1020`](https://github.com/isomerpages/isomercms-backend/pull/1020)
 - fix(rr): capture file extensions that are in uppercase [`#1016`](https://github.com/isomerpages/isomercms-backend/pull/1016)
 - release(0.52.0): merge to develop [`#1012`](https://github.com/isomerpages/isomercms-backend/pull/1012)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomercms",
-  "version": "0.54.0",
+  "version": "0.55.0",
   "private": true,
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

src/services/identity/DeploymentClient.ts

@@ -13,6 +13,9 @@ import {
   ListJobsCommand,
   ListJobsCommandOutput,
   JobSummary,
+  StartJobCommand,
+  StartJobCommandOutput,
+  StartJobCommandInput,
 } from "@aws-sdk/client-amplify"
 import { ResultAsync, errAsync, fromPromise, okAsync } from "neverthrow"
 
@@ -77,19 +80,54 @@ class DeploymentClient {
       this.amplifyClient.send(new ListJobsCommand({ appId, branchName }))
     ) as ResultAsync<ListJobsCommandOutput, AmplifyError>
 
-  generateCreateAppInput = (
-    repoName: string,
+  sendStartJobCommand = (options: StartJobCommandInput) =>
+    wrap(this.amplifyClient.send(new StartJobCommand(options))) as ResultAsync<
+      StartJobCommandOutput,
+      AmplifyError
+    >
+
+  generateCreateAppInput = ({
+    appName,
+    repoName,
+    repoUrl,
+    isStagingLite,
+  }: {
+    appName: string
     repoUrl: string
-  ): CreateAppCommandInput => ({
-    name: repoName,
-    accessToken: SYSTEM_GITHUB_TOKEN,
-    repository: repoUrl,
-    buildSpec: AMPLIFY_BUILD_SPEC,
-    environmentVariables: {
-      JEKYLL_ENV: "development",
-    },
-    customRules: [{ source: "/<*>", target: "/404.html", status: "404" }],
-  })
+    repoName: string
+    isStagingLite: boolean
+  }): CreateAppCommandInput => {
+    const stgLiteRedirectRules = [
+      {
+        source: "/files/<*>",
+        target: `https://raw.githubusercontent.com/isomerpages/${repoName}/staging/files/<*>`,
+        status: "200",
+      },
+      {
+        source: "/images/<*>",
+        target: `https://raw.githubusercontent.com/isomerpages/${repoName}/staging/images/<*>`,
+        status: "200",
+      },
+    ]
+    const defaultRedirectRules = [
+      { source: "/<*>", target: "/404.html", status: "404" },
+    ]
+
+    const redirectRules = isStagingLite
+      ? [...stgLiteRedirectRules, ...defaultRedirectRules]
+      : defaultRedirectRules
+
+    return {
+      name: appName,
+      accessToken: SYSTEM_GITHUB_TOKEN,
+      repository: repoUrl,
+      buildSpec: AMPLIFY_BUILD_SPEC,
+      environmentVariables: {
+        JEKYLL_ENV: "development",
+      },
+      customRules: redirectRules,
+    }
+  }
 
   generateCreateBranchInput = (
     appId: string,

src/services/identity/DeploymentsService.ts

@@ -69,7 +69,7 @@ class DeploymentsService {
 
     return this.create({
       stagingUrl: Brand.fromString(
-        `https://staging.${amplifyStagingLiteResult.value.defaultDomain}`
+        `https://staging-lite.${amplifyStagingLiteResult.value.defaultDomain}`
       ),
       productionUrl: Brand.fromString(
         `https://master.${amplifyStagingResult.value.defaultDomain}`
@@ -98,15 +98,17 @@ class DeploymentsService {
   createAmplifyAppOnAws = async (
     repoName: string,
     appName: string,
-    createStagingLite: boolean
+    isStagingLite: boolean
   ): Promise<Result<AmplifyInfo, AmplifyError>> => {
     const repoUrl = `https://github.com/isomerpages/${repoName}`
     logger.info(`PublishToAmplify ${repoUrl}`)
 
-    const createAppOptions = this.deploymentClient.generateCreateAppInput(
+    const createAppOptions = this.deploymentClient.generateCreateAppInput({
       appName,
-      repoUrl
-    )
+      repoUrl,
+      repoName,
+      isStagingLite,
+    })
     // 1. Create Amplify app
     return this.deploymentClient
       .sendCreateApp(createAppOptions)
@@ -152,17 +154,38 @@ class DeploymentsService {
         )
 
         // 3. Create branches
-        if (createStagingLite) {
+        if (isStagingLite) {
           return this.deploymentClient
             .sendCreateBranch(createStagingLiteBranchInput)
+            .andThen(() =>
+              this.deploymentClient.sendStartJobCommand({
+                appId: amplifyInfo.id,
+                branchName: "staging-lite",
+                jobType: "RELEASE",
+              })
+            )
             .map(() => amplifyInfo)
         }
         return this.deploymentClient
           .sendCreateBranch(createMasterBranchInput)
+          .andThen(() =>
+            this.deploymentClient.sendStartJobCommand({
+              appId: amplifyInfo.id,
+              branchName: "master",
+              jobType: "RELEASE",
+            })
+          )
           .map(() => amplifyInfo)
           .andThen(() =>
             this.deploymentClient
               .sendCreateBranch(createStagingBranchInput)
+              .andThen(() =>
+                this.deploymentClient.sendStartJobCommand({
+                  appId: amplifyInfo.id,
+                  branchName: "staging",
+                  jobType: "RELEASE",
+                })
+              )
               .map(() => amplifyInfo)
           )
       })