Merge branch 'aws:develop' into expanded-parameter-overrides

Author: sigJoe

samcli/__init__.py

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

samcli/lib/build/app_builder.py

@@ -61,6 +61,7 @@
     AWS_SERVERLESS_LAYERVERSION,
 )
 from samcli.lib.utils.stream_writer import StreamWriter
+from samcli.local.docker.container import ContainerContext
 from samcli.local.docker.lambda_build_container import LambdaBuildContainer
 from samcli.local.docker.manager import ContainerManager, DockerImagePullFailedException
 from samcli.local.docker.utils import get_docker_platform, is_docker_reachable
@@ -968,7 +969,7 @@ def _build_function_on_container(
 
         try:
             try:
-                self._container_manager.run(container)
+                self._container_manager.run(container, context=ContainerContext.BUILD)
             except docker.errors.APIError as ex:
                 if "executable file not found in $PATH" in str(ex):
                     raise UnsupportedBuilderLibraryVersionError(

samcli/local/docker/container.py

@@ -13,6 +13,7 @@
 import tempfile
 import threading
 import time
+from enum import Enum
 from typing import Dict, Iterator, Optional, Tuple, Union
 
 import docker
@@ -59,6 +60,11 @@ class ContainerConnectionTimeoutException(Exception):
     """
 
 
+class ContainerContext(Enum):
+    BUILD = "build"
+    INVOKE = "invoke"
+
+
 class Container:
     """
     Represents an instance of a Docker container with a specific configuration. The container is not actually created
@@ -157,11 +163,14 @@ def __init__(
         except NoFreePortsError as ex:
             raise ContainerNotStartableException(str(ex)) from ex
 
-    def create(self):
+    def create(self, context):
         """
         Calls Docker API to creates the Docker container instance. Creating the container does *not* run the container.
         Use ``start`` method to run the container
 
+        context: samcli.local.docker.container.ContainerContext
+            Context for the container management to run (build, invoke)
+
         :return string: ID of the created container
         :raise RuntimeError: If this method is called after a container already has been created
         """
@@ -174,6 +183,7 @@ def create(self):
         if self._host_dir:
             mount_mode = "rw,delegated" if self._mount_with_write else "ro,delegated"
             LOG.info("Mounting %s as %s:%s, inside runtime container", self._host_dir, self._working_dir, mount_mode)
+            mapped_symlinks = self._create_mapped_symlink_files() if self._resolve_symlinks(context) else {}
 
             _volumes = {
                 self._host_dir: {
@@ -182,7 +192,7 @@ def create(self):
                     "bind": self._working_dir,
                     "mode": mount_mode,
                 },
-                **self._create_mapped_symlink_files(),
+                **mapped_symlinks,
             }
 
         kwargs = {
@@ -648,3 +658,18 @@ def is_running(self):
             return real_container.status == "running"
         except docker.errors.NotFound:
             return False
+
+    def _resolve_symlinks(self, context) -> bool:
+        """_summary_
+
+        Parameters
+        ----------
+        context : sacli.local.docker.container.ContainerContext
+            Context for the container management to run. (build, invoke)
+
+        Returns
+        -------
+        bool
+            True, if given these parameters it should resolve symlinks or not
+        """
+        return bool(context != ContainerContext.BUILD)

samcli/local/docker/manager.py

@@ -12,7 +12,7 @@
 from samcli.lib.constants import DOCKER_MIN_API_VERSION
 from samcli.lib.utils.stream_writer import StreamWriter
 from samcli.local.docker import utils
-from samcli.local.docker.container import Container
+from samcli.local.docker.container import Container, ContainerContext
 from samcli.local.docker.lambda_image import LambdaImage
 
 LOG = logging.getLogger(__name__)
@@ -55,14 +55,16 @@ def is_docker_reachable(self):
         """
         return utils.is_docker_reachable(self.docker_client)
 
-    def create(self, container):
+    def create(self, container, context):
         """
         Create a container based on the given configuration.
 
         Parameters
         ----------
         container samcli.local.docker.container.Container:
             Container to be created
+        context: samcli.local.docker.container.ContainerContext
+            Context for the container management to run. (build, invoke)
 
         Raises
         ------
@@ -93,9 +95,9 @@ def create(self, container):
                 LOG.info("Failed to download a new %s image. Invoking with the already downloaded image.", image_name)
 
         container.network_id = self.docker_network_id
-        container.create()
+        container.create(context)
 
-    def run(self, container, input_data=None):
+    def run(self, container, context: ContainerContext, input_data=None):
         """
         Run a Docker container based on the given configuration.
         If the container is not created, it will call Create method to create.
@@ -104,6 +106,8 @@ def run(self, container, input_data=None):
         ----------
         container: samcli.local.docker.container.Container
             Container to create and run
+        context: samcli.local.docker.container.ContainerContext
+            Context for the container management to run. (build, invoke)
         input_data: str, optional
             Input data sent to the container through container's stdin.
 
@@ -113,8 +117,7 @@ def run(self, container, input_data=None):
             If the Docker image was not available in the server
         """
         if not container.is_created():
-            self.create(container)
-
+            self.create(container, context)
         container.start(input_data=input_data)
 
     def stop(self, container: Container) -> None:

samcli/local/lambdafn/runtime.py

@@ -14,7 +14,7 @@
 from samcli.lib.telemetry.metric import capture_parameter
 from samcli.lib.utils.file_observer import LambdaFunctionObserver
 from samcli.lib.utils.packagetype import ZIP
-from samcli.local.docker.container import Container
+from samcli.local.docker.container import Container, ContainerContext
 from samcli.local.docker.container_analyzer import ContainerAnalyzer
 from samcli.local.docker.exceptions import ContainerFailureError, DockerContainerCreationFailedException
 from samcli.local.docker.lambda_container import LambdaContainer
@@ -113,7 +113,7 @@ def create(
         )
         try:
             # create the container.
-            self._container_manager.create(container)
+            self._container_manager.create(container, ContainerContext.INVOKE)
             return container
 
         except DockerContainerCreationFailedException:
@@ -174,7 +174,7 @@ def run(
 
         try:
             # start the container.
-            self._container_manager.run(container)
+            self._container_manager.run(container, ContainerContext.INVOKE)
             return container
 
         except KeyboardInterrupt:

tests/integration/deploy/test_deploy_command.py

@@ -26,13 +26,13 @@ class TestDeploy(DeployIntegBase):
     def setUpClass(cls):
         cls.docker_client = docker.from_env()
         cls.local_images = [
-            ("public.ecr.aws/sam/emulation-python3.8", "latest"),
+            ("public.ecr.aws/sam/emulation-python3.9", "latest"),
         ]
         # setup some images locally by pulling them.
         for repo, tag in cls.local_images:
             cls.docker_client.api.pull(repository=repo, tag=tag)
-            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8", tag="latest")
-            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8-2", tag="latest")
+            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.9", tag="latest")
+            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.9-2", tag="latest")
             cls.docker_client.api.tag(f"{repo}:{tag}", "colorsrandomfunctionf61b9209", tag="latest")
 
         # setup signing profile arn & name

tests/integration/local/invoke/test_invoke_terraform_applications.py

@@ -210,7 +210,7 @@ def setUpClass(cls):
             bytes('resource "aws_lambda_function" "this" {' + os.linesep, "utf-8"),
             bytes("   filename = var.source_code" + os.linesep, "utf-8"),
             bytes('   handler = "app.lambda_handler"' + os.linesep, "utf-8"),
-            bytes('   runtime = "python3.8"' + os.linesep, "utf-8"),
+            bytes('   runtime = "python3.9"' + os.linesep, "utf-8"),
             bytes("   function_name = var.function_name" + os.linesep, "utf-8"),
             bytes("   role = aws_iam_role.iam_for_lambda.arn" + os.linesep, "utf-8"),
             bytes(f'   layers = ["{_4th_layer_arn}"]' + os.linesep, "utf-8"),

tests/integration/local/start_api/test_start_api.py

@@ -1549,19 +1549,19 @@ def assert_cors(self, response):
         self.assertEqual(response.headers.get("Access-Control-Allow-Credentials"), "true")
         self.assertEqual(response.headers.get("Access-Control-Max-Age"), "510")
 
+    @parameterized.expand(["https://abc", None])
     @pytest.mark.flaky(reruns=3)
     @pytest.mark.timeout(timeout=600, method="thread")
-    @parameterized.expand(["https://abc", None])
     def test_cors_swagger_options(self, origin):
         """
         This tests that the Cors headers are added to OPTIONS responses
         """
         response = requests.options(self.url + "/echobase64eventbody", **_create_request_params(origin))
         self.assert_cors(response)
 
+    @parameterized.expand(["https://abc", None])
     @pytest.mark.flaky(reruns=3)
     @pytest.mark.timeout(timeout=600, method="thread")
-    @parameterized.expand(["https://abc", None])
     def test_cors_swagger_get(self, origin):
         """
         This tests that the Cors headers are added to _other_ method responses
@@ -1685,9 +1685,9 @@ class TestServiceCorsGlobalRequests(StartApiIntegBaseClass):
     def setUp(self):
         self.url = "http://127.0.0.1:{}".format(self.port)
 
+    @parameterized.expand(["https://abc", None])
     @pytest.mark.flaky(reruns=3)
     @pytest.mark.timeout(timeout=600, method="thread")
-    @parameterized.expand(["https://abc", None])
     def test_cors_global(self, origin):
         """
         This tests that the Cors headers are added to OPTIONS response when the global property is set

tests/integration/local/start_lambda/test_start_lambda_terraform_applications.py

@@ -213,7 +213,7 @@ def setUpClass(cls):
             bytes('resource "aws_lambda_function" "this" {' + os.linesep, "utf-8"),
             bytes("   filename = var.source_code" + os.linesep, "utf-8"),
             bytes('   handler = "app.lambda_handler"' + os.linesep, "utf-8"),
-            bytes('   runtime = "python3.8"' + os.linesep, "utf-8"),
+            bytes('   runtime = "python3.9"' + os.linesep, "utf-8"),
             bytes("   function_name = var.function_name" + os.linesep, "utf-8"),
             bytes("   role = aws_iam_role.iam_for_lambda.arn" + os.linesep, "utf-8"),
             bytes(f'   layers = ["{_4th_layer_arn}"]' + os.linesep, "utf-8"),

tests/integration/package/test_package_command_image.py

@@ -26,13 +26,13 @@ class TestPackageImage(PackageIntegBase):
     def setUpClass(cls):
         cls.docker_client = docker.from_env()
         cls.local_images = [
-            ("public.ecr.aws/sam/emulation-python3.8", "latest"),
+            ("public.ecr.aws/sam/emulation-python3.9", "latest"),
         ]
         # setup some images locally by pulling them.
         for repo, tag in cls.local_images:
             cls.docker_client.api.pull(repository=repo, tag=tag)
-            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8", tag="latest")
-            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8-2", tag="latest")
+            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.9", tag="latest")
+            cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.9-2", tag="latest")
             cls.docker_client.api.tag(f"{repo}:{tag}", "colorsrandomfunctionf61b9209", tag="latest")
 
         super(TestPackageImage, cls).setUpClass()
@@ -264,8 +264,8 @@ def test_package_with_deep_nested_template_image(self):
 
         # verify all function images are pushed
         images = [
-            ("emulation-python3.8", "latest"),
-            ("emulation-python3.8-2", "latest"),
+            ("emulation-python3.9", "latest"),
+            ("emulation-python3.9-2", "latest"),
         ]
         for image, tag in images:
             # check string like this: