aws-lambda-builders 1.27.0__tar.gz → 1.28.0__tar.gz

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_lambda_builders
-Version: 1.27.0
+Version: 1.28.0
 Summary: Python library to compile, build & package AWS Lambda functions for several runtimes & frameworks.
 Home-page: https://github.com/awslabs/aws-lambda-builders
 Author: Amazon Web Services
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Utilities

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/__init__.py

@@ -4,5 +4,5 @@ AWS Lambda Builder Library
 
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
-__version__ = "1.27.0"
+__version__ = "1.28.0"
 RPC_PROTOCOL_VERSION = "0.3"

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/__main__.py

@@ -36,7 +36,6 @@ def _error_response(request_id, http_status_code, message):
 
 
 def _parse_version(version_string):
-
     if VERSION_REGEX.match(version_string):
         return float(version_string)
     else:

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/actions.py

@@ -6,10 +6,10 @@ import logging
 import os
 import shutil
 from pathlib import Path
-from typing import Iterator, Set, Tuple
+from typing import Iterator, Set, Tuple, Union
 
 from aws_lambda_builders import utils
-from aws_lambda_builders.utils import copytree
+from aws_lambda_builders.utils import copytree, create_symlink_or_copy
 
 LOG = logging.getLogger(__name__)
 
@@ -55,7 +55,6 @@ class Purpose(object):
 
 class _ActionMetaClass(type):
     def __new__(mcs, name, bases, class_dict):
-
         cls = type.__new__(mcs, name, bases, class_dict)
 
         if cls.__name__ == "BaseAction":
@@ -100,24 +99,28 @@ class BaseAction(object, metaclass=_ActionMetaClass):
 
 
 class CopySourceAction(BaseAction):
-
     NAME = "CopySource"
 
     DESCRIPTION = "Copying source code while skipping certain commonly excluded files"
 
     PURPOSE = Purpose.COPY_SOURCE
 
-    def __init__(self, source_dir, dest_dir, excludes=None):
+    def __init__(self, source_dir, dest_dir, excludes=None, maintain_symlinks=False):
         self.source_dir = source_dir
         self.dest_dir = dest_dir
         self.excludes = excludes or []
+        self.maintain_symlinks = maintain_symlinks
 
     def execute(self):
-        copytree(self.source_dir, self.dest_dir, ignore=shutil.ignore_patterns(*self.excludes))
+        copytree(
+            self.source_dir,
+            self.dest_dir,
+            ignore=shutil.ignore_patterns(*self.excludes),
+            maintain_symlinks=self.maintain_symlinks,
+        )
 
 
 class LinkSourceAction(BaseAction):
-
     NAME = "LinkSource"
 
     DESCRIPTION = "Linking source code to the target folder"
@@ -141,32 +144,54 @@ class LinkSourceAction(BaseAction):
             utils.create_symlink_or_copy(str(source_path), str(destination_path))
 
 
-class CopyDependenciesAction(BaseAction):
+class LinkSinglePathAction(BaseAction):
+    NAME = "LinkSource"
+
+    DESCRIPTION = "Creates symbolic link at destination, pointing to source"
+
+    PURPOSE = Purpose.LINK_SOURCE
 
+    def __init__(self, source: Union[str, os.PathLike], dest: Union[str, os.PathLike]):
+        self._source = source
+        self._dest = dest
+
+    def execute(self):
+        destination_path = Path(self._dest)
+        if not destination_path.exists():
+            os.makedirs(destination_path.parent, exist_ok=True)
+        utils.create_symlink_or_copy(str(self._source), str(destination_path))
+
+
+class CopyDependenciesAction(BaseAction):
     NAME = "CopyDependencies"
 
     DESCRIPTION = "Copying dependencies while skipping source file"
 
     PURPOSE = Purpose.COPY_DEPENDENCIES
 
-    def __init__(self, source_dir, artifact_dir, destination_dir):
+    def __init__(self, source_dir, artifact_dir, destination_dir, maintain_symlinks=False):
         self.source_dir = source_dir
         self.artifact_dir = artifact_dir
         self.dest_dir = destination_dir
+        self.maintain_symlinks = maintain_symlinks
 
     def execute(self):
         deps_manager = DependencyManager(self.source_dir, self.artifact_dir, self.dest_dir)
 
         for dependencies_source, new_destination in deps_manager.yield_source_dest():
