Merge branch 'develop'

Author: aws-sam-cli-bot

aws_lambda_builders/__init__.py

@@ -4,5 +4,5 @@
 
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
-__version__ = "1.33.0"
+__version__ = "1.34.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/actions.py

@@ -6,7 +6,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Iterator, Set, Tuple, Union
+from typing import Iterator, Optional, Set, Tuple, Union
 
 from aws_lambda_builders import utils
 from aws_lambda_builders.utils import copytree, create_symlink_or_copy
@@ -169,14 +169,15 @@ class CopyDependenciesAction(BaseAction):
 
     PURPOSE = Purpose.COPY_DEPENDENCIES
 
-    def __init__(self, source_dir, artifact_dir, destination_dir, maintain_symlinks=False):
+    def __init__(self, source_dir, artifact_dir, destination_dir, maintain_symlinks=False, manifest_dir=None):
         self.source_dir = source_dir
         self.artifact_dir = artifact_dir
         self.dest_dir = destination_dir
+        self.manifest_dir = manifest_dir
         self.maintain_symlinks = maintain_symlinks
 
     def execute(self):
-        deps_manager = DependencyManager(self.source_dir, self.artifact_dir, self.dest_dir)
+        deps_manager = DependencyManager(self.source_dir, self.artifact_dir, self.dest_dir, self.manifest_dir)
 
         for dependencies_source, new_destination in deps_manager.yield_source_dest():
             if os.path.islink(dependencies_source) and self.maintain_symlinks:
@@ -198,13 +199,14 @@ class MoveDependenciesAction(BaseAction):
 
     PURPOSE = Purpose.MOVE_DEPENDENCIES
 
-    def __init__(self, source_dir, artifact_dir, destination_dir):
+    def __init__(self, source_dir, artifact_dir, destination_dir, manifest_dir=None):
         self.source_dir = source_dir
         self.artifact_dir = artifact_dir
         self.dest_dir = destination_dir
+        self.manifest_dir = manifest_dir
 
     def execute(self):
-        deps_manager = DependencyManager(self.source_dir, self.artifact_dir, self.dest_dir)
+        deps_manager = DependencyManager(self.source_dir, self.artifact_dir, self.dest_dir, self.manifest_dir)
 
         for dependencies_source, new_destination in deps_manager.yield_source_dest():
             # shutil.move can't create subfolders if this is the first file in that folder
@@ -256,10 +258,11 @@ class DependencyManager:
     # This allows for the installation of dependencies in the source directory
     IGNORE_LIST = ["node_modules"]
 
-    def __init__(self, source_dir, artifact_dir, destination_dir) -> None:
+    def __init__(self, source_dir, artifact_dir, destination_dir, manifest_dir=None) -> None:
         self._source_dir: str = source_dir
         self._artifact_dir: str = artifact_dir
         self._dest_dir: str = destination_dir
+        self._manifest_dir: Optional[str] = manifest_dir
         self._dependencies: Set[str] = set()
 
     def yield_source_dest(self) -> Iterator[Tuple[str, str]]:
@@ -268,12 +271,13 @@ def yield_source_dest(self) -> Iterator[Tuple[str, str]]:
             yield os.path.join(self._artifact_dir, dep), os.path.join(self._dest_dir, dep)
 
     def _set_dependencies(self) -> None:
-        source = self._get_source_files_exclude_deps()
+        source = self._get_source_files_exclude_deps(self._source_dir)
+        manifest = self._get_source_files_exclude_deps(self._manifest_dir) if self._manifest_dir else set()
         artifact = set(os.listdir(self._artifact_dir))
-        self._dependencies = artifact - source
+        self._dependencies = artifact - (source.union(manifest))
 
-    def _get_source_files_exclude_deps(self) -> Set[str]:
-        source_files = set(os.listdir(self._source_dir))
+    def _get_source_files_exclude_deps(self, dir_path: str) -> Set[str]:
+        source_files = set(os.listdir(dir_path))
         for item in self.IGNORE_LIST:
             if item in source_files:
                 source_files.remove(item)

