chore(aws-lambda-auto-wrap): extended error handling

instana · Nov 21, 2022 · bfe5b9d · bfe5b9d
1 parent cbb7d95
commit bfe5b9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/aws-lambda-auto-wrap/src/index.js b/packages/aws-lambda-auto-wrap/src/index.js
@@ -43,7 +43,10 @@ function requireTargetHandlerModule(lambdaTaskRoot, targetHandlerModuleFolder, t
   } catch (e) {
     if ('MODULE_NOT_FOUND' === e.code) {
       throw new localUtils.errors.lambda.ImportModuleError(e);
-    } else if ('ERR_REQUIRE_ESM' === e.code) {
+    } else if (
+      'ERR_REQUIRE_ESM' === e.code ||
+      e.message.indexOf('Cannot use import statement outside a module') !== -1
+    ) {
       throw new localUtils.errors.lambda.ImportModuleError(
         'Your Lambda function is using an ES module. ' +
           "Please use the 'instana-aws-lambda-auto-wrap-esm.handler' as runtime handler."

diff --git a/packages/aws-lambda-auto-wrap/test/cjs_test.js b/packages/aws-lambda-auto-wrap/test/cjs_test.js
@@ -159,7 +159,10 @@ describe('cjs wrapper', function () {
       if (semver.lt(process.versions.node, '12.0.0')) {
         expect(e.message).to.eql('SyntaxError: Unexpected identifier');
       } else {
-        expect(e.message).to.eql('SyntaxError: Cannot use import statement outside a module');
+        expect(e.message).to.eql(
+          'Your Lambda function is using an ES module. ' +
+            "Please use the 'instana-aws-lambda-auto-wrap-esm.handler' as runtime handler."
+        );
       }
     }