-            if os.path.isdir(dependencies_source):
-                copytree(dependencies_source, new_destination)
+            if os.path.islink(dependencies_source) and self.maintain_symlinks:
+                os.makedirs(os.path.dirname(new_destination), exist_ok=True)
+                linkto = os.readlink(dependencies_source)
+                create_symlink_or_copy(linkto, new_destination)
+                shutil.copystat(dependencies_source, new_destination, follow_symlinks=False)
+            elif os.path.isdir(dependencies_source):
+                copytree(dependencies_source, new_destination, maintain_symlinks=self.maintain_symlinks)
             else:
                 os.makedirs(os.path.dirname(new_destination), exist_ok=True)
                 shutil.copy2(dependencies_source, new_destination)
 
 
 class MoveDependenciesAction(BaseAction):
-
     NAME = "MoveDependencies"
 
     DESCRIPTION = "Moving dependencies while skipping source file"
@@ -214,7 +239,9 @@ class CleanUpAction(BaseAction):
             target_path = os.path.join(self.target_dir, name)
             LOG.debug("Clean up action: %s is deleted", str(target_path))
 
-            if os.path.isdir(target_path):
+            if os.path.islink(target_path):
+                os.unlink(target_path)
+            elif os.path.isdir(target_path):
                 shutil.rmtree(target_path)
             else:
                 os.remove(target_path)

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/builder.py

@@ -21,7 +21,6 @@ class LambdaBuilder(object):
     """
 
     def __init__(self, language, dependency_manager, application_framework, supported_workflows=None):
-
         """
         Initialize the builder.
         :type supported_workflows: list

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/exceptions.py

@@ -4,7 +4,6 @@ Collection of public exceptions raised by this library
 
 
 class LambdaBuilderError(Exception):
-
     MESSAGE = ""
 
     def __init__(self, **kwargs):

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/registry.py

@@ -24,7 +24,6 @@ class Registry(object):
         return self._data[key]
 
     def __setitem__(self, capability, value):
-
         key = self._make_key(capability)
 
         try:

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/utils.py

@@ -7,36 +7,40 @@ import os
 import shutil
 import sys
 from pathlib import Path
-from typing import Union
+from typing import Callable, List, Optional, Set, Union
 
 from aws_lambda_builders.architecture import ARM64
 
 LOG = logging.getLogger(__name__)
 
 
-def copytree(source, destination, ignore=None, include=None):
+def copytree(
+    source: str,
+    destination: str,
+    ignore: Optional[Callable[[str, List[str]], Set[str]]] = None,
+    include: Optional[Callable[[str], bool]] = None,
+    maintain_symlinks: bool = False,
+) -> None:
     """
     Similar to shutil.copytree except that it removes the limitation that the destination directory should
     be present.
 
-    :type source: str
-    :param source:
-        Path to the source folder to copy
-
-    :type destination: str
-    :param destination:
-        Path to destination folder
-
-    :type ignore: function
-    :param ignore:
+    Parameters
+    ----------
+    source : str
+        Path to the source folder to copy.
+    destination : str
+        Path to destination folder.
+    ignore : Optional[Callable[[str, List[str]], Set[str]]]
         A function that returns a set of file names to ignore, given a list of available file names. Similar to the
-        ``ignore`` property of ``shutils.copytree`` method
-
-    :type include: Callable[[str], bool]
-    :param include:
+        ``ignore`` property of ``shutils.copytree`` method. By default None.
+    include : Optional[Callable[[str], bool]]
         A function that will decide whether a file should be copied or skipped it. It accepts file name as parameter
         and return True or False. Returning True will continue copy operation, returning False will skip copy operation
-        for that file
+        for that file. By default None.
+    maintain_symlinks : bool, optional
+        If True, symbolic links in the source are represented as symbolic links in the destination.
+        If False, the contents are copied over. By default False.
     """
 
     if not os.path.exists(source):
@@ -74,8 +78,12 @@ def copytree(source, destination, ignore=None, include=None):
             LOG.debug("File (%s) doesn't satisfy the include rule, skipping it", name)
             continue
 
-        if os.path.isdir(new_source):
-            copytree(new_source, new_destination, ignore=ignore, include=include)
+        if os.path.islink(new_source) and maintain_symlinks:
+            linkto = os.readlink(new_source)
+            create_symlink_or_copy(linkto, new_destination)
+            shutil.copystat(new_source, new_destination, follow_symlinks=False)
+        elif os.path.isdir(new_source):
+            copytree(new_source, new_destination, ignore=ignore, include=include, maintain_symlinks=maintain_symlinks)
         else:
             LOG.debug("Copying source file (%s) to destination (%s)", new_source, new_destination)
             shutil.copy2(new_source, new_destination)
