fix: Handler path mapping for layer-wrapped esbuild functions

samcli/lib/build/bundler.py

@@ -12,6 +12,7 @@
 
 LOG = logging.getLogger(__name__)
 
+LAYER_PREFIX = "/opt"
 ESBUILD_PROPERTY = "esbuild"
 
 
@@ -157,6 +158,9 @@ def _should_update_handler(self, handler: str, name: str) -> bool:
  if not handler_filename:
  LOG.debug("Unable to parse handler, continuing without post-processing template.")
  return False
+ if handler_filename.startswith(LAYER_PREFIX):
+ LOG.debug("Skipping updating the handler path as it is pointing to a layer.")
+ return False
  expected_artifact_path = Path(self._build_dir, name, handler_filename)
  return not expected_artifact_path.is_file()
 

tests/end_to_end/test_runtimes_e2e.py

@@ -1,8 +1,10 @@
+from distutils.dir_util import copy_tree
 from unittest import skipIf
 
 import json
 from pathlib import Path
 
+import os
 from parameterized import parameterized_class
 
 from tests.end_to_end.end_to_end_base import EndToEndBase
@@ -163,3 +165,28 @@ def test_go_hello_world_default_workflow(self):
  DefaultDeleteStage(BaseValidator(e2e_context), e2e_context, delete_command_list, stack_name),
  ]
  self._run_tests(stages)
+
+
+class TestEsbuildDatadogLayerIntegration(EndToEndBase):
+ app_template = ""
+
+ def test_integration(self):
+ function_name = "HelloWorldFunction"
+ event = '{"hello": "world"}'
+ stack_name = self._method_to_stack_name(self.id())
+ with EndToEndTestContext(self.app_name) as e2e_context:
+ project_path = str(Path("testdata") / "esbuild-datadog-integration")
+ os.mkdir(e2e_context.project_directory)
+ copy_tree(project_path, e2e_context.project_directory)
+ self.template_path = e2e_context.template_path
+ build_command_list = self.get_command_list()
+ deploy_command_list = self._get_deploy_command(stack_name)
+ remote_invoke_command_list = self._get_remote_invoke_command(stack_name, function_name, event, "json")
+ delete_command_list = self._get_delete_command(stack_name)
+ stages = [
+ EndToEndBaseStage(BuildValidator(e2e_context), e2e_context, build_command_list),
+ EndToEndBaseStage(BaseValidator(e2e_context), e2e_context, deploy_command_list),
+ EndToEndBaseStage(RemoteInvokeValidator(e2e_context), e2e_context, remote_invoke_command_list),
+ DefaultDeleteStage(BaseValidator(e2e_context), e2e_context, delete_command_list, stack_name),
+ ]
+ self._run_tests(stages)

tests/end_to_end/testdata/esbuild-datadog-integration/main.js

@@ -0,0 +1,8 @@
+exports.lambdaHandler = async (event, context) => {
+ return {
+ statusCode: 200,
+ body: JSON.stringify({
+ message: 'hello world!',
+ }),
+ };
+};

tests/end_to_end/testdata/esbuild-datadog-integration/template.yaml

@@ -0,0 +1,27 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+# Latest extension version: https:/DataDog/datadog-lambda-extension/releases
+# Latest Node.js layer version: https:/DataDog/datadog-lambda-js/releases
+
+Parameters:
+ DataDogLayers:
+ Description: DataDog layers
+ Type: CommaDelimitedList
+ Default: "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node18-x:93, arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Extension:44"
+
+Resources:
+ HelloWorldFunction:
+ Type: AWS::Serverless::Function
+ Properties:
+ Handler: /opt/nodejs/node_modules/datadog-lambda-js/handler.handler
+ Runtime: nodejs18.x
+ Environment:
+ Variables:
+ DD_LAMBDA_HANDLER: main.lambdaHandler
+ Layers: !Ref DataDogLayers
+ Metadata:
+ BuildMethod: esbuild
+ BuildProperties:
+ EntryPoints:
+ - main.js

tests/unit/lib/build_module/test_bundler.py

@@ -195,6 +195,13 @@ def test_check_invalid_lambda_handler_none_build_dir(self):
  return_val = bundler_manager._should_update_handler("", "")
  self.assertFalse(return_val)
 
+ def test_should_not_update_layer_path(self):
+ bundler_manager = EsbuildBundlerManager(Mock(), build_dir="/build/dir")
+ bundler_manager._get_path_and_filename_from_handler = Mock()
+ bundler_manager._get_path_and_filename_from_handler.return_value = "/opt/nodejs/node_modules/d/handler.handler"
+ return_val = bundler_manager._should_update_handler("", "")
+ self.assertFalse(return_val)
+
  def test_update_function_handler(self):
  resources = {
  "FunctionA": {