Merge branch 'develop' into dependabot/pip/develop/cfn-lint-c84561e6cb

Author: reedham-aws

.github/workflows/integration-tests.yml

@@ -202,8 +202,9 @@ jobs:
 
       - name: Install Terraform
         if: contains(fromJSON('["terraform-build", "terraform-start-api", "terraform-invoke-start-lambda", "cloud-based-tests", "tier1-finch", "tier1-windows-build-1", "tier1-windows-build-2", "tier1-windows-build-3", "tier1-windows-other"]'), matrix.test_suite)
-        shell: bash
-        run: bash tests/install-terraform.sh
+        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
+        with:
+          terraform_wrapper: false
 
       - name: Setup Finch runtime
         if: matrix.test_suite == 'tier1-finch'

.github/workflows/validate_pyinstaller.yml

@@ -21,8 +21,12 @@ jobs:
         run: chmod +x ./installer/pyinstaller/build-linux.sh
       - name: Build PyInstaller in manylinux container
         run: |
-          docker run --rm -v .:/samcli -w /samcli -e CI_OVERRIDE='1' \
-          quay.io/pypa/manylinux2014_x86_64:latest /samcli/installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip
+          for i in 1 2 3; do
+            docker run --rm -v .:/samcli -w /samcli -e CI_OVERRIDE='1' \
+            quay.io/pypa/manylinux2014_x86_64:latest /samcli/installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip && break
+            echo "Attempt $i failed, retrying..."
+            sleep 10
+          done
       - uses: actions/setup-python@v6
         with:
           python-version: 3.11

samcli/commands/local/cli_common/durable_context.py

@@ -18,18 +18,24 @@ class DurableContext:
     Automatically reuses existing running containers when possible.
     """
 
-    def __init__(self):
+    def __init__(self, skip_pull_image=False):
         """
         Initialize the durable context.
+
+        Parameters
+        ----------
+        skip_pull_image : bool
+            If True, skip pulling the emulator container image
         """
         self._emulator: Optional[DurableFunctionsEmulatorContainer] = None
         self._reused_container = False
+        self._skip_pull_image = skip_pull_image
 
     def __enter__(self) -> "DurableContext":
         """
         Start the emulator container or attach to an already running one
         """
-        self._emulator = DurableFunctionsEmulatorContainer()
+        self._emulator = DurableFunctionsEmulatorContainer(skip_pull_image=self._skip_pull_image)
         self._reused_container = self._emulator.start_or_attach()
         return self
 

samcli/commands/local/cli_common/invoke_context.py

@@ -101,6 +101,7 @@ def __init__(
         invoke_images: Optional[str] = None,
         mount_symlinks: Optional[bool] = False,
         no_mem_limit: Optional[bool] = False,
+        container_dns: Optional[Tuple[str]] = None,
         function_logical_ids: Optional[Tuple[str, ...]] = None,
     ) -> None:
         """
@@ -158,6 +159,8 @@ def __init__(
             Optional. A dictionary that defines the custom invoke image URI of each function
         mount_symlinks bool
             Optional. Indicates if symlinks should be mounted inside the container
+        container_dns tuple
+            Optional. Tuple of DNS server IP addresses for the container
         function_logical_ids tuple(str)
             Optional. Tuple of function logical IDs to filter and make available for local execution.
             Used by 'sam local start-api' and 'sam local start-lambda' commands to limit which
@@ -188,6 +191,7 @@ def __init__(
         self._debug_args = debug_args
         self._debugger_path = debugger_path
         self._container_env_vars_file = container_env_vars_file
+        self._container_dns = container_dns
 
         self._parameter_overrides = parameter_overrides
         # Override certain CloudFormation pseudo-parameters based on values provided by customer
@@ -356,6 +360,7 @@ def initialize_function_container(function: Function) -> None:
                 container_host=self._container_host,
                 container_host_interface=self._container_host_interface,
                 extra_hosts=self._extra_hosts,
+                container_dns=self._container_dns,
             )
 
             # Collect container ID in a thread-safe way
@@ -610,6 +615,7 @@ def local_lambda_runner(self) -> LocalLambdaRunner:
             container_host=self._container_host,
             container_host_interface=self._container_host_interface,
             extra_hosts=self._extra_hosts,
+            container_dns=self._container_dns,
         )
         return self._local_lambda_runner
 

samcli/commands/local/cli_common/options.py

@@ -84,6 +84,13 @@ def local_common_options(f):
             "Example:"
             "--add-host example.com:127.0.0.1",
         ),
+        click.option(
+            "--container-dns",
+            multiple=True,
+            help="Set custom DNS servers for the Lambda container. "
+            "This parameter can be passed multiple times to specify multiple DNS servers. "
+            "Example: --container-dns 8.8.8.8 --container-dns 1.1.1.1",
+        ),
         click.option(
             "--invoke-image",
             "-ii",

samcli/commands/local/invoke/cli.py

@@ -139,6 +139,7 @@ def cli(
     runtime,
     mount_symlinks,
     no_memory_limit,
+    container_dns,
     tenant_id,
     durable_execution_name,
 ):
@@ -174,6 +175,7 @@ def cli(
         runtime,
         mount_symlinks,
         no_memory_limit,
+        container_dns,
         tenant_id,
         durable_execution_name,
     )  # pragma: no cover
@@ -206,6 +208,7 @@ def do_cli(  # pylint: disable=R0914
     runtime,
     mount_symlinks,
     no_mem_limit,
+    container_dns,
     tenant_id,
     durable_execution_name,
 ):
@@ -259,6 +262,7 @@ def do_cli(  # pylint: disable=R0914
             invoke_images=processed_invoke_images,
             mount_symlinks=mount_symlinks,
             no_mem_limit=no_mem_limit,
+            container_dns=container_dns,
         ) as context:
             # Invoke the function
             context.local_lambda_runner.invoke(

samcli/commands/local/invoke/core/options.py

@@ -38,6 +38,7 @@
     "container_host",
     "container_host_interface",
     "add_host",
+    "container_dns",
     "invoke_image",
     "runtime",
     "tenant_id",

samcli/commands/local/lib/local_lambda.py

@@ -5,7 +5,7 @@
 import logging
 import os
 import platform
-from typing import Any, Dict, Optional, cast
+from typing import Any, Dict, Optional, Tuple, cast
 
 import boto3
 import click
@@ -65,6 +65,7 @@ def __init__(
         container_host: Optional[str] = None,
         container_host_interface: Optional[str] = None,
         extra_hosts: Optional[dict] = None,
+        container_dns: Optional[Tuple[str]] = None,
     ) -> None:
         """
         Initializes the class
@@ -80,6 +81,7 @@ def __init__(
         :param string container_host: Optional. Host of locally emulated Lambda container
         :param string container_host_interface: Optional. Interface that Docker host binds ports to
         :param dict extra_hosts: Optional. Dict of hostname to IP resolutions
+        :param tuple container_dns: Optional. Tuple of DNS server IP addresses for the container
         """
 
         self.local_runtime = local_runtime
@@ -95,6 +97,7 @@ def __init__(
         self.container_host = container_host
         self.container_host_interface = container_host_interface
         self.extra_hosts = extra_hosts
+        self.container_dns = container_dns
 
     def get_function(self, function_identifier: str, tenant_id: Optional[str] = None) -> Function:
         """
@@ -245,6 +248,7 @@ def invoke(
                 container_host=self.container_host,
                 container_host_interface=self.container_host_interface,
                 extra_hosts=self.extra_hosts,
+                container_dns=self.container_dns,
             )
         except ContainerResponseException:
             # NOTE(sriram-mv): This should still result in a exit code zero to avoid regressions.

samcli/commands/local/start_api/cli.py

@@ -146,6 +146,7 @@ def cli(
     ssl_cert_file,
     ssl_key_file,
     no_memory_limit,
+    container_dns,
 ):
     """
     `sam local start-api` command entry point
@@ -182,6 +183,7 @@ def cli(
         ssl_cert_file,
         ssl_key_file,
         no_memory_limit,
+        container_dns,
     )  # pragma: no cover
 
 
@@ -215,6 +217,7 @@ def do_cli(  # pylint: disable=R0914
     ssl_cert_file,
     ssl_key_file,
     no_mem_limit,
+    container_dns,
 ):
     """
     Implementation of the ``cli`` method, just separated out for unit testing purposes
@@ -261,6 +264,7 @@ def do_cli(  # pylint: disable=R0914
             invoke_images=processed_invoke_images,
             add_host=add_host,
             no_mem_limit=no_mem_limit,
+            container_dns=container_dns,
         ) as invoke_context:
             ssl_context = (ssl_cert_file, ssl_key_file) if ssl_cert_file else None
             service = LocalApiService(

samcli/commands/local/start_api/core/options.py

@@ -41,6 +41,7 @@
     "container_host",
     "container_host_interface",
     "add_host",
+    "container_dns",
     "invoke_image",
     "disable_authorizer",
 ]