Skip to content
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

feat: Renamed python3.8-11 to python3.12 in examples, added tag to resources #583

Merged
merged 3 commits into from
Jun 7, 2024
Merged

feat: Renamed python3.8-11 to python3.12 in examples, added tag to resources #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f135c4
feat: Added terraform-aws-modules tag
antonbabenko Jun 7, 2024
696914d
feat: Renamed python3.[8-11] => python3.12 in examples
antonbabenko Jun 7, 2024
16b854a
Tag only Lambda function
antonbabenko Jun 7, 2024
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.89.1
rev: v1.91.0
hooks:
- id: terraform_fmt
- id: terraform_wrapper_module_for_each
Expand Down
50 changes: 25 additions & 25 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module "lambda_function" {
function_name = "my-lambda1"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

source_path = "../src/lambda-function1"

Expand All @@ -56,7 +56,7 @@ module "lambda_function" {
function_name = "lambda-with-layer"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"
publish = true

source_path = "../src/lambda-function1"
Expand Down Expand Up @@ -84,7 +84,7 @@ module "lambda_layer_s3" {

layer_name = "lambda-layer-s3"
description = "My amazing lambda layer (deployed from S3)"
compatible_runtimes = ["python3.8"]
compatible_runtimes = ["python3.12"]

source_path = "../src/lambda-layer"

Expand All @@ -102,7 +102,7 @@ module "lambda_function_existing_package_local" {
function_name = "my-lambda-existing-package-local"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

create_package = false
local_existing_package = "../existing_package.zip"
Expand All @@ -126,7 +126,7 @@ module "lambda_function_externally_managed_package" {
function_name = "my-lambda-externally-managed-package"
description = "My lambda function code is deployed separately"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

create_package = false
local_existing_package = "./lambda_functions/code.zip"
Expand Down Expand Up @@ -161,7 +161,7 @@ module "lambda_function_existing_package_s3" {
function_name = "my-lambda-existing-package-local"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

create_package = false
s3_existing_package = {
Expand Down Expand Up @@ -197,9 +197,9 @@ module "lambda_layer_local" {

layer_name = "my-layer-local"
description = "My amazing lambda layer (deployed from local)"
compatible_runtimes = ["python3.8"]
compatible_runtimes = ["python3.12"]

source_path = "../fixtures/python3.8-app1"
source_path = "../fixtures/python-app1"
}

module "lambda_layer_s3" {
Expand All @@ -209,9 +209,9 @@ module "lambda_layer_s3" {

layer_name = "my-layer-s3"
description = "My amazing lambda layer (deployed from S3)"
compatible_runtimes = ["python3.8"]
compatible_runtimes = ["python3.12"]

source_path = "../fixtures/python3.8-app1"
source_path = "../fixtures/python-app1"

store_on_s3 = true
s3_bucket = "my-bucket-id-with-lambda-builds"
Expand All @@ -231,9 +231,9 @@ module "lambda_at_edge" {
function_name = "my-lambda-at-edge"
description = "My awesome lambda@edge function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

source_path = "../fixtures/python3.8-app1"
source_path = "../fixtures/python-app1"

tags = {
Module = "lambda-at-edge"
Expand All @@ -250,9 +250,9 @@ module "lambda_function_in_vpc" {
function_name = "my-lambda-in-vpc"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

source_path = "../fixtures/python3.8-app1"
source_path = "../fixtures/python-app1"

vpc_subnet_ids = module.vpc.intra_subnets
vpc_security_group_ids = [module.vpc.default_security_group_id]
Expand Down Expand Up @@ -396,12 +396,12 @@ source_path = [
"!.*/.*\\.txt", # Skip all txt files recursively
]
}, {
path = "src/python3.8-app1",
path = "src/python-app1",
pip_requirements = true,
pip_tmp_dir = "/tmp/dir/location"
prefix_in_zip = "foo/bar1",
}, {
path = "src/python3.8-app2",
path = "src/python-app2",
pip_requirements = "requirements-large.txt",
patterns = [
"!vendor/colorful-0.5.4.dist-info/RECORD",
Expand All @@ -414,7 +414,7 @@ source_path = [
npm_tmp_dir = "/tmp/dir/location"
prefix_in_zip = "foo/bar1",
}, {
path = "src/python3.8-app3",
path = "src/python-app3",
commands = [
"npm install",
":zip"
Expand All @@ -424,7 +424,7 @@ source_path = [
"node_modules/.+", # Include all node_modules
],
}, {
path = "src/python3.8-app3",
path = "src/python-app3",
commands = ["go build"],
patterns = <<END
bin/.*
Expand Down Expand Up @@ -468,16 +468,16 @@ source_path = [
If your Lambda Function or Layer uses some dependencies you can build them in Docker and have them included into deployment package. Here is how you can do it:

build_in_docker = true
docker_file = "src/python3.8-app1/docker/Dockerfile"
docker_build_root = "src/python3.8-app1/docker"
docker_image = "public.ecr.aws/sam/build-python3.8"
runtime = "python3.8" # Setting runtime is required when building package in Docker and Lambda Layer resource.
docker_file = "src/python-app1/docker/Dockerfile"
docker_build_root = "src/python-app1/docker"
docker_image = "public.ecr.aws/sam/build-python"
runtime = "python3.12" # Setting runtime is required when building package in Docker and Lambda Layer resource.

Using this module you can install dependencies from private hosts. To do this, you need for forward SSH agent:

docker_with_ssh_agent = true

Note that by default, the `docker_image` used comes from the registry `public.ecr.aws/sam/`, and will be based on the `runtime` that you specify. In other words, if you specify a runtime of `python3.8` and do not specify `docker_image`, then the `docker_image` will resolve to `public.ecr.aws/sam/build-python3.8`. This ensures that by default the `runtime` is available in the docker container.
Note that by default, the `docker_image` used comes from the registry `public.ecr.aws/sam/`, and will be based on the `runtime` that you specify. In other words, if you specify a runtime of `python3.12` and do not specify `docker_image`, then the `docker_image` will resolve to `public.ecr.aws/sam/build-python3.12`. This ensures that by default the `runtime` is available in the docker container.

If you override `docker_image`, be sure to keep the image in sync with your `runtime`. During the plan phase, when using docker, there is no check that the `runtime` is available to build the package. That means that if you use an image that does not have the runtime, the plan will still succeed, but then the apply will fail.

Expand Down Expand Up @@ -524,7 +524,7 @@ This can be implemented in two steps: download file locally using CURL, and pass

```hcl
locals {
package_url = "https://raw.githubusercontent.com/terraform-aws-modules/terraform-aws-lambda/master/examples/fixtures/python3.8-zip/existing_package.zip"
package_url = "https://raw.githubusercontent.com/terraform-aws-modules/terraform-aws-lambda/master/examples/fixtures/python-zip/existing_package.zip"
downloaded = "downloaded_package_${md5(local.package_url)}.zip"
}

Expand All @@ -551,7 +551,7 @@ module "lambda_function_existing_package_from_remote_url" {
function_name = "my-lambda-existing-package-local"
description = "My awesome lambda function"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"

create_package = false
local_existing_package = data.null_data_source.downloaded_package.outputs["filename"]
Expand Down
4 changes: 2 additions & 2 deletions examples/alias/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ module "lambda_function" {

function_name = "${random_pet.this.id}-lambda"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"
publish = true

source_path = "${path.module}/../fixtures/python3.8-app1"
source_path = "${path.module}/../fixtures/python-app1"
hash_extra = "yo"

create_async_event_config = true
Expand Down
4 changes: 2 additions & 2 deletions examples/async/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ module "lambda_function" {

function_name = "${random_pet.this.id}-lambda-async"
handler = "index.lambda_handler"
runtime = "python3.8"
runtime = "python3.12"
architectures = ["arm64"]

source_path = "${path.module}/../fixtures/python3.8-app1"
source_path = "${path.module}/../fixtures/python-app1"

create_async_event_config = true
attach_async_event_policy = true
Expand Down
Loading