Merge pull request #7148 from opengovsg/release_v6.113.0

build: release v6.113.0

.ebextensions/02env-file-datadog.config

@@ -0,0 +1,32 @@
+# adds datadog config into environment
+
+commands:
+  01-datadog:
+    command: "/tmp/add-datadog-env.sh"
+
+files:
+  "/tmp/add-datadog-env.sh":
+      mode: "000755"
+      content : |
+        #!/bin/bash
+        # Reach into the undocumented container config
+        AWS_REGION='`{"Ref": "AWS::Region"}`'
+        ENV_TYPE=$(/opt/elasticbeanstalk/bin/get-config environment -k SSM_PREFIX)
+        ENV_SITE_NAME=$(/opt/elasticbeanstalk/bin/get-config environment -k SSM_ENV_SITE_NAME)
+        TARGET_DIR=/etc/formsg
+
+        echo "Checking if ${TARGET_DIR} exists..."
+        if [ ! -d ${TARGET_DIR} ]; then
+            echo "Creating directory ${TARGET_DIR} ..."
+            mkdir -p ${TARGET_DIR}
+            if [ $? -ne 0 ]; then
+                echo 'ERROR: Directory creation failed!'
+                exit 1
+            fi
+        else
+            echo "Directory ${TARGET_DIR} already exists!"
+        fi
+
+        echo "Adding datadog config for ${ENV_SITE_NAME} in ${AWS_REGION}"
+        echo "DD_GIT_REPOSITORY_URL=@DD_GIT_REPOSITORY_URL" >> $TARGET_DIR/.env
+        echo "DD_GIT_COMMIT_SHA=@DD_GIT_COMMIT_SHA" >> $TARGET_DIR/.env

.github/workflows/deploy-eb.yml

@@ -93,11 +93,15 @@ jobs:
           ECR_REPOSITORY: ${{ secrets.ECR_REPO }}
           DD_API_KEY: ${{ secrets.DD_API_KEY }}
           DD_ENV: ${{ secrets.DD_ENV }}
+          DD_GIT_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
+          DD_GIT_COMMIT_SHA: ${{ github.sha }}
         run: |
           docker tag $ECR_REPOSITORY:$IMAGE_TAG $ECR_REPOSITORY:$BRANCH
           docker push -a $ECR_REPOSITORY
           sed -i -e "s/@TAG/$IMAGE_TAG/g" Dockerrun.aws.json
           sed -i -e "s/@DD_API_KEY/$DD_API_KEY/g" -e "s/@DD_ENV/$DD_ENV/g" .ebextensions/99datadog-amazon-linux-2.config
+          # Using "+" as delimiter to avoid escaping / in DD_GIT_REPOSITORY_URL
+          sed -i -e "s+@DD_GIT_REPOSITORY_URL+$DD_GIT_REPOSITORY_URL+g" -e "s/@DD_GIT_COMMIT_SHA/$DD_GIT_COMMIT_SHA/g" .ebextensions/02env-file-datadog.config
           zip -r "$IMAGE_TAG.zip" .ebextensions Dockerrun.aws.json
 
       - name: Copy Image to S3

CHANGELOG.md

@@ -4,19 +4,39 @@ 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).
 
-#### [v6.112.0](https://github.com/opengovsg/FormSG/compare/v6.112.0...v6.112.0)
+#### [v6.113.0](https://github.com/opengovsg/FormSG/compare/v6.113.0...v6.113.0)
 
-- fix: add wogaa config into .env [`#7125`](https://github.com/opengovsg/FormSG/pull/7125)
+- chore: package cleanup [`#7141`](https://github.com/opengovsg/FormSG/pull/7141)
+
+#### [v6.113.0](https://github.com/opengovsg/FormSG/compare/v6.112.0...v6.113.0)
+
+> 19 March 2024
+
+- refactor(logic): consolidate logic functions into shared [`#7136`](https://github.com/opengovsg/FormSG/pull/7136)
+- chore: Security upgrade nodemailer from 6.9.1 to 6.9.9 [`#7057`](https://github.com/opengovsg/FormSG/pull/7057)
+- chore(dd): link source code to dd [`#7120`](https://github.com/opengovsg/FormSG/pull/7120)
+- fix(deps): bump follow-redirects from 1.15.4 to 1.15.6 [`#7139`](https://github.com/opengovsg/FormSG/pull/7139)
+- build(deps): bump follow-redirects from 1.15.4 to 1.15.6 in /frontend [`#7138`](https://github.com/opengovsg/FormSG/pull/7138)
+- build(deps): bump follow-redirects from 1.15.4 to 1.15.6 in /serverless/virus-scanner [`#7137`](https://github.com/opengovsg/FormSG/pull/7137)
+- refactor(i18n): modularize and shard by feature [`#7134`](https://github.com/opengovsg/FormSG/pull/7134)
+- chore: file download duration from S3 [`#7135`](https://github.com/opengovsg/FormSG/pull/7135)
+- fix(virus-scanner): rework error logging in pino [`#7128`](https://github.com/opengovsg/FormSG/pull/7128)
+- chore: add logs for virus scanning duration [`#7129`](https://github.com/opengovsg/FormSG/pull/7129)
+- fix(deps): bump jose from 4.14.4 to 4.15.5 [`#7130`](https://github.com/opengovsg/FormSG/pull/7130)
+- build: merge release v6.112.0 into develop [`#7127`](https://github.com/opengovsg/FormSG/pull/7127)
+- build: release v6.112.0 [`#7126`](https://github.com/opengovsg/FormSG/pull/7126)
+- chore: bump version to v6.113.0 [`67821dc`](https://github.com/opengovsg/FormSG/commit/67821dcd7787b2c48920e706e87357245972459b)
 
 #### [v6.112.0](https://github.com/opengovsg/FormSG/compare/v6.111.0...v6.112.0)
 
 > 6 March 2024
 
+- fix: add wogaa config into .env [`#7125`](https://github.com/opengovsg/FormSG/pull/7125)
 - feat(tracking): wogaa tracking [`#7123`](https://github.com/opengovsg/FormSG/pull/7123)
 - chore(deps-dev): bump json5 from 1.0.1 to 1.0.2 [`#7119`](https://github.com/opengovsg/FormSG/pull/7119)
 - build: merge v6.111.0 back into develop  [`#7118`](https://github.com/opengovsg/FormSG/pull/7118)
 - build: release v6.111.0 [`#7117`](https://github.com/opengovsg/FormSG/pull/7117)
-- chore: bump version to v6.112.0 [`54946e9`](https://github.com/opengovsg/FormSG/commit/54946e99d101d48512fce17e0c4d6f9c09db315a)
+- chore: bump version to v6.112.0 [`a6438f9`](https://github.com/opengovsg/FormSG/commit/a6438f99d72df0f760fb026a81feb45ef09dabe1)
 
 #### [v6.111.0](https://github.com/opengovsg/FormSG/compare/v6.110.0...v6.111.0)
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.112.0",
+  "version": "6.113.0",
   "homepage": ".",
   "private": true,
   "dependencies": {