From d541ff686f828c9b7a18e447e2dc81359f5918fe Mon Sep 17 00:00:00 2001
From: Heikki Hellgren <heikki.hellgren@op.fi>
Date: Thu, 2 May 2024 08:11:35 +0300
Subject: [PATCH] fix: email processor esm issue with p-throttle + config read

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
---
 .changeset/cyan-eagles-hammer.md                     |  6 ++++++
 .github/renovate.json5                               |  4 ++++
 .../notifications-backend-module-email/package.json  |  2 +-
 .../processor/NotificationsEmailProcessor.test.ts    | 12 ++++++------
 .../src/processor/NotificationsEmailProcessor.ts     |  2 +-
 yarn.lock                                            | 10 +++++-----
 6 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/cyan-eagles-hammer.md

diff --git a/.changeset/cyan-eagles-hammer.md b/.changeset/cyan-eagles-hammer.md
new file mode 100644
index 0000000000..dfe6f0bc62
--- /dev/null
+++ b/.changeset/cyan-eagles-hammer.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-notifications-backend-module-email': patch
+'@backstage/plugin-notifications-backend': patch
+---
+
+Fixed email processor `esm` issue and config reading
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a9cb54912a..1c8d611c49 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -62,6 +62,10 @@
       matchPackageNames: ['p-limit'],
       allowedVersions: '<4.0.0',
     },
+    {
+      matchPackageNames: ['p-throttle'],
+      allowedVersions: '<4.0.0',
+    },
     {
       matchPackageNames: ['p-queue'],
       allowedVersions: '<7.0.0',
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index 94b5e10578..bb99d9cb97 100644
--- a/plugins/notifications-backend-module-email/package.json
+++ b/plugins/notifications-backend-module-email/package.json
@@ -45,7 +45,7 @@
     "@backstage/types": "workspace:^",
     "lodash": "^4.17.21",
     "nodemailer": "^6.9.13",
-    "p-throttle": "^6.1.0"
+    "p-throttle": "^4.1.1"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
index 3af1e498ca..11eef9b999 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
@@ -52,7 +52,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'smtp',
                 hostname: 'localhost',
                 port: 465,
@@ -98,7 +98,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'ses',
                 region: 'us-west-2',
               },
@@ -138,7 +138,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'sendmail',
                 path: '/usr/local/bin/sendmail',
               },
@@ -189,7 +189,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'sendmail',
                 path: '/usr/local/bin/sendmail',
               },
@@ -246,7 +246,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'sendmail',
                 path: '/usr/local/bin/sendmail',
               },
@@ -306,7 +306,7 @@ describe('NotificationsEmailProcessor', () => {
         notifications: {
           processors: {
             email: {
-              transport: {
+              transportConfig: {
                 transport: 'sendmail',
                 path: '/usr/local/bin/sendmail',
               },
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
index 5387d09c3d..ce944d9592 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
@@ -62,7 +62,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
     const emailProcessorConfig = config.getConfig(
       'notifications.processors.email',
     );
-    this.transportConfig = emailProcessorConfig.getConfig('transport');
+    this.transportConfig = emailProcessorConfig.getConfig('transportConfig');
     this.broadcastConfig =
       emailProcessorConfig.getOptionalConfig('broadcastConfig');
     this.sender = emailProcessorConfig.getString('sender');
diff --git a/yarn.lock b/yarn.lock
index 3cf5a79175..6b4def9d8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6193,7 +6193,7 @@ __metadata:
     "@types/nodemailer": ^6.4.14
     lodash: ^4.17.21
     nodemailer: ^6.9.13
-    p-throttle: ^6.1.0
+    p-throttle: ^4.1.1
   languageName: unknown
   linkType: soft
 
@@ -33449,10 +33449,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-throttle@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "p-throttle@npm:6.1.0"
-  checksum: c1947cca8844564c3d86f8c09067add5e7398b87898cb1f1aea5c48d2c211590d039a316d28a4b0d95364ffa0213c01dff6bf71175c468eab0e381f77715dbdb
+"p-throttle@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "p-throttle@npm:4.1.1"
+  checksum: fe8709f3c3b1da7c033479375c2c302e80c1a5d86449013afa7cd46d1dc210bc824a7e4a9d088e66d31987d00878c2b5491bb2fe76246d4d2fc9a1636f5f8298
   languageName: node
   linkType: hard