@@ -193,7 +201,8 @@ def create_symlink_or_copy(source: str, destination: str) -> None:
         os.symlink(Path(source).absolute(), Path(destination).absolute())
     except OSError as ex:
         LOG.warning(
-            "Symlink operation is failed, falling back to copying files",
+            "Symbolic link creation failed, falling back to copying files instead. To optimize speed, "
+            "consider enabling the necessary settings or privileges on your system to support symbolic links.",
             exc_info=ex if LOG.isEnabledFor(logging.DEBUG) else None,
         )
         copytree(source, destination)

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/validator.py

@@ -17,6 +17,7 @@ SUPPORTED_RUNTIMES = {
     "python3.7": [X86_64],
     "python3.8": [ARM64, X86_64],
     "python3.9": [ARM64, X86_64],
+    "python3.10": [ARM64, X86_64],
     "ruby2.7": [ARM64, X86_64],
     "java8": [ARM64, X86_64],
     "java11": [ARM64, X86_64],

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflow.py

@@ -32,7 +32,6 @@ Capability = namedtuple("Capability", ["language", "dependency_manager", "applic
 
 
 class BuildMode(object):
-
     DEBUG = "debug"
     RELEASE = "release"
 
@@ -376,7 +375,6 @@ class BaseWorkflow(object, metaclass=_WorkflowMetaClass):
 
                 raise WorkflowFailedError(workflow_name=self.NAME, action_name=action.NAME, reason=str(ex))
             except Exception as ex:
-
                 LOG.debug("%s raised unhandled exception", action_info, exc_info=ex)
 
                 raise WorkflowUnknownError(workflow_name=self.NAME, action_name=action.NAME, reason=str(ex))

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/custom_make/make.py

@@ -49,7 +49,6 @@ class SubProcessMake(object):
         self.make_exe = make_exe
 
     def run(self, args, env=None, cwd=None):
-
         """
         Runs the action.
 

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/custom_make/workflow.py

@@ -28,7 +28,6 @@ class CustomMakeWorkflow(BaseWorkflow):
     BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.OPTIONALLY_SUPPORTED
 
     def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs):
-
         super(CustomMakeWorkflow, self).__init__(
             source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs
         )

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py

@@ -13,7 +13,6 @@ class DotnetCliResolver(object):
 
     @property
     def exec_paths(self):
-
         # look for the windows executable
         paths = self.os_utils.which("dotnet.exe", executable_search_paths=self.executable_search_paths)
         if not paths:

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/dotnet_clipackage/utils.py

@@ -44,7 +44,6 @@ class OSUtils(object):
         """
 
         with zipfile.ZipFile(zip_file_path, "r") as zip_ref:
-
             # For each item in the zip file, extract the file and set permissions if available
             for file_info in zip_ref.infolist():
                 extracted_path = self._extract(file_info, output_dir, zip_ref)

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py

@@ -23,7 +23,6 @@ class DotnetCliPackageWorkflow(BaseWorkflow):
     BUILD_IN_SOURCE_SUPPORT = BuildInSourceSupport.EXCLUSIVELY_SUPPORTED
 
     def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, mode=None, **kwargs):
-
         super(DotnetCliPackageWorkflow, self).__init__(
             source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, mode=mode, **kwargs
         )

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/go_modules/actions.py

@@ -8,7 +8,6 @@ from .builder import BuilderError
 
 
 class GoModulesBuildAction(BaseAction):
-
     NAME = "Build"
     DESCRIPTION = "Building Go package with Go Modules"
     PURPOSE = Purpose.COMPILE_SOURCE

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/go_modules/builder.py

@@ -19,7 +19,6 @@ class BuilderError(Exception):
 
 
 class GoModulesBuilder(object):
-
     LANGUAGE = "go"
 
     def __init__(self, osutils, binaries, handler, mode=BuildMode.RELEASE, architecture=X86_64, trim_go_path=False):

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/go_modules/workflow.py

@@ -10,7 +10,6 @@ from .validator import GoRuntimeValidator
 
 
 class GoModulesWorkflow(BaseWorkflow):
-
     NAME = "GoModulesBuilder"
 
     CAPABILITY = Capability(language="go", dependency_manager="modules", application_framework=None)
@@ -21,7 +20,6 @@ class GoModulesWorkflow(BaseWorkflow):
     def __init__(
         self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, mode=None, **kwargs
     ):
-
         super(GoModulesWorkflow, self).__init__(
             source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=runtime, **kwargs
         )

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/nodejs_npm/actions.py

@@ -3,11 +3,12 @@ Action to resolve NodeJS dependencies using NPM
 """
 
 import logging
+from typing import Optional
 
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
 from aws_lambda_builders.utils import extract_tarfile
 
-from .npm import NpmExecutionError
+from .npm import NpmExecutionError, SubprocessNpm
 
 LOG = logging.getLogger(__name__)
 
@@ -82,21 +83,22 @@ class NodejsNpmInstallAction(BaseAction):
     DESCRIPTION = "Installing dependencies from NPM"
     PURPOSE = Purpose.RESOLVE_DEPENDENCIES
 
-    def __init__(self, install_dir, subprocess_npm):
+    def __init__(self, install_dir: str, subprocess_npm: SubprocessNpm, install_links: Optional[bool] = False):
         """
-        :type install_dir: str
-        :param install_dir: Dependencies will be installed in this directory.
-
-        :type subprocess_npm: aws_lambda_builders.workflows.nodejs_npm.npm.SubprocessNpm
-        :param subprocess_npm: An instance of the NPM process wrapper
-
-        :type is_production: bool
-        :param is_production: NPM installation mode is production (eg --production=false to force dev dependencies)
+        Parameters
+        ----------
+        install_dir : str
+            Dependencies will be installed in this directory.
+        subprocess_npm : SubprocessNpm
+            An instance of the NPM process wrapper
+        install_links : Optional[bool]
+            Uses the --install-links npm option if True, by default False
         """
 
         super(NodejsNpmInstallAction, self).__init__()
         self.install_dir = install_dir
         self.subprocess_npm = subprocess_npm
+        self.install_links = install_links
 
     def execute(self):
         """
@@ -107,9 +109,11 @@ class NodejsNpmInstallAction(BaseAction):
         try:
             LOG.debug("NODEJS installing in: %s", self.install_dir)
 
-            self.subprocess_npm.run(
-                ["install", "-q", "--no-audit", "--no-save", "--unsafe-perm", "--production"], cwd=self.install_dir
-            )
+            command = ["install", "-q", "--no-audit", "--no-save", "--unsafe-perm", "--production"]
+            if self.install_links:
+                command.append("--install-links")
+
+            self.subprocess_npm.run(command, cwd=self.install_dir)
 
         except NpmExecutionError as ex:
             raise ActionFailedError(str(ex))
@@ -128,18 +132,22 @@ class NodejsNpmCIAction(BaseAction):
     DESCRIPTION = "Installing dependencies from NPM using the CI method"
     PURPOSE = Purpose.RESOLVE_DEPENDENCIES
 
-    def __init__(self, install_dir, subprocess_npm):
+    def __init__(self, install_dir: str, subprocess_npm: SubprocessNpm, install_links: Optional[bool] = False):
         """
-        :type install_dir: str
-        :param install_dir: Dependencies will be installed in this directory.
-
-        :type subprocess_npm: aws_lambda_builders.workflows.nodejs_npm.npm.SubprocessNpm
-        :param subprocess_npm: An instance of the NPM process wrapper
+        Parameters
+        ----------
+        install_dir : str
+            Dependencies will be installed in this directory.
+        subprocess_npm : SubprocessNpm
+            An instance of the NPM process wrapper
+        install_links : Optional[bool]
+            Uses the --install-links npm option if True, by default False
         """
 
         super(NodejsNpmCIAction, self).__init__()
         self.install_dir = install_dir
         self.subprocess_npm = subprocess_npm
+        self.install_links = install_links
 
     def execute(self):
         """
@@ -151,7 +159,11 @@ class NodejsNpmCIAction(BaseAction):
         try:
             LOG.debug("NODEJS installing ci in: %s", self.install_dir)
 
-            self.subprocess_npm.run(["ci"], cwd=self.install_dir)
+            command = ["ci"]
+            if self.install_links:
+                command.append("--install-links")
+
+            self.subprocess_npm.run(command, cwd=self.install_dir)
 
         except NpmExecutionError as ex:
             raise ActionFailedError(str(ex))

{aws_lambda_builders-1.27.0 → aws_lambda_builders-1.28.0}/aws_lambda_builders/workflows/nodejs_npm/npm.py

@@ -47,7 +47,6 @@ class SubprocessNpm(object):
         self.npm_exe = npm_exe
 
     def run(self, args, cwd=None):
-
         """
         Runs the action.