Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

appveyor-ubuntu.yml

@@ -16,8 +16,8 @@ configuration:
   - OtherAndEndToEndTesting
 
 environment:
-  PYTHON_HOME: "$HOME/venv3.11/bin"
-  PYTHON_VERSION: '3.11'
+  PYTHON_HOME: "$HOME/venv3.9/bin"
+  PYTHON_VERSION: '3.9'
   AWS_DEFAULT_REGION: us-east-1
   SAM_CLI_DEV: 1
   NODE_VERSION: "18.18.2"

appveyor-windows-al2023.yml

@@ -13,10 +13,10 @@ environment:
   TMPDIR: "%TEMP%"
   TMP: "%TEMP%"
 
-  # MSI Installers use Py3.11. It is sufficient to test with this version here.
-  PYTHON_HOME: "C:\\Python311-x64"
-  PYTHON_SCRIPTS: "C:\\Python311-x64\\Scripts"
-  PYTHON_EXE: "C:\\Python311-x64\\python.exe"
+  # MSI Installers use Py3.9. It is sufficient to test with this version here.
+  PYTHON_HOME: "C:\\Python39-x64"
+  PYTHON_SCRIPTS: "C:\\Python39-x64\\Scripts"
+  PYTHON_EXE: "C:\\Python39-x64\\python.exe"
   PYTHON_ARCH: "64"
   HOME: 'C:\Users\appveyor'
   HOMEDRIVE: "C:"

appveyor-windows.yml

@@ -26,10 +26,10 @@ environment:
   TMPDIR: "%TEMP%"
   TMP: "%TEMP%"
 
-  # MSI Installers uses Py3.11. It is sufficient to test with this version here.
-  PYTHON_HOME: "C:\\Python311-x64"
-  PYTHON_SCRIPTS: "C:\\Python311-x64\\Scripts"
-  PYTHON_EXE: "C:\\Python311-x64\\python.exe"
+  # MSI Installers uses Py3.9. It is sufficient to test with this version here.
+  PYTHON_HOME: "C:\\Python39-x64"
+  PYTHON_SCRIPTS: "C:\\Python39-x64\\Scripts"
+  PYTHON_EXE: "C:\\Python39-x64\\python.exe"
   PYTHON_ARCH: "64"
   HOME: 'C:\Users\appveyor'
   HOMEDRIVE: "C:"

requirements/dev.txt

@@ -15,10 +15,10 @@ types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20241230
 types-chevron==0.14.2.20250103
 types-psutil==6.1.0.20241221
-types-setuptools==75.8.0.20250110
+types-setuptools==75.8.0.20250210
 types-Pygments==2.19.0.20250107 
 types-colorama==0.4.15.20240311
-types-dateparser==1.2.0.20240420
+types-dateparser==1.2.0.20250208
 types-docutils==0.21.0.20241128
 types-jsonschema==4.23.0.20241208
 types-pyOpenSSL==24.1.0.20240722

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.9.3
+ruff==0.9.6

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==75.6.0
-pyinstaller==6.11.1
+pyinstaller==6.12.0

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.133.0"
+__version__ = "1.134.0"

samcli/commands/_utils/options.py

@@ -862,6 +862,34 @@ def use_container_build_option(f):
     return use_container_build_click_option()(f)
 
 
+def mount_symlinks_click_option():
+    return click.option(
+        "--mount-symlinks/--no-mount-symlinks",
+        default=False,
+        is_flag=True,
+        help="Specify if symlinks at the top level of the code should be mounted inside the container. "
+        "Activating this flag could allow access to locations outside of your workspace by using a symbolic link. "
+        "By default symlinks are not mounted.",
+    )
+
+
+def mount_symlinks_option(f):
+    return mount_symlinks_click_option()(f)
+
+
+def no_memory_limit_click_option():
+    return click.option(
+        "--no-memory-limit",
+        default=False,
+        is_flag=True,
+        help="Remove the Memory limit during emulation. This runs the container without the --memory parameter",
+    )
+
+
+def no_memory_limit_option(f):
+    return no_memory_limit_click_option()(f)
+
+
 def terraform_plan_file_callback(ctx, param, provided_value):
     """
     Callback for --terraform-plan-file to check if --hook-name is also specified

samcli/commands/build/build_context.py

@@ -82,6 +82,7 @@ def __init__(
         hook_name: Optional[str] = None,
         build_in_source: Optional[bool] = None,
         mount_with: str = MountMode.READ.value,
+        mount_symlinks: Optional[bool] = False,
     ) -> None:
         """
         Initialize the class
@@ -139,6 +140,8 @@ def __init__(
             Set to True to build in the source directory.
         mount_with:
             Mount mode of source code directory when building inside container, READ ONLY by default
+        mount_symlinks Optional[bool]:
+            Indicates if symlinks should be mounted inside the container
         """
 
         self._resource_identifier = resource_identifier
@@ -180,6 +183,7 @@ def __init__(
         self._build_in_source = build_in_source
         self._build_result: Optional[ApplicationBuildResult] = None
         self._mount_with = MountMode(mount_with)
+        self._mount_symlinks = mount_symlinks
 
     def __enter__(self) -> "BuildContext":
         self.set_up()
@@ -273,6 +277,7 @@ def run(self) -> None:
                 combine_dependencies=not self._create_auto_dependency_layer,
                 build_in_source=self._build_in_source,
                 mount_with_write=mount_with_write,
+                mount_symlinks=self._mount_symlinks,
             )
 
             self._check_exclude_warning()

samcli/commands/build/command.py

@@ -24,6 +24,7 @@
     docker_common_options,
     hook_name_click_option,
     manifest_option,
+    mount_symlinks_option,
     parameter_override_option,
     skip_prepare_infra_option,
     template_option_without_build,
@@ -115,6 +116,7 @@
     "be changed/added by the build process. By default the source code directory is read only.",
     cls=ContainerOptions,
 )
+@mount_symlinks_option
 @build_dir_option
 @cache_dir_option
 @base_dir_option
@@ -158,6 +160,7 @@ def cli(
     mount_with: str,
     terraform_project_root_path: Optional[str],
     build_in_source: Optional[bool],
+    mount_symlinks: Optional[bool],
 ) -> None:
     """
     `sam build` command entry point
@@ -189,6 +192,7 @@ def cli(
         hook_name,
         build_in_source,
         mount_with,
+        mount_symlinks,
     )  # pragma: no cover
 
 
@@ -215,6 +219,7 @@ def do_cli(  # pylint: disable=too-many-locals, too-many-statements
     hook_name: Optional[str],
     build_in_source: Optional[bool],
     mount_with: str,
+    mount_symlinks: Optional[bool],
 ) -> None:
     """
     Implementation of the ``cli`` method
@@ -254,6 +259,7 @@ def do_cli(  # pylint: disable=too-many-locals, too-many-statements
         hook_name=hook_name,
         build_in_source=build_in_source,
         mount_with=mount_with,
+        mount_symlinks=mount_symlinks,
     ) as ctx:
         ctx.run()