Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Tests

env:
PYTEST_VERSION: 7.4.4
RUFF_VERSION: 0.1.13
PYTEST_VERSION: 9.0.2
RUFF_VERSION: 0.14.14
RUFF_PY_VERSION: 3.12

on:
Expand All @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
fail-fast: false
steps:
- uses: actions/checkout@v4.1.1
Expand All @@ -28,7 +28,7 @@ jobs:
with:
python-version: ${{ matrix.python_version }}

- name: Install poetry
- name: Install pytest
shell: bash
run: |
pip install pytest==${{ env.PYTEST_VERSION }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ source_path = [
npm_tmp_dir = "/tmp/dir/location"
prefix_in_zip = "foo/bar1",
}, {
path = "src/python-app3",
path = "src/nodejs-app2",
commands = [
"npm install",
":zip"
Expand All @@ -424,7 +424,7 @@ source_path = [
"node_modules/.+", # Include all node_modules
],
}, {
path = "src/python-app3",
path = "src/go-app1",
commands = ["go build"],
patterns = <<END
bin/.*
Expand All @@ -437,9 +437,9 @@ source_path = [
*Few notes:*

- If you specify a source path as a string that references a folder and the runtime begins with `python` or `nodejs`, the build process will automatically build python and nodejs dependencies if `requirements.txt` or `package.json` file will be found in the source folder. If you want to customize this behavior, please use the object notation as explained below.
- If you use the `commands` option and chain multiple commands, only the exit code of last command will be checked for success. If you prefer to fail fast, start the commands with the bash option `set -e` or powershell option `$ErrorActionPreference="Stop"`
- All arguments except `path` are optional.
- `patterns` - List of Python regex filenames should satisfy. Default value is "include everything" which is equal to `patterns = [".*"]`. This can also be specified as multiline heredoc string (no comments allowed). Some examples of valid patterns:
- If you use the `commands` option and chain multiple commands, only the exit code of last command will be checked for success. If you prefer to fail fast, start the commands with the bash option `set -e` or powershell option `$ErrorActionPreference="Stop"`

```txt
!.*/.*\.txt # Filter all txt files recursively
Expand Down
2 changes: 1 addition & 1 deletion examples/build-package/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ module "package_dir_poetry_no_docker" {
poetry_install = true
}
]
artifacts_dir = "${path.root}/builds/package_dir_poetry/"
artifacts_dir = "${path.root}/builds/package_dir_poetry_no_docker/"
}

# Create zip-archive with Poetry dependencies and demonstrate quiet packaging output
Expand Down
2 changes: 1 addition & 1 deletion examples/event-source-mapping/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Note that this example may create resources which cost money. Run `terraform des
| Name | Source | Version |
|------|--------|---------|
| <a name="module_lambda_function"></a> [lambda\_function](#module\_lambda\_function) | ../../ | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion examples/event-source-mapping/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ resource "aws_kinesis_stream" "this" {
# Amazon MQ
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 5.0"
version = "~> 6.0"

name = random_pet.this.id
cidr = local.vpc_cidr
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/fixtures/python-app-poetry/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FROM public.ecr.aws/sam/build-python3.12
LABEL maintainer="Betajob AS" \
description="Patched AWS Lambda build container"

RUN pip install poetry==1.2.2
RUN pip install poetry==2.3.2 poetry-plugin-export==1.10.0
31 changes: 16 additions & 15 deletions examples/fixtures/python-app-poetry/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions examples/fixtures/python-app-poetry/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
[tool.poetry]
[project]
name = "python-app-poetry"
version = "0.1.0"
description = ""
authors = ["Your Name <you@example.com>"]

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.12"
colorful = "^0.5.4"

[tool.poetry.dev-dependencies]
[tool.poetry.group.dev.dependencies]

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
11 changes: 7 additions & 4 deletions examples/fixtures/python-app-src-poetry/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions examples/fixtures/python-app-src-poetry/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
[tool.poetry]
[project]
name = "python-app-src-poetry"
version = "0.1.0"
description = ""
authors = ["Your Name <you@example.com>"]
readme = "README.md"
packages = [{include = "python_app_src_poetry", from = "src"}]

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.12"
colorful = "^0.5.5"


Expand Down
2 changes: 1 addition & 1 deletion examples/simple-cicd/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module "lambda_function" {
runtime = "python3.12"

source_path = [
"${path.module}/src/python-app1",
"${path.module}/../fixtures/python-app1",
]
trigger_on_package_timestamp = false
}
2 changes: 1 addition & 1 deletion examples/with-efs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Note that this example may create resources which cost money. Run `terraform des
| Name | Source | Version |
|------|--------|---------|
| <a name="module_lambda_function_with_efs"></a> [lambda\_function\_with\_efs](#module\_lambda\_function\_with\_efs) | ../../ | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion examples/with-efs/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module "lambda_function_with_efs" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 5.0"
version = "~> 6.0"

name = random_pet.this.id
cidr = "10.10.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions examples/with-vpc-s3-endpoint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Note that this example may create resources which cost money. Run `terraform des
| <a name="module_lambda_s3_write"></a> [lambda\_s3\_write](#module\_lambda\_s3\_write) | ../../ | n/a |
| <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 5.0 |
| <a name="module_security_group_lambda"></a> [security\_group\_lambda](#module\_security\_group\_lambda) | terraform-aws-modules/security-group/aws | ~> 4.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |

## Resources

Expand Down
4 changes: 2 additions & 2 deletions examples/with-vpc-s3-endpoint/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ data "aws_ec2_managed_prefix_list" "this" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 5.0"
version = "~> 6.0"

name = random_pet.this.id
cidr = "10.0.0.0/16"
Expand Down Expand Up @@ -101,7 +101,7 @@ module "vpc" {

module "vpc_endpoints" {
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
version = "~> 5.0"
version = "~> 6.0"

vpc_id = module.vpc.vpc_id

Expand Down
2 changes: 1 addition & 1 deletion examples/with-vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Note that this example may create resources which cost money. Run `terraform des
| Name | Source | Version |
|------|--------|---------|
| <a name="module_lambda_function_in_vpc"></a> [lambda\_function\_in\_vpc](#module\_lambda\_function\_in\_vpc) | ../../ | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion examples/with-vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module "lambda_function_in_vpc" {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 5.0"
version = "~> 6.0"

name = random_pet.this.id
cidr = "10.10.0.0/16"
Expand Down
Loading