Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

pyproject.toml

@@ -68,9 +68,9 @@ pre-dev = [
 dev = [
     "aws-sam-cli[pre-dev]",
     "coverage==7.13.4",
-    "pytest-cov==7.0.0",
+    "pytest-cov==7.1.0",
     "mypy==1.19.1",
-    "types-pywin32==311.0.0.20260316",
+    "types-pywin32==311.0.0.20260323",
     "types-PyYAML==6.0.12.20250915",
     "types-chevron==0.14.2.20250103",
     "types-psutil==7.2.2.20260130",

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.157.0"
+__version__ = "1.157.1"

samcli/commands/local/cli_common/invoke_context.py

@@ -563,7 +563,9 @@ def function_identifier(self) -> str:
     @property
     def lambda_runtime(self) -> LambdaRuntime:
         if not self._lambda_runtimes:
-            layer_downloader = LayerDownloader(self._layer_cache_basedir, self.get_cwd(), self._stacks)
+            layer_downloader = LayerDownloader(
+                self._layer_cache_basedir, self.get_cwd(), self._stacks, mount_symlinks=self._mount_symlinks
+            )
             image_builder = LambdaImage(
                 layer_downloader, self._skip_pull_image, self._force_image_build, invoke_images=self._invoke_images
             )

samcli/local/lambdafn/remote_files.py

@@ -8,13 +8,14 @@
 
 import requests
 
+from samcli.commands.exceptions import UserException
 from samcli.lib.utils.progressbar import progressbar
 from samcli.local.lambdafn.zip import unzip
 
 LOG = logging.getLogger(__name__)
 
 
-def unzip_from_uri(uri, layer_zip_path, unzip_output_dir, progressbar_label):
+def unzip_from_uri(uri, layer_zip_path, unzip_output_dir, progressbar_label, mount_symlinks=False):
     """
     Download the LayerVersion Zip to the Layer Pkg Cache
 
@@ -44,7 +45,9 @@ def unzip_from_uri(uri, layer_zip_path, unzip_output_dir, progressbar_label):
 
         # Forcefully set the permissions to 700 on files and directories. This is to ensure the owner
         # of the files is the only one that can read, write, or execute the files.
-        unzip(layer_zip_path, unzip_output_dir, permission=0o700)
+        unzip(layer_zip_path, unzip_output_dir, permission=0o700, mount_symlinks=mount_symlinks)
+    except ValueError as ex:
+        raise UserException(str(ex), wrapped_from=ex.__class__.__name__) from ex
 
     finally:
         # Remove the downloaded zip file

samcli/local/lambdafn/runtime.py

@@ -11,6 +11,7 @@
 import threading
 from typing import Dict, Optional, Union
 
+from samcli.commands.exceptions import UserException
 from samcli.lib.telemetry.metric import capture_parameter
 from samcli.lib.utils.file_observer import LambdaFunctionObserver
 from samcli.lib.utils.invocation_type import EVENT, REQUEST_RESPONSE
@@ -724,8 +725,10 @@ def _unzip_file(filepath, mount_symlinks=False):
         os.chmod(temp_dir, 0o755)
 
     LOG.info("Decompressing %s", filepath)
-
-    unzip(filepath, temp_dir, mount_symlinks=mount_symlinks)
+    try:
+        unzip(filepath, temp_dir, mount_symlinks=mount_symlinks)
+    except ValueError as ex:
+        raise UserException(str(ex), wrapped_from=ex.__class__.__name__) from ex
 
     # The directory that Python returns might have symlinks. The Docker File sharing settings will not resolve
     # symlinks. Hence get the real path before passing to Docker.

samcli/local/layers/layer_downloader.py

@@ -21,7 +21,7 @@
 
 
 class LayerDownloader:
-    def __init__(self, layer_cache, cwd, stacks: List[Stack], lambda_client=None):
+    def __init__(self, layer_cache, cwd, stacks: List[Stack], lambda_client=None, mount_symlinks=False):
         """
 
         Parameters
@@ -39,6 +39,7 @@ def __init__(self, layer_cache, cwd, stacks: List[Stack], lambda_client=None):
         self.cwd = cwd
         self._stacks = stacks
         self._lambda_client = lambda_client
+        self._mount_symlinks = mount_symlinks
 
     @property
     def lambda_client(self):
@@ -133,6 +134,7 @@ def download(self, layer: LayerVersion, force=False) -> LayerVersion:
                     layer_zip_path,
                     unzip_output_dir=layer.codeuri,
                     progressbar_label="Downloading {}".format(layer.layer_arn),
+                    mount_symlinks=self._mount_symlinks,
                 )
 
                 download_lock.release_lock(success=True)

tests/integration/local/invoke/invoke_integ_base.py

@@ -48,6 +48,7 @@ def get_command_list(
         tenant_id=None,
         container_host_interface=None,
         durable_execution_name=None,
+        mount_symlinks=False,
     ):
         command_list = [get_sam_command(), "local", "invoke", function_to_invoke]
 
@@ -63,6 +64,9 @@ def get_command_list(
         if no_event:
             command_list = command_list + ["--no-event"]
 
+        if mount_symlinks:
+            command_list = command_list + ["--mount-symlinks"]
+
         if profile:
             command_list = command_list + ["--profile", profile]
 

tests/integration/local/invoke/test_integrations_cli.py

@@ -554,11 +554,13 @@ def test_skip_pull_image_in_env_var(self):
 
     # For Windows, this test must run with administrator privilege
     @skipIf(SKIP_LAYERS_TESTS, "Skip layers tests in Appveyor only")
-    @pytest.mark.flaky(reruns=3)
     @pytest.mark.requires_credential
     def test_invoke_returns_expected_results_from_git_function(self):
         command_list = InvokeIntegBase.get_command_list(
-            "GitLayerFunction", template_path=self.template_path, event_path=self.event_path
+            "GitLayerFunction",
+            template_path=self.template_path,
+            event_path=self.event_path,
+            mount_symlinks=True,
         )
 
         process = Popen(command_list, stdout=PIPE)
@@ -573,14 +575,14 @@ def test_invoke_returns_expected_results_from_git_function(self):
 
     # For Windows, this test must run with administrator privilege
     @skipIf(SKIP_LAYERS_TESTS, "Skip layers tests in Appveyor only")
-    @pytest.mark.flaky(reruns=3)
     @pytest.mark.requires_credential
     def test_invoke_returns_expected_results_from_git_function_with_parameters(self):
         command_list = InvokeIntegBase.get_command_list(
             "GitLayerFunctionParameters",
             template_path=self.template_path,
             event_path=self.event_path,
             parameter_overrides={"LayerVersion": "5"},
+            mount_symlinks=True,
         )
 
         process = Popen(command_list, stdout=PIPE)

tests/unit/local/lambdafn/test_remote_files.py

@@ -35,7 +35,7 @@ def test_successfully_unzip_from_uri(
         progressbar_mock.update.assert_called_with(5)
         path_patch.assert_called_with("layer_zip_path")
         path_mock.unlink.assert_called()
-        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700)
+        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700, mount_symlinks=False)
         os_patch.environ.get.assert_called_with("AWS_CA_BUNDLE")
 
     @patch("samcli.local.lambdafn.remote_files.unzip")
@@ -68,7 +68,7 @@ def test_not_unlink_file_when_file_doesnt_exist(
         progressbar_mock.update.assert_called_with(5)
         path_patch.assert_called_with("layer_zip_path")
         path_mock.unlink.assert_not_called()
-        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700)
+        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700, mount_symlinks=False)
         os_patch.environ.get.assert_called_with("AWS_CA_BUNDLE")
 
     @patch("samcli.local.lambdafn.remote_files.unzip")
@@ -101,5 +101,5 @@ def test_unzip_from_uri_reads_AWS_CA_BUNDLE_env_var(
         progressbar_mock.update.assert_called_with(5)
         path_patch.assert_called_with("layer_zip_path")
         path_mock.unlink.assert_called()
-        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700)
+        unzip_patch.assert_called_with("layer_zip_path", "output_zip_dir", permission=0o700, mount_symlinks=False)
         os_patch.environ.get.assert_called_with("AWS_CA_BUNDLE")

tests/unit/local/layers/test_download_layers.py

@@ -142,6 +142,7 @@ def __eq__(self, other):
             AnyStringWith(str(Path("/tmp/cache/layer1_"))),
             unzip_output_dir=str(Path("/tmp/cache/layer1").resolve()),
             progressbar_label="Downloading arn:layer:layer1",
+            mount_symlinks=False,
         )
 
     @patch("samcli.local.layers.layer_downloader.LayerDownloader._create_cache")