aws · lucashuy · Jul 18, 2023 · Jun 13, 2023 · Jun 20, 2023 · Jun 21, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -210,6 +210,7 @@ jobs:
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes
           python-version: |
+            3.11
             3.10
             3.9
             3.8

diff --git a/Makefile b/Makefile
@@ -3,6 +3,9 @@
 SAM_CLI_TELEMETRY ?= 0
 
 init:
+	pip install wheel
+	pip install "cython<3.0.0" pyyaml==5.4.1 --no-build-isolation
+	pip uninstall wheel cython --yes
 	SAM_CLI_DEV=1 pip install -e '.[dev]'
 
 test:

diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -76,6 +76,16 @@ cd ..
 echo "Installing Python Libraries"
 python3 -m venv venv
 ./venv/bin/pip install --upgrade pip
+
+# https://github.com/yaml/pyyaml/issues/724
+echo "Force cython package version to be lower than 3.x.x"
+./venv/bin/pip install wheel
+./venv/bin/pip install --no-build-isolation "cython<3.0.0" pyyaml==5.4.1
+
+echo "Uninstall local cython package"
+./venv/bin/pip uninstall wheel cython --yes
+# end cython work around
+
 ./venv/bin/pip install -r src/requirements/reproducible-linux.txt
 
 echo "Copying All Python Libraries"

diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh
@@ -86,6 +86,16 @@ cd ..
 echo "Installing Python Libraries"
 /usr/local/bin/python3.8 -m venv venv
 ./venv/bin/pip install --upgrade pip
+
+# https://github.com/yaml/pyyaml/issues/724
+echo "Force cython package version to be lower than 3.x.x"
+./venv/bin/pip install wheel
+./venv/bin/pip install --no-build-isolation "cython<3.0.0" pyyaml==5.4.1
+
+echo "Uninstall local cython package"
+./venv/bin/pip uninstall wheel cython --yes
+# end cython work around
+
 ./venv/bin/pip install -r src/requirements/reproducible-mac.txt
 
 echo "Copying All Python Libraries"

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -15,7 +15,7 @@ docker~=6.1.0
 dateparser~=1.1
 requests~=2.31.0
 serverlessrepo==0.1.10
-aws_lambda_builders==1.34.0
+aws_lambda_builders==1.35.0
 tomlkit==0.11.8
 watchdog==2.1.2
 rich~=13.4.2

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -24,7 +24,7 @@ types-requests==2.31.0.1
 types-urllib3==1.26.25.13
 
 # Test requirements
-pytest~=7.2.2
+pytest~=7.4.0
 parameterized==0.9.0
 pytest-xdist==3.2.0
 pytest-forked==1.6.0

diff --git a/requirements/pyinstaller-build.txt b/requirements/pyinstaller-build.txt
@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==67.7.2
-pyinstaller==5.10.1
+pyinstaller==5.13.0
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -15,9 +15,9 @@ attrs==23.1.0 \
     #   jschema-to-python
     #   jsonschema
     #   sarif-om
-aws-lambda-builders==1.34.0 \
-    --hash=sha256:0790f7e9b7ee7286b96fbcf49450c5be0341bb7cb852ca7d74beae190139eb48 \
-    --hash=sha256:20456a942a417407b42ecf8ab7fce6a47306fd063051e7cb09d02d1be24d5cf3
+aws-lambda-builders==1.35.0 \
+    --hash=sha256:419d766e60ac2a7303a23889b354d108a4244ce8d467dcf9dc71a62461895780 \
+    --hash=sha256:cf462961ec8c9d493f82b955d6b76630dc0ed356b166caddd5436719ce599586
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.71.0 \
     --hash=sha256:17fb87c8137d8d49e7a978396b2b3b279211819dee44618415aab1e99c2cb659 \

diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
@@ -15,9 +15,9 @@ attrs==23.1.0 \
     #   jschema-to-python
     #   jsonschema
     #   sarif-om