aws_lambda_builders/workflows/nodejs_npm/workflow.py

@@ -74,25 +74,49 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
 
         npm_copy_npmrc_and_lockfile = NodejsNpmrcAndLockfileCopyAction(tar_package_dir, source_dir, osutils=osutils)
 
+        self.manifest_dir = self.osutils.dirname(self.manifest_path)
+        is_building_in_source = self.build_dir == self.source_dir
+        is_external_manifest = self.manifest_dir != self.source_dir
         self.actions = [
             npm_pack,
             npm_copy_npmrc_and_lockfile,
             CopySourceAction(tar_package_dir, artifacts_dir, excludes=self.EXCLUDED_FILES),
         ]
 
+        if is_external_manifest:
+            # npm pack only copies source code if the manifest is in the same directory as the source code, we need to
+            # copy the source code if the customer specified a different manifest path
+            self.actions.append(CopySourceAction(self.source_dir, artifacts_dir, excludes=self.EXCLUDED_FILES))
+
         if self.download_dependencies:
             self.actions.append(
                 NodejsNpmWorkflow.get_install_action(
                     source_dir=source_dir,
-                    install_dir=self.build_dir,
+                    # run npm install in the directory where the manifest (package.json) exists if customer is building
+                    # in source, and manifest directory is different from source.
+                    # This will let NPM find the local dependencies that are defined in the manifest file (they are
+                    # usually defined as relative to the manifest location, and that is why we run `npm install` in the
+                    # manifest directory instead of source directory).
+                    # If customer is not building in source, so it is ok to run `npm install` in the build
+                    # directory (the artifacts directory in this case), as the local dependencies are not supported.
+                    install_dir=self.manifest_dir if is_building_in_source and is_external_manifest else self.build_dir,
                     subprocess_npm=subprocess_npm,
                     osutils=osutils,
                     build_options=self.options,
-                    install_links=self.build_dir == self.source_dir,
+                    install_links=is_building_in_source,
                 )
             )
 
-        if self.download_dependencies and self.build_dir == self.source_dir:
+            if is_building_in_source and is_external_manifest:
+                # Since we run `npm install` in the manifest directory, so we need to link the node_modules directory in
+                # the source directory.
+                source_dependencies_path = os.path.join(self.source_dir, "node_modules")
+                manifest_dependencies_path = os.path.join(self.manifest_dir, "node_modules")
+                self.actions.append(
+                    LinkSinglePathAction(source=manifest_dependencies_path, dest=source_dependencies_path)
+                )
+
+        if self.download_dependencies and is_building_in_source:
             self.actions += self._actions_for_linking_source_dependencies_to_artifacts
 
         # if no dependencies dir, just cleanup artifacts and we're done
@@ -107,9 +131,7 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
         # then copy them into the artifacts dir
         elif self.combine_dependencies:
             self.actions.append(
-                CopySourceAction(
-                    self.dependencies_dir, artifacts_dir, maintain_symlinks=self.build_dir == self.source_dir
-                )
+                CopySourceAction(self.dependencies_dir, artifacts_dir, maintain_symlinks=is_building_in_source)
             )
 
         self.actions += self._actions_for_cleanup
@@ -145,6 +167,7 @@ def _actions_for_updating_dependencies_dir(self):
                     artifact_dir=self.artifacts_dir,
                     destination_dir=self.dependencies_dir,
                     maintain_symlinks=self.build_dir == self.source_dir,
+                    manifest_dir=self.manifest_dir,
                 )
             )
         else:
@@ -153,6 +176,7 @@ def _actions_for_updating_dependencies_dir(self):
                     source_dir=self.source_dir,
                     artifact_dir=self.artifacts_dir,
                     destination_dir=self.dependencies_dir,
+                    manifest_dir=self.manifest_dir,
                 )
             )
 

aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py

@@ -4,11 +4,13 @@
 
 import json
 import logging
