From 29e16abc8592927ce93812680599152ced43dc62 Mon Sep 17 00:00:00 2001 From: Heikki Hellgren Date: Wed, 17 Apr 2024 18:59:13 +0300 Subject: [PATCH] fix: add missing region config for ses Signed-off-by: Heikki Hellgren --- plugins/notifications-backend-module-email/config.d.ts | 4 ++++ .../src/processor/NotificationsEmailProcessor.ts | 1 + .../src/processor/transports/ses.ts | 3 +-- plugins/notifications-backend-module-email/src/types.ts | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/notifications-backend-module-email/config.d.ts b/plugins/notifications-backend-module-email/config.d.ts index fff78f735f..3d85022193 100644 --- a/plugins/notifications-backend-module-email/config.d.ts +++ b/plugins/notifications-backend-module-email/config.d.ts @@ -61,6 +61,10 @@ export interface Config { * AWS account ID to use */ accountId?: string; + /** + * AWS region to use + */ + region?: string; } | { transport: 'sendmail'; diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts index 8150aeebe6..4a190a8bb7 100644 --- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts +++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts @@ -88,6 +88,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor { credentialsManager: awsCredentialsManager, apiVersion: transportConfig.getOptionalString('apiVersion'), accountId: transportConfig.getOptionalString('accountId'), + region: transportConfig.getOptionalString('region'), }); } else if (transport === 'sendmail') { this.transporter = createSendmailTransport({ diff --git a/plugins/notifications-backend-module-email/src/processor/transports/ses.ts b/plugins/notifications-backend-module-email/src/processor/transports/ses.ts index 7073cc08b2..d208001bad 100644 --- a/plugins/notifications-backend-module-email/src/processor/transports/ses.ts +++ b/plugins/notifications-backend-module-email/src/processor/transports/ses.ts @@ -25,8 +25,7 @@ export const createSesTransport = async (config: SesTransportConfig) => { { apiVersion: config.apiVersion ?? '2010-12-01', credentials: credentials.sdkCredentialProvider, - region: credentials.stsRegion, - accountId: credentials.accountId, + region: config.region, }, ]); return createTransport({ diff --git a/plugins/notifications-backend-module-email/src/types.ts b/plugins/notifications-backend-module-email/src/types.ts index 67c7a1740d..57c4b05234 100644 --- a/plugins/notifications-backend-module-email/src/types.ts +++ b/plugins/notifications-backend-module-email/src/types.ts @@ -55,6 +55,7 @@ export interface SesTransportConfig extends TransportConfig { */ apiVersion?: string; accountId?: string; + region?: string; credentialsManager: AwsCredentialsManager; }