-aws-lambda-builders==1.34.0 \
-    --hash=sha256:0790f7e9b7ee7286b96fbcf49450c5be0341bb7cb852ca7d74beae190139eb48 \
-    --hash=sha256:20456a942a417407b42ecf8ab7fce6a47306fd063051e7cb09d02d1be24d5cf3
+aws-lambda-builders==1.35.0 \
+    --hash=sha256:419d766e60ac2a7303a23889b354d108a4244ce8d467dcf9dc71a62461895780 \
+    --hash=sha256:cf462961ec8c9d493f82b955d6b76630dc0ed356b166caddd5436719ce599586
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.71.0 \
     --hash=sha256:17fb87c8137d8d49e7a978396b2b3b279211819dee44618415aab1e99c2cb659 \
@@ -271,9 +271,9 @@ idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
     # via requests
-importlib-metadata==6.7.0 \
-    --hash=sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
-    --hash=sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5
+importlib-metadata==6.8.0 \
+    --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
+    --hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
     # via flask
 importlib-resources==5.12.0 \
     --hash=sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6 \

diff --git a/samcli/commands/build/command.py b/samcli/commands/build/command.py
@@ -51,7 +51,7 @@
   \b
   Supported Runtimes
   ------------------
-  1. Python 3.7, 3.8, 3.9, 3.10 using PIP\n
+  1. Python 3.7, 3.8, 3.9, 3.10, 3.11 using PIP\n
   2. Nodejs 18.x, 16.x, 14.x, 12.x using NPM\n
   3. Ruby 2.7, 3.2 using Bundler\n
   4. Java 8, Java 11, Java 17 using Gradle and Maven\n

diff --git a/samcli/lib/build/bundler.py b/samcli/lib/build/bundler.py
@@ -174,7 +174,8 @@ def _get_path_and_filename_from_handler(handler: str) -> Optional[str]:
         :return: string path to built handler file
         """
         try:
-            path = str(Path(handler).parent / Path(handler).stem) + ".js"
+            path = (Path(handler).parent / Path(handler).stem).as_posix()
+            path = path + ".js"
         except (AttributeError, TypeError):
             return None
         return path

diff --git a/samcli/lib/build/workflow_config.py b/samcli/lib/build/workflow_config.py
@@ -89,6 +89,7 @@ def get_layer_subfolder(build_workflow: str) -> str:
         "python3.8": "python",
         "python3.9": "python",
         "python3.10": "python",
+        "python3.11": "python",
         "nodejs4.3": "nodejs",
         "nodejs6.10": "nodejs",
         "nodejs8.10": "nodejs",
@@ -155,6 +156,7 @@ def get_workflow_config(
         "python3.8": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.9": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.10": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
+        "python3.11": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "nodejs12.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs14.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs16.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),

diff --git a/samcli/lib/providers/cfn_api_provider.py b/samcli/lib/providers/cfn_api_provider.py
@@ -522,7 +522,7 @@ def _extract_cfn_gateway_v2_stage(
         api_resource_type = resources.get(api_id, {}).get("Type")
         if api_resource_type != AWS_APIGATEWAY_V2_API:
             raise InvalidSamTemplateException(
-                "The AWS::ApiGatewayV2::Stag must have a valid ApiId that points to Api resource {}".format(api_id)
+                "The AWS::ApiGatewayV2::Stage must have a valid ApiId that points to Api resource {}".format(api_id)
             )
 
         collector.stage_name = stage_name

diff --git a/samcli/lib/remote_invoke/lambda_invoke_executors.py b/samcli/lib/remote_invoke/lambda_invoke_executors.py
@@ -159,16 +159,16 @@ class DefaultConvertToJSON(RemoteInvokeRequestResponseMapper[RemoteInvokeExecuti
     def map(self, test_input: RemoteInvokeExecutionInfo) -> RemoteInvokeExecutionInfo:
         if not test_input.is_file_provided():
             if not test_input.payload:
-                LOG.debug("Input event not found, invoking Lambda Function with an empty event")
+                LOG.debug("Input event not found, invoking resource with an empty event")
                 test_input.payload = "{}"
-            LOG.debug("Mapping input Payload to JSON string object")
+            LOG.debug("Mapping input event to JSON string object")
             try:
                 _ = json.loads(cast(str, test_input.payload))
             except JSONDecodeError:
                 json_value = json.dumps(test_input.payload)
                 LOG.info(
                     "Auto converting value '%s' into JSON '%s'. "
-                    "If you don't want auto-conversion, please provide a JSON string as payload",
+                    "If you don't want auto-conversion, please provide a JSON string as event",
                     test_input.payload,
                     json_value,
                 )

diff --git a/samcli/lib/utils/architecture.py b/samcli/lib/utils/architecture.py
@@ -22,6 +22,7 @@
     "python3.8": [ARM64, X86_64],
     "python3.9": [ARM64, X86_64],
     "python3.10": [ARM64, X86_64],
+    "python3.11": [ARM64, X86_64],
     "ruby2.7": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "java8": [X86_64],

diff --git a/samcli/lib/utils/preview_runtimes.py b/samcli/lib/utils/preview_runtimes.py
@@ -4,4 +4,4 @@
 """
 from typing import Set
 
