build: release v5.29.0

.ebextensions/99datadog.config

@@ -0,0 +1,111 @@
+# Documentation: # Reference: https://docs.datadoghq.com/integrations/amazon_elasticbeanstalk/?tab=singlecontainer#alternate-datadog-agent-configuration
+# Source file for datadog.yaml.example: https://github.com/DataDog/datadog-agent/blob/main/pkg/config/config_template.yaml
+
+# .ebextensions/99datadog.config
+option_settings:
+    - namespace:  aws:elasticbeanstalk:application:environment
+      option_name:  DD_API_KEY
+      value:  "<YOUR_DD_API_KEY>" # To set in AWS EB console only
+    - namespace:  aws:elasticbeanstalk:application:environment
+      option_name:  DD_AGENT_VERSION
+      value:  "7.31.0"
+    - namespace:  aws:elasticbeanstalk:application:environment
+      option_name:  DD_ENV
+      value:  "staging" # staging | production
+files:
+    "/configure_datadog_yaml.sh":
+        mode: "000700"
+        owner: root
+        group: root
+        content: |
+            #!/bin/bash
+
+            sed -e "s/api_key:.*/api_key: ${DD_API_KEY}/" \
+                -e "s/# dogstatsd_non_local_traffic: false/dogstatsd_non_local_traffic: true/" \
+                -e "s/# hostname_file:/hostname_file:/" \
+                /etc/datadog-agent/datadog.yaml.example > /etc/datadog-agent/datadog.yaml
+
+            # Use the following command if you're in the EU. Replace datadoghq.eu with another region if in a different region.
+            # sed -i 's/datadoghq.com/datadoghq.eu/' /etc/datadog-agent/datadog.yaml
+
+            echo "tags:" >> /etc/datadog-agent/datadog.yaml
+            echo "  - service:formsg" >> /etc/datadog-agent/datadog.yaml
+            echo "  - env:${DD_ENV}" >> /etc/datadog-agent/datadog.yaml
+
+    "/datadog/datadog.repo":
+        mode: "000644"
+        owner: root
+        group: root
+        content: |
+            [datadog]
+            name = Datadog, Inc.
+            baseurl = https://yum.datadoghq.com/stable/7/x86_64/
+            enabled=1
+            gpgcheck=1
+            repo_gpgcheck=1
+            gpgkey=https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
+                   https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
+                   https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
+
+    "/datadog/hooks/99start_datadog.sh":
+        mode: "000755"
+        owner: root
+        group: root
+        content: |
+            #!/bin/bash
+            STATUS=`sudo initctl status datadog-agent`
+            if [[ "$STATUS" == *"datadog-agent start/running"* ]]
+            then
+              echo "Agent already running"
+            else
+              echo "Agent starting..."
+              sudo initctl start datadog-agent
+            fi
+
+    "/datadog/hooks/99stop_datadog.sh":
+        mode: "000755"
+        owner: root
+        group: root
+        content: |
+            #!/bin/bash
+            STATUS=`sudo initctl status datadog-agent`
+            if [[ "$STATUS" == *"datadog-agent stop/waiting"* ]]
+            then
+              echo "Agent already stopped"
+            else
+              echo "Agent stopping..."
+              sudo initctl stop datadog-agent
+            fi
+
+
+container_commands:
+    02mkdir_appdeploy_post:
+        test: '[ ! -d /opt/elasticbeanstalk/hooks/appdeploy/post ]'
+        command: "mkdir /opt/elasticbeanstalk/hooks/appdeploy/post"
+    02mkdir_configdeploy_post:
+        test: '[ ! -d /opt/elasticbeanstalk/hooks/configdeploy/post ]'
+        command: "mkdir /opt/elasticbeanstalk/hooks/configdeploy/post"
+    10appdeploy_pre_stop:
+        test: '[ -f /datadog/hooks/99stop_datadog.sh ]'
+        command: "cp /datadog/hooks/99stop_datadog.sh /opt/elasticbeanstalk/hooks/appdeploy/pre/"
+    11appdeploy_post_start:
+        test: '[ -f /datadog/hooks/99start_datadog.sh ]'
+        command: "cp /datadog/hooks/99start_datadog.sh /opt/elasticbeanstalk/hooks/appdeploy/post/"
+    20preinit_stop:
+        test: '[ -f /datadog/hooks/99stop_datadog.sh ]'
+        command: "cp /datadog/hooks/99stop_datadog.sh /opt/elasticbeanstalk/hooks/preinit"
+    21postinit_start:
+        test: '[ -f /datadog/hooks/99start_datadog.sh ]'
+        command: "cp /datadog/hooks/99start_datadog.sh /opt/elasticbeanstalk/hooks/postinit"
+    30configdeploy_pre_stop:
+        test: '[ -f /datadog/hooks/99stop_datadog.sh ]'
+        command: "cp /datadog/hooks/99stop_datadog.sh /opt/elasticbeanstalk/hooks/configdeploy/pre/"
+    31configdeploy_post_start:
+        test: '[ -f /datadog/hooks/99start_datadog.sh ]'
+        command: "cp /datadog/hooks/99start_datadog.sh /opt/elasticbeanstalk/hooks/configdeploy/post/"
+    90install_datadog:
+        test: '[ -f /datadog/datadog.repo ]'
+        command: 'cp /datadog/datadog.repo /etc/yum.repos.d/datadog.repo; yum -y makecache; DD_AGENT_VERSION="$(/opt/elasticbeanstalk/bin/get-config environment -k DD_AGENT_VERSION)"; yum -y install datadog-agent${DD_AGENT_VERSION:+-$DD_AGENT_VERSION-1}'
+    91setup_datadog:
+        test: '[ -x /configure_datadog_yaml.sh ]'
+        command: "/configure_datadog_yaml.sh"

