make line endings in error mapper regex os independent (#1906)

aws-amplify · Aug 22, 2024 · 9c50380 · 9c50380
1 parent 5405c87
commit 9c50380
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/.changeset/fifty-carrots-study.md b/.changeset/fifty-carrots-study.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-deployer': patch
+---
+
+make line endings in error mapper regex os independent
diff --git a/packages/backend-deployer/src/cdk_error_mapper.ts b/packages/backend-deployer/src/cdk_error_mapper.ts
@@ -5,12 +5,12 @@ import {
   AmplifyUserError,
 } from '@aws-amplify/platform-core';
 import { BackendDeployerOutputFormatter } from './types.js';
-import { EOL } from 'os';
 
 /**
  * Transforms CDK error messages to human readable ones
  */
 export class CdkErrorMapper {
+  private multiLineEolRegex = '[\r\n]+';
   /**
    * Instantiate with a formatter that will be used for formatting CLI commands in error messages
    */
@@ -112,7 +112,7 @@ export class CdkErrorMapper {
     },
     {
       errorRegex: new RegExp(
-        `(SyntaxError|ReferenceError|TypeError):((?:.|${EOL})*?at .*)`
+        `(SyntaxError|ReferenceError|TypeError):((?:.|${this.multiLineEolRegex})*?at .*)`
       ),
       humanReadableErrorMessage:
         'Unable to build the Amplify backend definition.',
@@ -140,7 +140,7 @@ export class CdkErrorMapper {
     },
     {
       errorRegex: new RegExp(
-        `\\[ERR_MODULE_NOT_FOUND\\]:(.*)${EOL}|Error: Cannot find module (.*)`
+        `\\[ERR_MODULE_NOT_FOUND\\]:(.*)${this.multiLineEolRegex}|Error: Cannot find module (.*)`
       ),
       humanReadableErrorMessage: 'Cannot find module',
       resolutionMessage:
@@ -160,7 +160,9 @@ export class CdkErrorMapper {
     },
     {
       // Also extracts the first line in the stack where the error happened
-      errorRegex: new RegExp(`\\[esbuild Error\\]: ((?:.|${EOL})*?at .*)`),
+      errorRegex: new RegExp(
+        `\\[esbuild Error\\]: ((?:.|${this.multiLineEolRegex})*?at .*)`
+      ),
       humanReadableErrorMessage:
         'Unable to build the Amplify backend definition.',
       resolutionMessage:
@@ -170,7 +172,7 @@ export class CdkErrorMapper {
     },
     {
       errorRegex: new RegExp(
-        `\\[TransformError\\]: Transform failed with .* error:${EOL}(?<esBuildErrorMessage>.*)`
+        `\\[TransformError\\]: Transform failed with .* error:${this.multiLineEolRegex}(?<esBuildErrorMessage>.*)`
       ),
       humanReadableErrorMessage: '{esBuildErrorMessage}',
       resolutionMessage:
@@ -219,7 +221,10 @@ export class CdkErrorMapper {
     {
       // Error: .* is printed to stderr during cdk synth
       // Also extracts the first line in the stack where the error happened
-      errorRegex: new RegExp(`^Error: (.*${EOL}.*at.*)`, 'm'),
+      errorRegex: new RegExp(
+        `^Error: (.*${this.multiLineEolRegex}.*at.*)`,
+        'm'
+      ),
       humanReadableErrorMessage:
         'Unable to build the Amplify backend definition.',
       resolutionMessage:
@@ -249,7 +254,9 @@ export class CdkErrorMapper {
     },
     {
       // Note that the order matters, this should be the last as it captures generic CFN error
-      errorRegex: new RegExp(`Deployment failed: (.*)${EOL}`),
+      errorRegex: new RegExp(
+        `Deployment failed: (.*)${this.multiLineEolRegex}`
+      ),
       humanReadableErrorMessage: 'The CloudFormation deployment has failed.',
       resolutionMessage:
         'Find more information in the CloudFormation AWS Console for this stack.',