Merge pull request #225 from pierretr/master

Download Python packages according to lambda runtime
AdaCore · Sep 22, 2023 · 3895591 · 3895591
2 parents 4065c6b + 78086d7
commit 3895591
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 0 deletions.
diff --git a/src/e3/aws/troposphere/awslambda/__init__.py b/src/e3/aws/troposphere/awslambda/__init__.py
@@ -327,6 +327,17 @@ def resources(self, stack: Stack) -> list[AWSObject]:
 class PyFunction(Function):
     """Lambda with a Python runtime."""
 
+    AMAZON_LINUX_2_RUNTIMES = ("3.8", "3.9", "3.10", "3.11")
+    RUNTIME_CONFIGS = {
+        f"python{version}": {
+            "implementation": "cp",
+            # Amazon Linux 2 glibc version is 2.26 and we support only x86_64
+            # architecture for now.
+            "platforms": ("manylinux_2_17_x86_64", "manylinux_2_24_x86_64"),
+        }
+        for version in AMAZON_LINUX_2_RUNTIMES
+    }
+
     def __init__(
         self,
         name: str,
@@ -412,12 +423,21 @@ def create_data_dir(self, root_dir: str) -> None:
 
         # Install the requirements
         if self.requirement_file is not None:
+            assert self.runtime is not None
+            runtime_config = PyFunction.RUNTIME_CONFIGS[self.runtime]
             p = Run(
                 [
                     sys.executable,
                     "-m",
                     "pip",
                     "install",
+                    f"--python-version={self.runtime.lstrip('python')}",
+                    *(
+                        f"--platform={platform}"
+                        for platform in runtime_config["platforms"]
+                    ),
+                    f"--implementation={runtime_config['implementation']}",
+                    "--only-binary=:all:",
                     f"--target={package_dir}",
                     "-r",
                     self.requirement_file,

diff --git a/tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py b/tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py
@@ -6,6 +6,8 @@
 import pytest
 import json
 import io
+from unittest.mock import patch
+import sys
 
 from flask import Flask, send_file
 from troposphere.awslambda import (
@@ -395,6 +397,43 @@ def test_pyfunction(stack: Stack) -> None:
     assert stack.export()["Resources"] == EXPECTED_PYFUNCTION_TEMPLATE
 
 
+def test_pyfunction_with_requirements(tmp_path, stack: Stack) -> None:
+    """Test PyFunction creation."""
+    stack.s3_bucket = "cfn_bucket"
+    stack.s3_key = "templates/"
+    code_dir = tmp_path
+
+    with patch("e3.aws.troposphere.awslambda.Run") as mock_run:
+        mock_run.return_value.status = 0
+        PyFunction(
+            name="mypylambda",
+            description="this is a test",
+            role="somearn",
+            runtime="python3.11",
+            code_dir=str(code_dir),
+            handler="app.main",
+            requirement_file="requirements.txt",
+        ).create_data_dir("dummy")
+    # Ensure the right pip command is called
+    mock_run.assert_called_once_with(
+        [
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "--python-version=3.11",
+            "--platform=manylinux_2_17_x86_64",
+            "--platform=manylinux_2_24_x86_64",
+            "--implementation=cp",
+            "--only-binary=:all:",
+            "--target=dummy/Mypylambda/package",
+            "-r",
+            "requirements.txt",
+        ],
+        output=None,
+    )
+
+
 def test_pyfunction_policy_document(stack: Stack) -> None:
     """Test cfn_policy_document of PyFunction."""
     stack.s3_bucket = "cfn_bucket"