Merge branch 'develop' into expanded-parameter-overrides

aws · Feb 7, 2025 · 67ef7f8 · 67ef7f8
2 parents 124d78f + 6bd3eb5
commit 67ef7f8
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 26 deletions.
diff --git a/appveyor-ubuntu.yml b/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"

diff --git a/appveyor-windows-al2023.yml b/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:"

diff --git a/appveyor-windows.yml b/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:"

diff --git a/tests/integration/testdata/buildcmd/terraform/build_image_docker/Dockerfile b/tests/integration/testdata/buildcmd/terraform/build_image_docker/Dockerfile
@@ -1,9 +1,7 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
 RUN yum -y update \
-    && yum install -y unzip tar gzip bzip2-devel ed gcc gcc-c++ gcc-gfortran \
-    less libcurl-devel openssl openssl-devel readline-devel xz-devel \
-    zlib-devel glibc-static libcxx libcxx-devel llvm-toolset-7 zlib-static \
+    && yum install -y unzip tar gzip ed less \
     && rm -rf /var/cache/yum
 
 RUN yum -y install make \
@@ -15,11 +13,9 @@ RUN yum install -y yum-utils \
     && terraform --version
 
 # AWS Lambda Builders
-RUN amazon-linux-extras enable python3.9
-RUN yum clean metadata && yum -y install python3.9
+# AL2023 uses Python3.9 by default. This might fail in the future if that changes. We just need the proper version
 RUN curl -L get-pip.io | python3.9
 RUN pip3 install aws-lambda-builders
-RUN ln -s /usr/bin/python3.9 /usr/bin/python3
 RUN python3 --version
 
 VOLUME /project

diff --git a/...rraform/zip_based_lambda_functions_local_backend_container_windows/expected.template.yaml b/...rraform/zip_based_lambda_functions_local_backend_container_windows/expected.template.yaml
@@ -135,7 +135,6 @@ Resources:
       LayerName: my_layer
       CompatibleRuntimes:
       - python3.9
-      - python3.9
       Content: aws-sam-cli/tests/integration/testdata/buildcmd/terraform/zip_based_lambda_functions_local_backend_container_windows/my_layer_code
     Metadata:
       SamResourceId: aws_lambda_layer_version.from_local

diff --git a/...uildcmd/terraform/zip_based_lambda_functions_local_backend_windows/expected.template.yaml b/...uildcmd/terraform/zip_based_lambda_functions_local_backend_windows/expected.template.yaml
@@ -135,7 +135,6 @@ Resources:
       LayerName: my_layer
       CompatibleRuntimes:
       - python3.9
-      - python3.9
       Content: aws-sam-cli/tests/integration/testdata/buildcmd/terraform/zip_based_lambda_functions_local_backend_container_windows/my_layer_code
     Metadata:
       SamResourceId: aws_lambda_layer_version.from_local

diff --git a/.../testdata/buildcmd/terraform/zip_based_lambda_functions_s3_backend/expected.template.yaml b/.../testdata/buildcmd/terraform/zip_based_lambda_functions_s3_backend/expected.template.yaml
@@ -135,7 +135,6 @@ Resources:
       LayerName: my_layer
       CompatibleRuntimes:
       - python3.9
-      - python3.9
       Content: aws-sam-cli/tests/integration/testdata/buildcmd/terraform/zip_based_lambda_functions_local_backend/my_layer_code
     Metadata:
       SamResourceId: aws_lambda_layer_version.from_local

diff --git a/.../terraform/zip_based_lambda_functions_s3_backend_container_windows/expected.template.yaml b/.../terraform/zip_based_lambda_functions_s3_backend_container_windows/expected.template.yaml
@@ -135,7 +135,6 @@ Resources:
       LayerName: my_layer
       CompatibleRuntimes:
       - python3.9
-      - python3.9
       Content: aws-sam-cli/tests/integration/testdata/buildcmd/terraform/zip_based_lambda_functions_local_backend_container_windows/my_layer_code
     Metadata:
       SamResourceId: aws_lambda_layer_version.from_local

diff --git a/...a/buildcmd/terraform/zip_based_lambda_functions_s3_backend_windows/expected.template.yaml b/...a/buildcmd/terraform/zip_based_lambda_functions_s3_backend_windows/expected.template.yaml
@@ -135,7 +135,6 @@ Resources:
       LayerName: my_layer
       CompatibleRuntimes:
       - python3.9
-      - python3.9
       Content: aws-sam-cli/tests/integration/testdata/buildcmd/terraform/zip_based_lambda_functions_local_backend_container_windows/my_layer_code
     Metadata:
       SamResourceId: aws_lambda_layer_version.from_local

diff --git a/...tion/testdata/sync/infra/cdk/cdk_v1_synthesized_template_level3_nested_zip_functions.json b/...tion/testdata/sync/infra/cdk/cdk_v1_synthesized_template_level3_nested_zip_functions.json
@@ -42,7 +42,6 @@
           }
         },
         "CompatibleRuntimes": [
-          "python3.9",
           "python3.9",
           "python3.11",
           "python3.12"

diff --git a/...estdata/sync/infra/cdk/cdk_v1_synthesized_template_level3_nested_zip_functions_after.json b/...estdata/sync/infra/cdk/cdk_v1_synthesized_template_level3_nested_zip_functions_after.json
@@ -42,7 +42,6 @@
           }
         },
         "CompatibleRuntimes": [
-          "python3.9",
           "python3.9",
           "python3.11",
           "python3.12"

diff --git a/tests/integration/testdata/sync/infra/cdk/cdk_v1_synthesized_template_zip_functions.json b/tests/integration/testdata/sync/infra/cdk/cdk_v1_synthesized_template_zip_functions.json
@@ -42,7 +42,6 @@
           }
         },
         "CompatibleRuntimes": [
-          "python3.9",
           "python3.9",
           "python3.11",
           "python3.12"

diff --git a/.../integration/testdata/sync/infra/cdk/cdk_v1_synthesized_template_zip_functions_after.json b/.../integration/testdata/sync/infra/cdk/cdk_v1_synthesized_template_zip_functions_after.json
@@ -42,7 +42,6 @@
           }
         },
         "CompatibleRuntimes": [
-          "python3.9",
           "python3.9",
           "python3.11",
           "python3.12"