Merge branch 'develop'

Author: aws-sam-cli-bot

.github/workflows/build.yml

@@ -4,6 +4,10 @@ on:
   pull_request:
     branches:
       - develop
+  merge_group:
+    types: [checks_requested]
+    branches: 
+      - develop
 
 jobs:
   run-workflow:
@@ -54,6 +58,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -78,6 +83,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
         npm:
           - 8
           - 9
@@ -109,6 +115,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
         npm:
           - 8
           - 9
@@ -140,12 +147,13 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: '^1.16'
       - run: make init
@@ -162,9 +170,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -190,9 +199,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -216,9 +226,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -238,9 +249,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -260,9 +272,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
         ruby:
           - "3.1"
           - "2.7"
@@ -288,9 +301,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python:
-          - "3.9"
-          - "3.8"
           - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

.github/workflows/pr-labeler.yml

@@ -9,7 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v3
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
   apply-internal-external-label:

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.27.0"
+__version__ = "1.28.0"
 RPC_PROTOCOL_VERSION = "0.3"

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/actions.py

@@ -6,10 +6,10 @@
 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 @@ def has_value(item):
 
 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 @@ def __repr__(self):
 
 
 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 @@ def execute(self):
             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 @@ def execute(self):
             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/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/exceptions.py

@@ -4,7 +4,6 @@
 
 
 class LambdaBuilderError(Exception):
-
     MESSAGE = ""
 
     def __init__(self, **kwargs):

aws_lambda_builders/registry.py

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

aws_lambda_builders/utils.py

@@ -7,36 +7,40 @@
 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/validator.py

@@ -17,6 +17,7 @@
     "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],