build: release v5.13.0

CHANGELOG.md

@@ -4,9 +4,51 @@ 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).
 
+#### [v5.13.0](https://github.com/opengovsg/FormSG/compare/v5.12.1...v5.13.0)
+
+- fix: use correct argument key when counting form submissions [`#2101`](https://github.com/opengovsg/FormSG/pull/2101)
+- chore(adminsubmissionsservice): renamed form to submissions to reflect context [`#2098`](https://github.com/opengovsg/FormSG/pull/2098)
+- feat: enable retries for webhooks [`#2093`](https://github.com/opengovsg/FormSG/pull/2093)
+- feat: log form updates [`#2063`](https://github.com/opengovsg/FormSG/pull/2063)
+- chore: remove endPage.buttons key from database  [`#2087`](https://github.com/opengovsg/FormSG/pull/2087)
+- feat: sort responses for csv download according to creation date [`#2028`](https://github.com/opengovsg/FormSG/pull/2028)
+- fix(deps): downgrade typescript to 4.2.4 and pin [`#2097`](https://github.com/opengovsg/FormSG/pull/2097)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2095`](https://github.com/opengovsg/FormSG/pull/2095)
+- chore(deps-dev): bump typescript from 4.2.4 to 4.3.2 [`#2096`](https://github.com/opengovsg/FormSG/pull/2096)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.26.0 to 4.26.1 [`#2094`](https://github.com/opengovsg/FormSG/pull/2094)
+- fix(deps): downgrade typescript to 4.2.4 [`#2092`](https://github.com/opengovsg/FormSG/pull/2092)
+- refactor(submissions.client.factory): extract admin form features [`#1983`](https://github.com/opengovsg/FormSG/pull/1983)
+- chore(deps-dev): bump prettier from 2.2.1 to 2.3.1 [`#2075`](https://github.com/opengovsg/FormSG/pull/2075)
+- fix: restore typings to some model static methods [`#2067`](https://github.com/opengovsg/FormSG/pull/2067)
+- fix(deps): bump aws-sdk from 2.920.0 to 2.922.0 [`#2078`](https://github.com/opengovsg/FormSG/pull/2078)
+- chore(deps-dev): bump eslint from 7.27.0 to 7.28.0 [`#2077`](https://github.com/opengovsg/FormSG/pull/2077)
+- chore(deps-dev): bump core-js from 3.13.1 to 3.14.0 [`#2076`](https://github.com/opengovsg/FormSG/pull/2076)
+- docs(script): add scripts to privatize all sp/rp student forms [`#2073`](https://github.com/opengovsg/FormSG/pull/2073)
+- fix(deps): bump nocache from 2.1.0 to 3.0.0 [`#2068`](https://github.com/opengovsg/FormSG/pull/2068)
+- fix(deps): bump @sentry/integrations from 6.5.0 to 6.5.1 [`#2071`](https://github.com/opengovsg/FormSG/pull/2071)
+- fix(deps): bump twilio from 3.63.0 to 3.63.1 [`#2072`](https://github.com/opengovsg/FormSG/pull/2072)
+- fix(deps): bump aws-sdk from 2.919.0 to 2.920.0 [`#2070`](https://github.com/opengovsg/FormSG/pull/2070)
+- fix(deps): bump @sentry/browser from 6.5.0 to 6.5.1 [`#2069`](https://github.com/opengovsg/FormSG/pull/2069)
+- refactor(formApiClientFactory): rearrange types [`#2061`](https://github.com/opengovsg/FormSG/pull/2061)
+- docs(readme): remove active contributors [`#2064`](https://github.com/opengovsg/FormSG/pull/2064)
+- refactor(beta): migrate to TypeScript [`#2058`](https://github.com/opengovsg/FormSG/pull/2058)
+- refactor: replace set hook with validator hook in emailField model [`#1971`](https://github.com/opengovsg/FormSG/pull/1971)
+- fix(deps): bump aws-sdk from 2.918.0 to 2.919.0 [`#2060`](https://github.com/opengovsg/FormSG/pull/2060)
+- chore(deps-dev): bump @types/node from 14.17.1 to 14.17.2 [`#2059`](https://github.com/opengovsg/FormSG/pull/2059)
+- fix(deps): update mongoose to 5.12.12, update model types [`#2046`](https://github.com/opengovsg/FormSG/pull/2046)
+- chore(deps-dev): bump type-fest from 0.20.2 to 1.2.0 [`#2049`](https://github.com/opengovsg/FormSG/pull/2049)
+- test(betas): provide coverage [`23f9a9f`](https://github.com/opengovsg/FormSG/commit/23f9a9fe9675eab1d25c1983a08a7c76e0139d52)
+
 #### [v5.12.1](https://github.com/opengovsg/FormSG/compare/v5.12.0...v5.12.1)
 
+> 8 June 2021
+
+- chore: merge v5.12.1 into develop [`#2051`](https://github.com/opengovsg/FormSG/pull/2051)
+- chore(deps-dev): bump @opengovsg/mockpass from 2.7.2 to 2.7.3 [`#2050`](https://github.com/opengovsg/FormSG/pull/2050)
+- docs(scripts): add scripts to set student logos to selected forms [`#2048`](https://github.com/opengovsg/FormSG/pull/2048)
+- chore: merge v5.12.0 into develop [`#2044`](https://github.com/opengovsg/FormSG/pull/2044)
 - fix: deny non-GET requests from RP and SP domains [`9a2c9dc`](https://github.com/opengovsg/FormSG/commit/9a2c9dc0f3287b35e03bf48674c7ef57411ffe87)
+- chore: bump version to 5.12.1 [`6c415d2`](https://github.com/opengovsg/FormSG/commit/6c415d210186e9e797ca839a010032b469d6e9c4)
 
 #### [v5.12.0](https://github.com/opengovsg/FormSG/compare/v5.11.0...v5.12.0)
 
@@ -46,7 +88,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(verification): loosen OTP waiting time by 2 seconds [`#1957`](https://github.com/opengovsg/FormSG/pull/1957)
 - chore: bump version to 5.12.0 [`85759bc`](https://github.com/opengovsg/FormSG/commit/85759bc9dc01f73da3cbd0ec73c636e58e983948)
 
-#### [v5.11.0](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.11.0)
+#### [v5.11.0](https://github.com/opengovsg/FormSG/compare/v5.10.1...v5.11.0)
 
 > 25 May 2021
 
@@ -114,6 +156,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1868`](https://github.com/opengovsg/FormSG/pull/1868)
 - fix(deps): bump @sentry/integrations from 6.3.5 to 6.3.6 [`#1850`](https://github.com/opengovsg/FormSG/pull/1850)
 - chore: bump version to 5.11.0 [`54b1958`](https://github.com/opengovsg/FormSG/commit/54b1958d0968e670ef145461d9d7859384d573ef)
+
+#### [v5.10.1](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.10.1)
+
+> 17 May 2021
+
 - chore: bump version to v5.10.1 [`0442cd7`](https://github.com/opengovsg/FormSG/commit/0442cd72637019fb1e43bce5f8f5abe14ee79f8c)
 - fix: allow for unknown keys in updateEndPage validator [`617d86a`](https://github.com/opengovsg/FormSG/commit/617d86a28910eec6ebd3249a2de636086429d6a6)
 
@@ -160,14 +207,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1790`](https://github.com/opengovsg/FormSG/pull/1790)
 - feat(api-refactor): add specific update end page endpoint in server [`#1760`](https://github.com/opengovsg/FormSG/pull/1760)
 - feat: move server.ts into src/app [`#1785`](https://github.com/opengovsg/FormSG/pull/1785)
-- fix: trigger digest cycle for delete logic [`#1787`](https://github.com/opengovsg/FormSG/pull/1787)
-- chore: bump version to 5.9.0 [`6d6e475`](https://github.com/opengovsg/FormSG/commit/6d6e475c417cfb5efacb203888b0f296159d8ac1)
 - chore: bump version to v5.10.0 [`0615ce5`](https://github.com/opengovsg/FormSG/commit/0615ce5262fcdb65932ad6c9be9ee66503b0e949)
 
 #### [v5.9.0](https://github.com/opengovsg/FormSG/compare/v5.8.0...v5.9.0)
 
 > 4 May 2021
 
+- fix: trigger digest cycle for delete logic [`#1787`](https://github.com/opengovsg/FormSG/pull/1787)
 - fix: allow commas in email confirmation sender [`#1782`](https://github.com/opengovsg/FormSG/pull/1782)
 - chore(deps-dev): bump core-js from 3.11.1 to 3.11.2 [`#1780`](https://github.com/opengovsg/FormSG/pull/1780)
 - fix(deps): bump fp-ts from 2.10.4 to 2.10.5 [`#1781`](https://github.com/opengovsg/FormSG/pull/1781)
@@ -192,7 +238,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump aws-sdk from 2.893.0 to 2.894.0 [`#1756`](https://github.com/opengovsg/FormSG/pull/1756)
 - fix(deps): bump @sentry/integrations from 6.3.1 to 6.3.3 [`#1755`](https://github.com/opengovsg/FormSG/pull/1755)
 - chore: merge v5.8.0 into develop [`#1751`](https://github.com/opengovsg/FormSG/pull/1751)
-- chore: bump version to 5.9.0 [`902fd6a`](https://github.com/opengovsg/FormSG/commit/902fd6a764e94bd0882ca1f7bebb3e79f916c9f3)
+- chore: bump version to 5.9.0 [`6d6e475`](https://github.com/opengovsg/FormSG/commit/6d6e475c417cfb5efacb203888b0f296159d8ac1)
 
 #### [v5.8.0](https://github.com/opengovsg/FormSG/compare/v5.7.1...v5.8.0)
 

Dockerfile.development

@@ -26,9 +26,12 @@ RUN apk update && apk upgrade && \
     ttf-freefont \
     tini \
     # Localstack - these are necessary in order to initialise local S3 buckets
+    # jq is a package for easily parsing Localstack health endpoint's JSON output
+    jq \
     py-pip && \
     npm install --quiet node-gyp -g && \
-    pip install awscli-local
+    # [ver1] ensures that the underlying AWS CLI version is also installed
+    pip install awscli-local[ver1]
 
 # Chinese fonts
 RUN echo @edge http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && apk add wqy-zenhei@edge
@@ -41,5 +44,5 @@ EXPOSE 5000
 # tini is the init process that will adopt orphaned zombie processes
 # e.g. chromium when launched to create a new PDF
 ENTRYPOINT [ "tini", "--" ]
-# Create local S3 buckets before building the app
-CMD npm run docker-dev
+# Create local AWS resources before building the app
+CMD sh init-localstack.sh && npm run docker-dev

README.md

@@ -206,11 +206,9 @@ FormSG acknowledges the work done by [Arielle Baldwynn](https://github.com/white
 Contributions have also been made by:  
 [@RyanAngJY](https://github.com/RyanAngJY)  
 [@jeantanzy](https://github.com/jeantanzy)  
-[@yong-jie](https://github.com/yong-jie)  
 [@pregnantboy](https://github.com/pregnantboy)  
 [@namnguyen08](https://github.com/namnguyen08)  
 [@zioul123](https://github.com/zioul123)  
 [@JoelWee](https://github.com/JoelWee)  
 [@limli](https://github.com/limli)  
 [@tankevan](https://github.com/tankevan)  
-[@LoneRifle](https://github.com/LoneRifle)

docker-compose.yml

@@ -38,6 +38,7 @@ services:
       - MYINFO_CERT_PATH=./node_modules/@opengovsg/mockpass/static/certs/spcp.crt
       - MYINFO_CLIENT_ID=mockClientId
       - MYINFO_CLIENT_SECRET=mockClientSecret
+      - WEBHOOK_SQS_URL=http://localhost:4566/000000000000/local-webhooks-sqs-main
       - GA_TRACKING_ID
       - SENTRY_CONFIG_URL
       - TWILIO_ACCOUNT_SID
@@ -105,17 +106,11 @@ services:
     depends_on:
       - formsg
     environment:
-      - SERVICES=s3
+      - SERVICES=s3,sqs
       - DATA_DIR=/tmp/localstack/data
-      - ATTACHMENT_S3_BUCKET=local-attachment-bucket
-      - IMAGE_S3_BUCKET=local-image-bucket
-      - LOGO_S3_BUCKET=local-logo-bucket
     volumes:
       - './.localstack:/tmp/localstack'
       - '/var/run/docker.sock:/var/run/docker.sock'
-      # This is where we add scripts to initialise AWS resources.
-      # Docs: https://github.com/localstack/localstack#initializing-a-fresh-instance
-      - './docker-entrypoint-initaws.d:/docker-entrypoint-initaws.d'
     network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:4566 to localstack:4566
 
   maildev:

init-localstack.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# Wait for all Localstack services to be ready
+while [[ "$(curl -s -f http://localhost:4566/health | jq '[.services[] == "running"] | all')" != "true" ]]; do
+  sleep 5
+done
+
+# Create SQS queue for webhooks
+# First create dead-letter queue and get its ARN so it can be specified as the DLQ
+# for the main queue. Note that the DLQ name is not an environment variable
+# in the application, as this is configured from the AWS console in production.
+DLQ_NAME=local-webhooks-sqs-deadLetter
+DLQ_URL=$(awslocal sqs create-queue --queue-name $DLQ_NAME | jq --raw-output '.QueueUrl')
+DLQ_ARN=$(awslocal sqs get-queue-attributes --queue-url $DLQ_URL --attribute-names QueueArn | jq --raw-output '.Attributes.QueueArn')
+
+# Show output for all main resources created
+set -x
+
+# For main queue, extract queue name, which is the part of the queue URL after the final "/"
+awslocal sqs create-queue --queue-name ${WEBHOOK_SQS_URL##*/} --attributes '{
+  "ReceiveMessageWaitTimeSeconds": "20",
+  "RedrivePolicy": "{\"deadLetterTargetArn\":\"'"$DLQ_ARN"'\",\"maxReceiveCount\":1}"
+}'
+
+# Create S3 buckets
+awslocal s3 mb s3://$IMAGE_S3_BUCKET
+awslocal s3 mb s3://$LOGO_S3_BUCKET
+awslocal s3 mb s3://$ATTACHMENT_S3_BUCKET
+
+set +x