Merge pull request #7734 from opengovsg/release-v6.149.2

build: release 6.149.2
opengovsg · Sep 27, 2024 · 0d4280f · 0d4280f
2 parents ec58886 + e865ad8
commit 0d4280f
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,16 +4,19 @@ 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.149.1](https://github.com/opengovsg/FormSG/compare/v6.149.1...v6.149.1)
+#### [v6.149.2](https://github.com/opengovsg/FormSG/compare/v6.149.1...v6.149.2)
 
-- fix: mrf visual issues [`#7728`](https://github.com/opengovsg/FormSG/pull/7728)
+- fix: ses default configset [`#7733`](https://github.com/opengovsg/FormSG/pull/7733)
+- build: release 6.149.1  [`#7729`](https://github.com/opengovsg/FormSG/pull/7729)
+- feat: explicitly specify configset [`f4c78cb`](https://github.com/opengovsg/FormSG/commit/f4c78cb0d342bb1c6241602910dc711ee6703815)
 
 #### [v6.149.1](https://github.com/opengovsg/FormSG/compare/v6.149.0...v6.149.1)
 
 > 26 September 2024
 
+- fix: mrf visual issues [`#7728`](https://github.com/opengovsg/FormSG/pull/7728)
 - build: release v6.149.0 [`#7725`](https://github.com/opengovsg/FormSG/pull/7725)
-- chore: bump version to 6.149.1 [`395ea11`](https://github.com/opengovsg/FormSG/commit/395ea112620a767920af2674bf2b30119664577f)
+- chore: bump version to 6.149.1 [`ccfd1ec`](https://github.com/opengovsg/FormSG/commit/ccfd1ec21d59024bfec4534af4a96886ca61168c)
 
 #### [v6.149.0](https://github.com/opengovsg/FormSG/compare/v6.148.0...v6.149.0)
 

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.149.1",
+  "version": "6.149.2",
   "homepage": ".",
   "private": true,
   "dependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.149.1",
+  "version": "6.149.2",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"

diff --git a/src/app/config/config.ts b/src/app/config/config.ts
@@ -183,6 +183,7 @@ const mailConfig: MailConfig = (function () {
     official,
     mailer,
     transporter,
+    sesConfigSet: prodOnlyVars.sesConfigSet,
   }
 })()
 

diff --git a/src/app/config/schema.ts b/src/app/config/schema.ts
@@ -452,6 +452,13 @@ export const prodOnlyVarsSchema: Schema<IProdOnlyVarsSchema> = {
     env: 'SES_PASS',
     sensitive: true,
   },
+  sesConfigSet: {
+    doc: 'Config set for SES when sending email',
+    format: String,
+    default: null,
+    env: 'SES_CONFIG_SET',
+    sensitive: true,
+  },
   dbHost: {
     doc: 'Database URI',
     format: (val) => {

diff --git a/src/app/services/mail/mail.service.ts b/src/app/services/mail/mail.service.ts
@@ -247,10 +247,21 @@ export class MailService {
     }
 
     return ResultAsync.fromPromise(
-      this.#sendMailWithRetries(mail, {
-        mailId: sendOptions?.mailId,
-        formId: sendOptions?.formId,
-      }),
+      this.#sendMailWithRetries(
+        {
+          ...mail,
+          headers: config.mail.sesConfigSet
+            ? {
+                'X-SES-CONFIGURATION-SET': config.mail.sesConfigSet,
+                ...mail.headers,
+              }
+            : mail.headers,
+        },
+        {
+          mailId: sendOptions?.mailId,
+          formId: sendOptions?.formId,
+        },
+      ),
       (error) => {
         logger.error({
           message: 'Error returned from sendMail retries',

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -54,6 +54,7 @@ export type MailConfig = {
   }
   official: string
   transporter: Mail
+  sesConfigSet: string
 }
 
 export type RateLimitConfig = {
@@ -121,6 +122,7 @@ export interface IProdOnlyVarsSchema {
   user: string
   pass: string
   dbHost: string
+  sesConfigSet: string
 }
 
 export interface ICompulsoryVarsSchema {
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,6 +183,7 @@ const mailConfig: MailConfig = (function () { @@
         official,
         mailer,
         transporter,
+        sesConfigSet: prodOnlyVars.sesConfigSet,
       }
     })()
@@ Expand Down @@