Skip to content

correcting runtime versions in integ test #8947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vandita2020 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

correcting runtime versions in integ test #8947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/install-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ rustup default stable
if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
# On Windows, add Windows-native targets
rustup target add x86_64-pc-windows-msvc --toolchain stable || true
# Also pre-install the Linux cross-compile targets used by cargo-lambda.
# If cargo-lambda has to install these on demand during parallel test runs
# (pytest -n 2), concurrent rustup invocations can produce a partial/corrupt
# target install (e.g., "can't find crate for `adler2`"). Pre-installing here
# avoids that race.
rustup target add x86_64-unknown-linux-gnu --toolchain stable
rustup target add aarch64-unknown-linux-gnu --toolchain stable
else
rustup target add x86_64-unknown-linux-gnu --toolchain stable
rustup target add aarch64-unknown-linux-gnu --toolchain stable
Expand Down
2 changes: 1 addition & 1 deletion ...ata/buildcmd/terraform/application_outside_root_directory/modules/lambda_function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EOF
resource "aws_lambda_function" "this" {
filename = var.source_code
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = var.function_name
role = aws_iam_role.iam_for_lambda.arn
layers = var.layers
Expand Down
2 changes: 1 addition & 1 deletion ...stdata/buildcmd/terraform/application_outside_root_directory/modules/lambda_layer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_lambda_layer_version" "layer" {
filename = var.source_code
layer_name = var.name

compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
}

output "arn" {
Expand Down
10 changes: 5 additions & 5 deletions ...ration/testdata/buildcmd/terraform/application_outside_root_directory/root_module/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource "aws_lambda_layer_version" "layer1" {
count = 1
filename = "${local.building_path}/${local.layer1_artifact_file_name}"
layer_name = "lambda_layer1"
compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
depends_on = [
null_resource.build_layer1_version
]
Expand Down Expand Up @@ -96,7 +96,7 @@ resource "null_resource" "sam_metadata_aws_lambda_function1" {
resource "aws_lambda_function" "function1" {
filename = "${local.building_path}/${local.hello_world_artifact_file_name}"
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = "function1"
timeout = 300
role = aws_iam_role.iam_for_lambda.arn
Expand Down Expand Up @@ -174,8 +174,8 @@ module "layer7" {
version = "4.6.0"
create_layer = true
layer_name = "lambda_layer7"
compatible_runtimes = ["python3.9"]
runtime = "python3.9"
compatible_runtimes = ["python3.12"]
runtime = "python3.12"
source_path = {
path = local.layer1_src_path
prefix_in_zip = "python"
Expand All @@ -190,6 +190,6 @@ module "function7" {
source_path = local.hello_world_function_src_path
function_name = "function7"
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
layers = [module.layer7.lambda_layer_arn]
}
2 changes: 1 addition & 1 deletion ...dcmd/terraform/application_outside_root_directory_windows/modules/lambda_function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EOF
resource "aws_lambda_function" "this" {
filename = var.source_code
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = var.function_name
role = aws_iam_role.iam_for_lambda.arn
layers = var.layers
Expand Down
2 changes: 1 addition & 1 deletion ...uildcmd/terraform/application_outside_root_directory_windows/modules/lambda_layer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_lambda_layer_version" "layer" {
filename = var.source_code
layer_name = var.name

compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
}

output "arn" {
Expand Down
4 changes: 2 additions & 2 deletions ...estdata/buildcmd/terraform/application_outside_root_directory_windows/root_module/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource "aws_lambda_layer_version" "layer1" {
count = 1
filename = "${local.building_path}/${local.layer1_artifact_file_name}"
layer_name = "lambda_layer1"
compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
depends_on = [
null_resource.build_layer1_version
]
Expand Down Expand Up @@ -96,7 +96,7 @@ resource "null_resource" "sam_metadata_aws_lambda_function1" {
resource "aws_lambda_function" "function1" {
filename = "${local.building_path}/${local.hello_world_artifact_file_name}"
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = "function1"
timeout = 300
role = aws_iam_role.iam_for_lambda.arn
Expand Down
2 changes: 1 addition & 1 deletion ...form/application_outside_root_directory_windows_container/modules/lambda_function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EOF
resource "aws_lambda_function" "this" {
filename = var.source_code
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = var.function_name
role = aws_iam_role.iam_for_lambda.arn
layers = var.layers
Expand Down
2 changes: 1 addition & 1 deletion ...rraform/application_outside_root_directory_windows_container/modules/lambda_layer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_lambda_layer_version" "layer" {
filename = var.source_code
layer_name = var.name

compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
}

output "arn" {
Expand Down
4 changes: 2 additions & 2 deletions ...ildcmd/terraform/application_outside_root_directory_windows_container/root_module/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource "aws_lambda_layer_version" "layer1" {
count = 1
filename = "${local.building_path}/${local.layer1_artifact_file_name}"
layer_name = "lambda_layer1"
compatible_runtimes = ["python3.9"]
compatible_runtimes = ["python3.12"]
depends_on = [
null_resource.build_layer1_version
]
Expand Down Expand Up @@ -96,7 +96,7 @@ resource "null_resource" "sam_metadata_aws_lambda_function1" {
resource "aws_lambda_function" "function1" {
filename = "${local.building_path}/${local.hello_world_artifact_file_name}"
handler = "app.lambda_handler"
runtime = "python3.9"
runtime = "python3.12"
function_name = "function1"
timeout = 300
role = aws_iam_role.iam_for_lambda.arn
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/validate/multiple_files/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Properties": {
"CodeUri": "hello-world/",
"Handler": "app.lambdaHandler",
"Runtime": "nodejs20.x"
"Runtime": "nodejs22.x"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/validate/with_build/.aws-sam/build/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Resources:
Properties:
CodeUri: HelloWorldFunction
Handler: app.lambdaHandler
Runtime: nodejs20.x
Runtime: nodejs22.x
2 changes: 1 addition & 1 deletion tests/integration/testdata/validate/with_build/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Properties": {
"CodeUri": "hello-world/",
"Handler": "app.lambdaHandler",
"Runtime": "nodejs20.x"
"Runtime": "nodejs22.x"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/validate/test_validate_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def test_lint_template(self, relative_folder: str, expected_file: TemplateFileTy
("nodejs18.x",),
("ruby3.2",),
("dotnet6",),
("nodejs20.x"),
]
)
def test_lint_deprecated_runtimes(self, runtime):
Expand Down Expand Up @@ -211,7 +212,6 @@ def test_lint_supported_runtimes(self):
"java17",
"java11",
"java8.al2",
"nodejs20.x",
"nodejs22.x",
"nodejs24.x",
"provided.al2",
Expand Down
Loading