.github/mergify.yml

@@ -1,8 +1,41 @@
 pull_request_rules:
-  - name: Approve and merge non-major dependency upgrades
+  - name: Approve and merge non-major dependabot dependency upgrades
     conditions:
-      - 'author=dependabot[bot]'
-      - 'title~=bump [^\s]+ from ([\d]+)\..+ to \1\.'
+      - author=dependabot[bot]
+      - title~=bump [^\s]+ from ([\d]+)\..+ to \1\.
+      - check-success~=install
+      - check-success~=test-frontend
+      - check-success~=test-backend
+      - check-success~=test-e2e
+      - check-success~=Analyze # CodeQL / Analyze
+      - check-success~=CodeQL # CodeQL code scanning results
+      - check-success~=GitGuardian
+      - check-success~=Semantic Pull Request
+      - check-success~=Travis CI - Branch
+      - check-success~=coverage/coveralls
+      - check-success~=license/snyk
+      - check-success~=security/snyk
+    actions:
+      review:
+        type: APPROVE
+      merge:
+        method: squash
+  - name: Approve and merge non-major Snyk.io upgrades
+    conditions:
+      - author=snyk-bot
+      - title~=\[Snyk\] Security upgrade [^\s]+ from ([\d]+)\..+ to \1\.
+      - check-success~=install
+      - check-success~=test-frontend
+      - check-success~=test-backend
+      - check-success~=test-e2e
+      - check-success~=Analyze # CodeQL / Analyze
+      - check-success~=CodeQL # CodeQL code scanning results
+      - check-success~=GitGuardian
+      - check-success~=Semantic Pull Request
+      - check-success~=Travis CI - Branch
+      - check-success~=coverage/coveralls
+      - check-success~=license/snyk
+      - check-success~=security/snyk
     actions:
       review:
         type: APPROVE

CHANGELOG.md

