Merge pull request #109 from netlify/ljt/better-logging-of-progress

netlify · Nov 15, 2022 · a2a5a8e · a2a5a8e
2 parents 9510e82 + 583e757
commit a2a5a8e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/src/handler/index.spec.ts b/src/handler/index.spec.ts
@@ -352,7 +352,7 @@ describe("Email handler", () => {
 
       expect(response).toEqual({
         statusCode: 200,
-        body: expect.stringContaining("Email successfully sent with sendgrid"),
+        body: expect.stringContaining("Email sent successfully using sendgrid"),
       });
       expect(mockSendgridSend).toHaveBeenCalledWith({
         from: "[email protected]",
@@ -385,7 +385,7 @@ describe("Email handler", () => {
 
       expect(response).toEqual({
         statusCode: 200,
-        body: expect.stringContaining("Email successfully sent with mailgun"),
+        body: expect.stringContaining("Email sent successfully using mailgun"),
       });
       expect(mockMailgunCreate).toHaveBeenCalledWith("domain.com", {
         from: "[email protected]",
@@ -417,7 +417,7 @@ describe("Email handler", () => {
 
       expect(response).toEqual({
         statusCode: 200,
-        body: expect.stringContaining("Email successfully sent with postmark"),
+        body: expect.stringContaining("Email sent successfully using postmark"),
       });
       expect(mockPostmarkSendEmail).toHaveBeenCalledWith({
         From: "[email protected]",

diff --git a/src/handler/mailer/index.spec.ts b/src/handler/mailer/index.spec.ts
@@ -46,7 +46,7 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"Email successfully sent with sendgrid"',
+        body: expect.stringContaining("Email sent successfully using sendgrid"),
         statusCode: 200,
       });
     });
@@ -65,7 +65,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"The email API provider sendgrid failed to process the request: 403 - some error message"',
+        body: expect.stringContaining(
+          "The email API provider sendgrid failed to process the request: 403 - some error message"
+        ),
         statusCode: 500,
       });
     });
@@ -86,7 +88,7 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"Email successfully sent with mailgun"',
+        body: expect.stringContaining("Email sent successfully using mailgun"),
         statusCode: 200,
       });
     });
@@ -101,7 +103,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"Domain should be specified when using Mailgun email API"',
+        body: expect.stringContaining(
+          "Domain should be specified when using Mailgun email API"
+        ),
         statusCode: 400,
       });
     });
@@ -121,7 +125,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"The email API provider mailgun failed to process the request: 403 - some error message"',
+        body: expect.stringContaining(
+          "The email API provider mailgun failed to process the request: 403 - some error message"
+        ),
         statusCode: 500,
       });
     });
@@ -141,7 +147,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"The email API provider mailgun failed to process the request: 403 - some error message"',
+        body: expect.stringContaining(
+          "The email API provider mailgun failed to process the request: 403 - some error message"
+        ),
         statusCode: 500,
       });
     });
@@ -157,7 +165,7 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"Email successfully sent with postmark"',
+        body: expect.stringContaining("Email sent successfully using postmark"),
         statusCode: 200,
       });
     });
@@ -173,7 +181,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"The email API provider postmark failed to process the request: 403 - Failed with status code: 123"',
+        body: expect.stringContaining(
+          "The email API provider postmark failed to process the request: 403 - Failed with status code: 123"
+        ),
         statusCode: 500,
       });
     });
@@ -186,7 +196,9 @@ describe("Mailer function", () => {
       });
 
       expect(result).toEqual({
-        body: '"The email API provider postmark failed to process the request: Some error"',
+        body: expect.stringContaining(
+          "The email API provider postmark failed to process the request: Some error"
+        ),
         statusCode: 500,
       });
     });

diff --git a/src/handler/mailer/index.ts b/src/handler/mailer/index.ts
@@ -104,7 +104,7 @@ const mailer = async ({
       }
     }
     if (emailProvider === "sendgrid") {
-      console.log("Sending email using Sendgrid...");
+      console.log("Sending email using SendGrid...");
       sendGrid.setApiKey(configuration.apiKey);
 
       try {
@@ -123,16 +123,20 @@ const mailer = async ({
     }
 
     if (errorMessage !== undefined) {
+      console.error(
+        `Failed to send email with ${emailProvider}: ${errorMessage}`
+      );
       return {
         statusCode: 500,
         body: JSON.stringify(
           `The email API provider ${emailProvider} failed to process the request: ${errorMessage}`
         ),
       };
     }
+    console.log(`Email sent successfully using ${emailProvider}`);
     return {
       statusCode: 200,
-      body: JSON.stringify(`Email successfully sent with ${emailProvider}`),
+      body: JSON.stringify(`Email sent successfully using ${emailProvider}`),
     };
   }
 };