-PREVIEW_RUNTIMES: Set[str] = set()
+PREVIEW_RUNTIMES: Set[str] = {"python3.11"}
diff --git a/samcli/local/common/runtime_template.py b/samcli/local/common/runtime_template.py
@@ -16,7 +16,7 @@
 RUNTIME_DEP_TEMPLATE_MAPPING = {
     "python": [
         {
-            "runtimes": ["python3.10", "python3.9", "python3.8", "python3.7"],
+            "runtimes": ["python3.11", "python3.10", "python3.9", "python3.8", "python3.7"],
             "dependency_manager": "pip",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
             "build": True,
@@ -113,6 +113,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "provided.al2",
     "provided",
     # python runtimes in descending order
+    "python3.11",
     "python3.10",
     "python3.9",
     "python3.8",
@@ -135,6 +136,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "nodejs16.x": "amazon/nodejs16.x-base",
     "nodejs14.x": "amazon/nodejs14.x-base",
     "nodejs12.x": "amazon/nodejs12.x-base",
+    "python3.11": "amazon/python3.11-base",
     "python3.10": "amazon/python3.10-base",
     "python3.9": "amazon/python3.9-base",
     "python3.8": "amazon/python3.8-base",
@@ -156,6 +158,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "python3.8": "Python36",
     "python3.9": "Python36",
     "python3.10": "Python36",
+    "python3.11": "Python36",
     "dotnet6": "dotnet6",
     "go1.x": "Go1",
 }

diff --git a/samcli/local/docker/lambda_debug_settings.py b/samcli/local/docker/lambda_debug_settings.py
@@ -179,6 +179,10 @@ def get_debug_settings(debug_port, debug_args_list, _container_env_vars, runtime
                 entry + ["/var/lang/bin/python3.10"] + debug_args_list + ["/var/runtime/bootstrap.py"],
                 container_env_vars=_container_env_vars,
             ),
+            Runtime.python311.value: lambda: DebugSettings(
+                entry + ["/var/lang/bin/python3.11"] + debug_args_list + ["/var/runtime/bootstrap.py"],
+                container_env_vars=_container_env_vars,
+            ),
         }
         try:
             return entrypoint_mapping[runtime]()

diff --git a/samcli/local/docker/lambda_image.py b/samcli/local/docker/lambda_image.py
@@ -39,6 +39,7 @@ class Runtime(Enum):
     python38 = "python3.8"
     python39 = "python3.9"
     python310 = "python3.10"
+    python311 = "python3.11"
     ruby27 = "ruby2.7"
     ruby32 = "ruby3.2"
     java8 = "java8"

diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json
@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "bb905c379830c3d8edbc196bda731076549028e3"
+    "app_template_repo_commit": "70788081366ff232a25a8b31961f59d27103e449"
 }
diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
@@ -440,6 +440,7 @@ def _validate_skipped_built_function(
         ("template.yaml", "Function", True, "python3.8", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.9", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.10", "Python", False, "CodeUri"),
+        ("template.yaml", "Function", True, "python3.11", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.7", "PythonPEP600", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.8", "PythonPEP600", False, "CodeUri"),
     ],
@@ -479,6 +480,7 @@ def test_with_default_requirements(self):
         ("template.yaml", "Function", True, "python3.8", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.9", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.10", "Python", False, "CodeUri"),
+        ("template.yaml", "Function", True, "python3.11", "Python", False, "CodeUri"),
     ],
 )
 class TestBuildCommand_PythonFunctions_WithDocker(BuildIntegPythonBase):

diff --git a/tests/integration/remote/invoke/remote_invoke_integ_base.py b/tests/integration/remote/invoke/remote_invoke_integ_base.py
@@ -7,6 +7,7 @@
     run_command,
 )
 from tests.integration.deploy.deploy_integ_base import DeployIntegBase
+from samcli.lib.remote_invoke.remote_invoke_executor_factory import RemoteInvokeExecutorFactory
 
 from samcli.lib.utils.boto_utils import get_boto_resource_provider_with_config, get_boto_client_provider_with_config
 from samcli.lib.utils.cloudformation import get_resource_summaries
@@ -47,17 +48,17 @@ def remote_invoke_deploy_stack(stack_name, template_path):
     @classmethod
     def create_resources_and_boto_clients(cls):
         cls.remote_invoke_deploy_stack(cls.stack_name, cls.template_path)
-        stack_resource_summaries = get_resource_summaries(
+        boto_client_provider = get_boto_client_provider_with_config()
+        cls.stack_resource_summaries = get_resource_summaries(
             get_boto_resource_provider_with_config(),
-            get_boto_client_provider_with_config(),
+            boto_client_provider,
             cls.stack_name,
         )
-        cls.stack_resources = {
-            resource_full_path: stack_resource_summary.physical_resource_id
-            for resource_full_path, stack_resource_summary in stack_resource_summaries.items()
-        }
-        cls.cfn_client = get_boto_client_provider_with_config()("cloudformation")
-        cls.lambda_client = get_boto_client_provider_with_config()("lambda")
+        cls.supported_resources = RemoteInvokeExecutorFactory.REMOTE_INVOKE_EXECUTOR_MAPPING.keys()
+        cls.cfn_client = boto_client_provider("cloudformation")
+        cls.lambda_client = boto_client_provider("lambda")
+        cls.stepfunctions_client = boto_client_provider("stepfunctions")
+        cls.xray_client = boto_client_provider("xray")
 
     @staticmethod
     def get_command_list(

diff --git a/tests/integration/remote/invoke/test_lambda_invoke_response_stream.py b/tests/integration/remote/invoke/test_lambda_invoke_response_stream.py
@@ -15,7 +15,7 @@ class TestInvokeResponseStreamingLambdas(RemoteInvokeIntegBase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.stack_name = f"{TestInvokeResponseStreamingLambdas.__name__}-{uuid.uuid4().hex}"
+        cls.stack_name = f"{cls.__name__}-{uuid.uuid4().hex}"
         cls.create_resources_and_boto_clients()
 
     def test_invoke_empty_event_provided(self):
-Original file line number
+Diff line change
@@ Expand Up / @@ -210,6 +210,7 @@ jobs: @@
             with:
               # These are the versions of Python that correspond to the supported Lambda runtimes
               python-version: |
+.11
 .10
 .9
 .8
@@ Expand Down @@