+import os
 from pathlib import Path
 
 from aws_lambda_builders.actions import (
     CleanUpAction,
     CopySourceAction,
+    LinkSinglePathAction,
     LinkSourceAction,
     MoveDependenciesAction,
 )
@@ -53,6 +55,10 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
         self.osutils = osutils or OSUtils()
         self.subprocess_npm = SubprocessNpm(self.osutils)
         self.subprocess_esbuild = self._get_esbuild_subprocess()
+        self.manifest_dir = self.osutils.dirname(self.manifest_path)
+
+        is_building_in_source = self.build_dir == self.source_dir
+        is_external_manifest = self.manifest_dir != self.source_dir
 
         bundler_config = self.get_build_properties()
 
@@ -80,22 +86,45 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
         # if we're building in the source directory, we don't have to copy the source code
         self.actions = (
             []
-            if self.build_dir == self.source_dir
+            if is_building_in_source
             else [CopySourceAction(source_dir=self.source_dir, dest_dir=self.build_dir, excludes=self.EXCLUDED_FILES)]
         )
 
+        if is_external_manifest and not is_building_in_source:
+            # copy the manifest file (package.json) to the build directory in case if the manifest file is not in the
+            # same directory as the source code, and customer is not building in source.
+            self.actions.append(
+                CopySourceAction(source_dir=self.manifest_dir, dest_dir=self.build_dir, excludes=self.EXCLUDED_FILES)
+            )
+
         if self.download_dependencies:
             self.actions.append(
                 NodejsNpmWorkflow.get_install_action(
                     source_dir=source_dir,
-                    install_dir=self.build_dir,
+                    # run npm install in the directory where the manifest (package.json) exists if customer is building
+                    # in source, and manifest directory is different from source.
+                    # This will let NPM find the local dependencies that are defined in the manifest file (they are
+                    # usually defined as relative to the manifest location, and that is why we run `npm install` in the
+                    # manifest directory instead of source directory).
+                    # If customer is not building in source, so it is ok to run `npm install` in the build
+                    # directory (the artifacts directory in this case), as the local dependencies are not supported.
+                    install_dir=self.manifest_dir if is_building_in_source and is_external_manifest else self.build_dir,
                     subprocess_npm=self.subprocess_npm,
                     osutils=self.osutils,
                     build_options=self.options,
-                    install_links=self.build_dir == self.source_dir,
+                    install_links=is_building_in_source,
                 )
             )
 
+            if is_building_in_source and is_external_manifest:
+                # Since we run `npm install` in the manifest directory, so we need to link the node_modules directory in
+                # the source directory.
+                source_dependencies_path = os.path.join(self.source_dir, "node_modules")
+                manifest_dependencies_path = os.path.join(self.manifest_dir, "node_modules")
+                self.actions.append(
+                    LinkSinglePathAction(source=manifest_dependencies_path, dest=source_dependencies_path)
+                )
+
         bundle_action = EsbuildBundleAction(
             working_directory=self.build_dir,
             output_directory=self.artifacts_dir,
@@ -109,7 +138,7 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
         # If there's no dependencies_dir, just bundle and we're done.
         # Same thing if we're building in the source directory (since the dependencies persist in
         # the source directory, we don't want to move them or symlink them back to the source)
-        if not self.dependencies_dir or self.build_dir == self.source_dir:
+        if not self.dependencies_dir or is_building_in_source:
             self.actions.append(bundle_action)
             return
 
@@ -118,7 +147,7 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
             self.actions += [
                 bundle_action,
                 CleanUpAction(self.dependencies_dir),
-                MoveDependenciesAction(self.source_dir, self.scratch_dir, self.dependencies_dir),
+                MoveDependenciesAction(self.source_dir, self.scratch_dir, self.dependencies_dir, self.manifest_dir),
             ]
         else:
             # if we're reusing dependencies, then we need to symlink them before bundling

requirements/dev.txt

@@ -1,4 +1,4 @@
-coverage==7.2.6
+coverage==7.2.7
 flake8==3.3.0; python_version < '3.8'
 flake8==3.8.4; python_version >= '3.8'
 pytest-cov==4.1.0