@@ -4,8 +4,77 @@ 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.29.0](https://github.com/opengovsg/FormSG/compare/v5.28.0...v5.29.0)
+
+- fix(deps): bump fp-ts from 2.11.2 to 2.11.3 [`#2847`](https://github.com/opengovsg/FormSG/pull/2847)
+- chore(deps-dev): bump @types/node from 14.17.17 to 14.17.18 [`#2848`](https://github.com/opengovsg/FormSG/pull/2848)
+- feat: Datadog agent integration [`#2824`](https://github.com/opengovsg/FormSG/pull/2824)
+- chore(deps-dev): bump jest-localstorage-mock from 2.4.17 to 2.4.18 [`#2845`](https://github.com/opengovsg/FormSG/pull/2845)
+- refactor: update NRIC validation [`#2842`](https://github.com/opengovsg/FormSG/pull/2842)
+- fix(deps): bump aws-sdk from 2.991.0 to 2.992.0 [`#2846`](https://github.com/opengovsg/FormSG/pull/2846)
+- fix(deps): bump @sentry/integrations from 6.12.0 to 6.13.2 [`#2844`](https://github.com/opengovsg/FormSG/pull/2844)
+- fix(deps): bump @sentry/browser from 6.13.1 to 6.13.2 [`#2843`](https://github.com/opengovsg/FormSG/pull/2843)
+- fix: Revert "refactor: use modern JS constructs to validate NRIC (#2785)" [`#2836`](https://github.com/opengovsg/FormSG/pull/2836)
+- chore(deps-dev): bump htmlhint from 0.15.1 to 0.15.2 [`#2838`](https://github.com/opengovsg/FormSG/pull/2838)
+- chore(deps-dev): bump eslint-plugin-jest from 24.4.0 to 24.4.2 [`#2837`](https://github.com/opengovsg/FormSG/pull/2837)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.31.1 to 4.31.2 [`#2835`](https://github.com/opengovsg/FormSG/pull/2835)
+- chore(deps-dev): bump @types/jest from 27.0.1 to 27.0.2 [`#2834`](https://github.com/opengovsg/FormSG/pull/2834)
+- fix(deps): bump date-fns from 2.23.0 to 2.24.0 [`#2833`](https://github.com/opengovsg/FormSG/pull/2833)
+- chore(deps-dev): bump type-fest from 2.3.2 to 2.3.4 [`#2832`](https://github.com/opengovsg/FormSG/pull/2832)
+- fix(deps): bump @sentry/browser from 6.12.0 to 6.13.1 [`#2831`](https://github.com/opengovsg/FormSG/pull/2831)
+- chore(deps-dev): bump @types/express-request-id from 1.4.2 to 1.4.3 [`#2827`](https://github.com/opengovsg/FormSG/pull/2827)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2828`](https://github.com/opengovsg/FormSG/pull/2828)
+- chore(deps-dev): bump prettier from 2.4.0 to 2.4.1 [`#2829`](https://github.com/opengovsg/FormSG/pull/2829)
+- chore(deps): remove has-ansi package [`#2781`](https://github.com/opengovsg/FormSG/pull/2781)
+- fix(deps): bump aws-sdk from 2.987.0 to 2.991.0 [`#2820`](https://github.com/opengovsg/FormSG/pull/2820)
+- build(mergify): specify checks and include Snyk [`#2825`](https://github.com/opengovsg/FormSG/pull/2825)
+- chore(deps-dev): bump @types/node from 14.17.15 to 14.17.17 [`#2821`](https://github.com/opengovsg/FormSG/pull/2821)
+- fix(deps): bump libphonenumber-js from 1.9.32 to 1.9.34 [`#2810`](https://github.com/opengovsg/FormSG/pull/2810)
+- refactor: use modern JS constructs to validate NRIC [`#2785`](https://github.com/opengovsg/FormSG/pull/2785)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.31.0 to 4.31.1 [`#2812`](https://github.com/opengovsg/FormSG/pull/2812)
+- build: merge release 5.28.0 into develop [`#2804`](https://github.com/opengovsg/FormSG/pull/2804)
+- build: release v5.28.0 [`#2798`](https://github.com/opengovsg/FormSG/pull/2798)
+- build: release 5.27.0 [`#2751`](https://github.com/opengovsg/FormSG/pull/2751)
+- build: release v5.26.0 [`#2708`](https://github.com/opengovsg/FormSG/pull/2708)
+- build: release v5.25.0 [`#2661`](https://github.com/opengovsg/FormSG/pull/2661)
+- build: hotfix release v5.24.1 [`#2646`](https://github.com/opengovsg/FormSG/pull/2646)
+- build: Release 5.24.0 [`#2626`](https://github.com/opengovsg/FormSG/pull/2626)
+- build: release v5.23.0 [`#2566`](https://github.com/opengovsg/FormSG/pull/2566)
+- build: release v5.22.0 [`#2511`](https://github.com/opengovsg/FormSG/pull/2511)
+- build: hotfix release v5.21.2, remove esrvcId validation when logging form logins [`#2484`](https://github.com/opengovsg/FormSG/pull/2484)
+- build: hotfix release v5.21.1, update esrvcId validation [`#2470`](https://github.com/opengovsg/FormSG/pull/2470)
+- build: Release 5.21.0 [`#2443`](https://github.com/opengovsg/FormSG/pull/2443)
+- build: release v5.20.0 [`#2391`](https://github.com/opengovsg/FormSG/pull/2391)
+- build: release v5.19.2 - fixes for SGID and MyInfo cookies [`#2372`](https://github.com/opengovsg/FormSG/pull/2372)
+- build: Release 5.19.1 [`#2342`](https://github.com/opengovsg/FormSG/pull/2342)
+- build: Release 5.19.0 [`#2310`](https://github.com/opengovsg/FormSG/pull/2310)
+- build: release v5.18.0 [`#2282`](https://github.com/opengovsg/FormSG/pull/2282)
+- build: release v5.17.0 [`#2249`](https://github.com/opengovsg/FormSG/pull/2249)
+- build: release 5.16.0 [`#2229`](https://github.com/opengovsg/FormSG/pull/2229)
+- build: release v5.15.0 - webhook attachments [`#2176`](https://github.com/opengovsg/FormSG/pull/2176)
+- build: hotfix v5.14.1 - allow read key in permissionList when updating collaborators [`#2178`](https://github.com/opengovsg/FormSG/pull/2178)
+- build: release v5.14.0 [`#2167`](https://github.com/opengovsg/FormSG/pull/2167)
+- build: release v5.13.1 - increase OTP expiry to 30 minutes [`#2142`](https://github.com/opengovsg/FormSG/pull/2142)
+- build: release v5.13.0 [`#2099`](https://github.com/opengovsg/FormSG/pull/2099)
+- build: release v5.12.1 - hotfix to block RP and SP student domains [`#2047`](https://github.com/opengovsg/FormSG/pull/2047)
+- build: release v5.12.0 [`#2041`](https://github.com/opengovsg/FormSG/pull/2041)
+- build: release v5.11.0 [`#1965`](https://github.com/opengovsg/FormSG/pull/1965)
+- build: hotfix release v5.10.1 [`#1896`](https://github.com/opengovsg/FormSG/pull/1896)
+- build: Release v5.10.0 [`#1856`](https://github.com/opengovsg/FormSG/pull/1856)
+- build: release v5.9.0 [`#1783`](https://github.com/opengovsg/FormSG/pull/1783)
+- build: release v5.8.0 [`#1737`](https://github.com/opengovsg/FormSG/pull/1737)
+- build: hotfix release v5.7.1 [`#1706`](https://github.com/opengovsg/FormSG/pull/1706)
+- build: release 5.7.0 [`#1680`](https://github.com/opengovsg/FormSG/pull/1680)
+- build: hotfix release v5.6.1 [`#1634`](https://github.com/opengovsg/FormSG/pull/1634)
+- build: release v5.6.0 [`#1630`](https://github.com/opengovsg/FormSG/pull/1630)
+- build: Release v5.5.1 [`#1603`](https://github.com/opengovsg/FormSG/pull/1603)
+- build: Release 5.5.0 [`#1565`](https://github.com/opengovsg/FormSG/pull/1565)
+- build: release 5.4.1 - server to respond with status code if storage mode form is archived [`#1541`](https://github.com/opengovsg/FormSG/pull/1541)
+
 #### [v5.28.0](https://github.com/opengovsg/FormSG/compare/v5.27.0...v5.28.0)
 
+> 14 September 2021
+
 - fix(deps): bump fp-ts from 2.11.1 to 2.11.2 [`#2796`](https://github.com/opengovsg/FormSG/pull/2796)
 - chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2795`](https://github.com/opengovsg/FormSG/pull/2795)
 - feat: Add 4MB attachment support [`#2777`](https://github.com/opengovsg/FormSG/pull/2777)
@@ -32,6 +101,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump web-streams-polyfill from 3.1.0 to 3.1.1 [`#2755`](https://github.com/opengovsg/FormSG/pull/2755)
 - chore(deps-dev): bump @typescript-eslint/parser from 4.30.0 to 4.31.0 [`#2754`](https://github.com/opengovsg/FormSG/pull/2754)
 - chore(deps-dev): bump ngrok from 4.1.0 to 4.2.2 [`#2753`](https://github.com/opengovsg/FormSG/pull/2753)
+- chore: bump version to 5.28.0 [`59fe066`](https://github.com/opengovsg/FormSG/commit/59fe0663df7fb3c8ffad0d5a174ee4856996763b)
 
 #### [v5.27.0](https://github.com/opengovsg/FormSG/compare/v5.26.0...v5.27.0)
 
@@ -59,15 +129,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @types/node from 14.17.12 to 14.17.14 [`#2722`](https://github.com/opengovsg/FormSG/pull/2722)
 - fix(deps): bump aws-sdk from 2.978.0 to 2.979.0 [`#2717`](https://github.com/opengovsg/FormSG/pull/2717)
 - chore: merge release v5.26.0 back to develop [`#2711`](https://github.com/opengovsg/FormSG/pull/2711)
+- fix: only check for sms quota on verified mobile field OTP verifications instead of all verified fields [`#2710`](https://github.com/opengovsg/FormSG/pull/2710)
+- fix: Add 10 MB max length checks to form field editor [`#2584`](https://github.com/opengovsg/FormSG/pull/2584)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2706`](https://github.com/opengovsg/FormSG/pull/2706)
+- chore: bump version to v5.26.0 [`cdf7e1b`](https://github.com/opengovsg/FormSG/commit/cdf7e1b13f641a278489f89792e51eb7639d2a39)
 - chore: bump version to 5.27.0 [`ffb85d2`](https://github.com/opengovsg/FormSG/commit/ffb85d2ff0d902baac9b497d66c520f4c4f7e018)
 
 #### [v5.26.0](https://github.com/opengovsg/FormSG/compare/v5.25.0...v5.26.0)
 
 > 31 August 2021
 
-- fix: only check for sms quota on verified mobile field OTP verifications instead of all verified fields [`#2710`](https://github.com/opengovsg/FormSG/pull/2710)
-- fix: Add 10 MB max length checks to form field editor [`#2584`](https://github.com/opengovsg/FormSG/pull/2584)
-- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2706`](https://github.com/opengovsg/FormSG/pull/2706)
 - chore(deps-dev): bump @typescript-eslint/parser from 4.29.3 to 4.30.0 [`#2707`](https://github.com/opengovsg/FormSG/pull/2707)
 - fix: Email domain validation should be case-insensitive [`#2682`](https://github.com/opengovsg/FormSG/pull/2682)
 - fix: upgrade jszip from 3.7.0 to 3.7.1 [`#2692`](https://github.com/opengovsg/FormSG/pull/2692)
@@ -99,7 +170,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: merge v5.25.0 into develop [`#2667`](https://github.com/opengovsg/FormSG/pull/2667)
 - fix: upgrade zod from 3.6.1 to 3.7.1 [`#2662`](https://github.com/opengovsg/FormSG/pull/2662)
 - fix: upgrade type-fest from 1.2.3 to 1.3.0 [`#2663`](https://github.com/opengovsg/FormSG/pull/2663)
-- chore: bump version to v5.26.0 [`cdf7e1b`](https://github.com/opengovsg/FormSG/commit/cdf7e1b13f641a278489f89792e51eb7639d2a39)
+- chore: bump version to v5.26.0 [`35de314`](https://github.com/opengovsg/FormSG/commit/35de3145f8d18b8145c78a2da6dae38458ac5536)
 
 #### [v5.25.0](https://github.com/opengovsg/FormSG/compare/v5.24.1...v5.25.0)
 
@@ -248,13 +319,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ref: remove backend package dependencies from Form (sub-)types and move to shared dir [`#2385`](https://github.com/opengovsg/FormSG/pull/2385)
 - chore: add postinstall script to install /shared modules [`#2438`](https://github.com/opengovsg/FormSG/pull/2438)
 - chore: bump version to 5.22.0 [`d7616cc`](https://github.com/opengovsg/FormSG/commit/d7616cc9066a4bfb8dfea655ad3e7e3546e9d8d1)
+- feat: remove validation when logging esrvcId to login collection [`90a0fb0`](https://github.com/opengovsg/FormSG/commit/90a0fb04c450607c5e246c153583844bfe6d42dc)
+- chore: bump version to v5.21.2 [`7c87b10`](https://github.com/opengovsg/FormSG/commit/7c87b106400c1fbd197fe503cfa716a0b169f8c0)
 
 #### [v5.21.2](https://github.com/opengovsg/FormSG/compare/v5.21.1...v5.21.2)
 
 > 30 July 2021
 
-- feat: remove validation when logging esrvcId to login collection [`90a0fb0`](https://github.com/opengovsg/FormSG/commit/90a0fb04c450607c5e246c153583844bfe6d42dc)
-- chore: bump version to v5.21.2 [`7c87b10`](https://github.com/opengovsg/FormSG/commit/7c87b106400c1fbd197fe503cfa716a0b169f8c0)
+- chore: bump version to v5.21.2 [`08cf7d4`](https://github.com/opengovsg/FormSG/commit/08cf7d4a838dde0ca3c418451f72eefd9ef88d19)
+- feat: remove validation when logging esrvcId to login collection [`5bea425`](https://github.com/opengovsg/FormSG/commit/5bea4252707eb1bd6e2776175dab591dd0738ec8)
 
 #### [v5.21.1](https://github.com/opengovsg/FormSG/compare/v5.21.0...v5.21.1)